Changeset 31700

Timestamp:

12/13/14 20:54:55 (8 years ago)

Author:

gost

Message:

[titan] nemesis.. add transcode function

Location:

titan/titan

Files:

• record.h (modified) (3 diffs)
• titan.c (modified) (1 diff)

titan/titan/record.h

@@ -305 +305 @@
                 {
                         if(node->videodev != NULL)
+                        {
                                 videostop(node->videodev, 1);
+                                videoclose(node->videodev, -1);
+                                dmxclose(node->dmxvideodev, -1);
+                        }
                         if(node->audiodev != NULL)
+                        {
                                 audiostop(node->audiodev);
+                                audioclose(node->audiodev, -1);
+                                dmxclose(node->dmxaudiodev, -1);
+                        }
+                        encoderclose(node->encoderdev, -1);
                 }
 #endif
@@ -535 +544 @@
                 }
         }
-        
-#ifdef MIPSEL
-        if(servicenode->encoderdev != NULL)
-        {
-                if(servicenode->videodev != NULL)
-                {
-                        dmxstart(servicenode->dmxvideodev);
-                }
-                if(servicenode->audiodev != NULL)
-                {
-                        dmxstart(servicenode->dmxaudiodev);
-                }
-                servicenode->recdmxstart = 1;
-        }
-#endif  
-        
         
         if(servicenode->recdmxstart == 0)
@@ -1140 +1133 @@
                         if(type == RECSTREAMENC)
                         {
-                                dmxstop(dmxnode);
+                                
                                 dmxclose(dmxnode, -1);
-                                dmxnode = NULL;
-                                servicenode->dmxaudiodev = dmxopen(fenode);
-                                servicenode->dmxvideodev = dmxopen(fenode);
-                                dmxstop(servicenode->dmxvideodev);
-                                dmxstop(servicenode->dmxaudiodev);
-                                
+
                                 encnode = encoderopen(1);
                                 servicenode->encoderdev = encnode;
-
+                                
+                                servicenode->dmxaudiodev = dmxopen(fenode);
+                                dmxsetbuffersize(servicenode->dmxaudiodev, getconfigint("dmxaudiobuffersize", NULL));
+                                dmxsetsource(servicenode->dmxaudiodev, fenode->fedmxsource);
                                 switch(encnode->decoder)
                                 {
-                                        case 2: dmxsetpesfilter(servicenode->dmxaudiodev, chnode->audiopid, input, DMX_OUT_DECODER, DMX_PES_AUDIO2, 0); break;
-                                        case 3: dmxsetpesfilter(servicenode->dmxaudiodev, chnode->audiopid, input, DMX_OUT_DECODER, DMX_PES_AUDIO3, 0); break;
-                                }
-                                                                
-                                switch(encnode->decoder)
-                                {
-                                        case 2: dmxsetpesfilter(servicenode->dmxvideodev, chnode->videopid, input, DMX_OUT_DECODER, DMX_PES_VIDEO2, 0); break;
-                                        case 3: dmxsetpesfilter(servicenode->dmxvideodev, chnode->videopid, input, DMX_OUT_DECODER, DMX_PES_VIDEO3, 0); break;
-                                }
-                                                
-                                
+                                        case 2: dmxsetpesfilter(servicenode->dmxaudiodev, chnode->audiopid, -1, DMX_OUT_DECODER, DMX_PES_AUDIO2, 0); break;
+                                        case 3: dmxsetpesfilter(servicenode->dmxaudiodev, chnode->audiopid, -1, DMX_OUT_DECODER, DMX_PES_AUDIO3, 0); break;
+                                }
+                                usleep(1000);   
+
                                 audionode = audioopen(encnode->decoder);
                                 servicenode->audiodev = audionode;
                                 audioselectsource(servicenode->audiodev, AUDIO_SOURCE_DEMUX);
+                                audiosetbypassmode(servicenode->audiodev, 1);
                                 audioplay(servicenode->audiodev);
+                
+                                servicenode->dmxvideodev = dmxopen(fenode);
+                                dmxsetbuffersize(servicenode->dmxvideodev, getconfigint("dmxvideobuffersize", NULL));
+                                dmxsetsource(servicenode->dmxvideodev, fenode->fedmxsource);
                                 
+                                switch(encnode->decoder)
+                                {
+                                        case 2: dmxsetpesfilter(servicenode->dmxvideodev, chnode->videopid, -1, DMX_OUT_DECODER, DMX_PES_VIDEO2, 0); break;
+                                        case 3: dmxsetpesfilter(servicenode->dmxvideodev, chnode->videopid, -1, DMX_OUT_DECODER, DMX_PES_VIDEO3, 0); break;
+                                }
                                 
                                 videonode = videoopen(0, encnode->decoder);
                                 servicenode->videodev = videonode;
                                 videoselectsource(servicenode->videodev, VIDEO_SOURCE_DEMUX);
+                                setencoding(chnode, servicenode->videodev);
                                 videoplay(servicenode->videodev);
-                                
-                                audiostop(servicenode->audiodev);
-                                audioplay(servicenode->audiodev);
-
-
+                                 
+                                servicenode->recdmxstart = 1;
                         }
                         else

titan/titan/titan.c

@@ -849 +849 @@
         ret = scgetdev();
 #ifdef MIPSEL
-        //ret = encodergetdev();
+        if(checkbox("ATEMIO-NEMESIS") == 1)
+                ret = encodergetdev();
 #endif