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

List:       helix-datatype-cvs
Subject:    [Datatype-cvs] mpeg2ts/demuxer tsdemuxer.cpp, 1.5.4.8.2.17, 1.5.4.8.2.18
From:       ching_li () helixcommunity ! org
Date:       2012-03-30 4:38:33
[Download RAW message or body]

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

Modified Files:
      Tag: hxclient_3_6_1_atlas
	tsdemuxer.cpp 
Log Message:
Modified by: qingli@realnetworks.com<mailto:qingli@realnetworks.com>
Date: 03/30/2012
Project: RealPlayer for Android Smartphones
Bug ID: 14315 & 14560
Bug URL: https://bugs.helixcommunity.org/show_bug.cgi?id=14315
         https://bugs.helixcommunity.org/show_bug.cgi?id=14560

Synopsis: Chang to fix a regression issue

Overview: According to Zhang Yuan's feedback, the patch of bug 14315 & 14560 will \
cause an issue, if there are some junk data at the end of the file and is less than \
m_usOffSet, then CTSDemuxer::ScanValidPacket function will not adjust the return \
value, which will cause the ScanEndTime and ParsePES function fail. So change the \
related logic.

Files Added: None

Files Modified:
datatype/mpeg2ts/demuxer/tsdemuxer.cpp

Image Size and Heap Use impact (Client -Only): None

Platforms and Profiles Affected:
Platform: android-4.0-arm-qsd_8x60
Profile: helix-client-android-full

Distribution Libraries Affected:None

Distribution library impact and planned action:None

Platforms and Profiles Build Verified:
Platform: android-4.0-arm-qsd_8x60
Profile: helix-client-android-full

Platforms and Profiles Functionality verified:
Platform: android-4.0-arm-qsd_8x60
Profile: helix-client-android-full

Branch: 361atlas, 361krill

Copyright assignment: I am a RealNetworks employee or contractor

Best Regards!
                          Li Qing
--
RealNetworks China, Beijing Office
Tel: 008601059542848
Fax: 008601085656477
Address: 18th Floor,Tower B,Pacific Century Place,2A GongTiBeiLu,Chaoyang \
District,Beijing, China Post Code: 100027


Index: tsdemuxer.cpp
===================================================================
RCS file: /cvsroot/datatype/mpeg2ts/demuxer/tsdemuxer.cpp,v
retrieving revision 1.5.4.8.2.17
retrieving revision 1.5.4.8.2.18
diff -u -d -r1.5.4.8.2.17 -r1.5.4.8.2.18
--- tsdemuxer.cpp	29 Mar 2012 10:00:15 -0000	1.5.4.8.2.17
+++ tsdemuxer.cpp	30 Mar 2012 04:38:29 -0000	1.5.4.8.2.18
@@ -426,8 +426,8 @@
     HX_RESULT retVal = HXR_OK;
     TSPrefix_t ts_header;
 
-    pData += m_usOffSet;
-    ulSize -= m_usOffSet;
+    // we don't need to adjust the pData and ulSize because they have been
+    // adjusted by ScanValidPacket function
     for ( UINT32 i = 0; i < ulSize && SUCCEEDED( retVal ); i += m_usPacketSize, \
pData += m_usPacketSize )  {
         // header
@@ -806,9 +806,9 @@
                         break;
                     }
                 }
-                if (bOK && i >= m_usOffSet)
+                if (bOK)
                 {
-                    return i - m_usOffSet;
+                    return i;
                 }
             }
         }
@@ -834,9 +834,9 @@
     nSize -= ulStart;
     BYTE * pPESData = pData;
     UINT32 nPESSize = nSize;
+    // we don't need to adjust the pData and nSize because they have been
+    // adjusted by ScanValidPacket function
 
-    pData += m_usOffSet;
-    nSize -= m_usOffSet;
     //we are looking for packets with PCR field
     for (UINT32 i=0; i<nSize; i+=m_usPacketSize, pData+=m_usPacketSize)
     {


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