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

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] mpeg2ts/demuxer tsdemuxer.cpp,1.21.2.2,1.21.2.2.2.1
From:       xiaochengli () helixcommunity ! org
Date:       2013-04-26 9:05:52
[Download RAW message or body]

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

Modified Files:
      Tag: SERVER_15_0_3_LR
	tsdemuxer.cpp 
Log Message:
Synopsis:
===============
CR: HLXSRV-247: Disable All Bit Rate not work for Multi-bit-rate TS ingress

Branch: SERVER_15_0_RN, HEAD, SERVER_15_0_3_LR

Suggested Reviewers: Anyone

Description:
===============
Config variable "EnableAllBitRates" doesn't be transferred to streamff layer. 

Files affected:
===============
datatype/mpeg2ts/demuxer/tsdemuxer.cpp
server_rn/broadcast/transport/mpeg2ts/recv/sourcehandler.cpp

Testing Performed:
===============
Streaming with MediaExcel encoder. SR and MR with different configuration is ok. 

Performance Tests:
N/A

QA Hints
========
Need to verify SR/MR rate ingest feed with "EnableAllBitRates" enable/disable. 


Index: tsdemuxer.cpp
===================================================================
RCS file: /cvsroot/datatype/mpeg2ts/demuxer/tsdemuxer.cpp,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.2.2.1
diff -u -d -r1.21.2.2 -r1.21.2.2.2.1
--- tsdemuxer.cpp	12 Apr 2013 13:15:57 -0000	1.21.2.2
+++ tsdemuxer.cpp	26 Apr 2013 09:05:34 -0000	1.21.2.2.2.1
@@ -773,6 +773,9 @@
     {
         res = SetCurrentProgram(0);
     }
+	
+    HXBOOL bHaveVideo = FALSE;
+    HXBOOL bHaveAudio = FALSE;
 
     UINT16 i;
     if (m_szLang[0] != '\0')
@@ -837,15 +840,29 @@
             {   
                 res = SubscribeStream(pESStream);
                 bNeedVideo = FAILED(res);
+                bHaveVideo = SUCCEEDED(res);
             }
             else if (pESStream->bAudioStream && bNeedAudio)
             {
                 res = SubscribeStream(pESStream);
                 bNeedAudio = FAILED(res);
+                bHaveAudio = SUCCEEDED(res);
             }
         }
     }
 
+    if (bHaveVideo)
+    {
+        m_usStreamGroupNumber++;
+        m_usVideoStreamGroup = 1;
+    }
+    
+    if (bHaveAudio)
+    {
+        m_usStreamGroupNumber++;
+        m_usAudioStreamGroup = m_usVideoStreamGroup + 1;
+    }
+
     return res;
 }
 


_______________________________________________
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]