Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8c7951af: Merge "Assume a PTS of 0 if absent, don\'t bail on fragmented PES packets not having PTS" into ics-mr0

Browse Source 
* commit '8c7951afa28ffa08efe3c920db364788a0968f94':
  Assume a PTS of 0 if absent, don't bail on fragmented PES packets not having PTS
This commit is contained in:
Andreas Huber
2011-10-12 13:52:21 -07:00
committed by Android Git Automerger
parent 19de9efcc4 8c7951afa2
commit eb763a7b02
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/libstagefright/mpeg2ts/ATSParser.cpp
View File

@@ -724,8 +724,10 @@ void ATSParser::Stream::onPayloadData(
const uint8_t *data, size_t size) { const uint8_t *data, size_t size) {
LOGV("onPayloadData mStreamType=0x%02x", mStreamType); LOGV("onPayloadData mStreamType=0x%02x", mStreamType);
CHECK(PTS_DTS_flags == 2 || PTS_DTS_flags == 3); int64_t timeUs = 0ll; // no presentation timestamp available.
int64_t timeUs = mProgram->convertPTSToTimestamp(PTS); if (PTS_DTS_flags == 2 || PTS_DTS_flags == 3) {
timeUs = mProgram->convertPTSToTimestamp(PTS);
}
status_t err = mQueue->appendData(data, size, timeUs); status_t err = mQueue->appendData(data, size, timeUs);

4
media/libstagefright/mpeg2ts/ESQueue.cpp
View File

@@ -444,6 +444,10 @@ int64_t ElementaryStreamQueue::fetchTimestamp(size_t size) {
} }
} }
if (timeUs == 0ll) {
LOGV("Returning 0 timestamp");
}
return timeUs; return timeUs;
} }