[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] mpeg2ts/demuxer Umakefil, 1.1.10.6,
From:       ckarusala () helixcommunity ! org
Date:       2011-12-29 9:42:18
[Download RAW message or body]

Update of /cvsroot/datatype/mpeg2ts/demuxer
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv14250

Modified Files:
      Tag: SERVER_14_2_GLOBECOMM_LR
	Umakefil tsdemuxer.cpp 
Log Message:

MPEG2TS demuxer changes
==========================
Update the Umakefil to include server/common/util/pub when running is server for \
accessing debug info and routines.

Fixed couple of places where we are looking for a video key-frame even though the \
video stream is not currently active (audio only case). Updated it to skip looking \
for key-frames for audio-only cases.

Added a server debug message in the place of HXLOGL3 message when running in server.




Index: Umakefil
===================================================================
RCS file: /cvsroot/datatype/mpeg2ts/demuxer/Umakefil,v
retrieving revision 1.1.10.6
retrieving revision 1.1.10.6.2.1
diff -u -d -r1.1.10.6 -r1.1.10.6.2.1
--- Umakefil	22 Jul 2011 01:04:53 -0000	1.1.10.6
+++ Umakefil	29 Dec 2011 09:42:15 -0000	1.1.10.6.2.1
@@ -72,6 +72,9 @@
                           "datatype/ac3/common/pub",
                           "datatype/h264/common/pub")
 
+if project.IsDefined("HELIX_FEATURE_SERVER"):
+    project.AddModuleIncludes("server/common/util/pub")
+
 project.AddSources("tsdemuxer.cpp",
                    "payload/h264payload.cpp",
                    "payload/aacpayload.cpp",

Index: tsdemuxer.cpp
===================================================================
RCS file: /cvsroot/datatype/mpeg2ts/demuxer/tsdemuxer.cpp,v
retrieving revision 1.6.2.12
retrieving revision 1.6.2.12.2.1
diff -u -d -r1.6.2.12 -r1.6.2.12.2.1
--- tsdemuxer.cpp	10 Nov 2011 10:52:07 -0000	1.6.2.12
+++ tsdemuxer.cpp	29 Dec 2011 09:42:15 -0000	1.6.2.12.2.1
@@ -58,6 +58,10 @@
 #include "tscalc.h"
 #include "tsconvrt.h"
 
+#ifdef HELIX_FEATURE_SERVER
+#include "mp2tsdebug.h"
+#endif
+
 #include "basepayload.h"
 #include "h264payload.h"
 #include "aacpayload.h"
@@ -1071,7 +1075,10 @@
             // code path after seeking
             if (m_pCurrentProgram->bSeenKeyFrame)
             {
-                AdvanceQueuesToKeyFrame();
+                if (m_pCurrentProgram->bHasVideoStream)
+                {
+                    AdvanceQueuesToKeyFrame();
+                }
                 pPacket = (IHXRTPPacket*)pESStream->pPacketQueue->RemoveHead();
                 bFound = TRUE;
             }
@@ -1986,7 +1993,13 @@
 
             if (SUCCEEDED(retVal) && \
pESStream->pPayloadHandler->IsStreamHeaderInfoReady())  {
+
+#ifdef HELIX_FEATURE_SERVER
+                TSDPRINTF(B_INFO,
+                    ("%p: Got media info for stream %lu\n", this, \
pESStream->usStreamNum)); +#else
                 HXLOGL3(HXLOG_MPTS, "Got media info for stream %lu", \
pESStream->usStreamNum); +#endif
                 bSet = !m_bMetaMode;
             }
         }
@@ -2172,7 +2185,7 @@
     if (SUCCEEDED(retVal))
     {
         pESStream->pPacketQueue->AddTail(pRTPPacket);
-        if (bKeyFrame)
+        if (bKeyFrame || FALSE == m_pCurrentProgram->bHasVideoStream)
         {
             m_pCurrentProgram->bSeenKeyFrame = TRUE;
         }


_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs


[prev in list] [next in list] [prev in thread] [next in thread]