Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c7951af authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Assume a PTS of 0 if absent, don't bail on fragmented PES packets not... 

Merge "Assume a PTS of 0 if absent, don't bail on fragmented PES packets not having PTS" into ics-mr0
parents fd8f6f2f 33d94067

media/libstagefright/mpeg2ts/ATSParser.cpp

+4 −2
Original line number Diff line number Diff line
@@ -724,8 +724,10 @@ void ATSParser::Stream::onPayloadData( 
        const uint8_t *data, size_t size) {

    LOGV("onPayloadData mStreamType=0x%02x", mStreamType);



    CHECK(PTS_DTS_flags == 2 || PTS_DTS_flags == 3);

    int64_t timeUs = mProgram->convertPTSToTimestamp(PTS);

    int64_t timeUs = 0ll;  // no presentation timestamp available.

    if (PTS_DTS_flags == 2 || PTS_DTS_flags == 3) {

        timeUs = mProgram->convertPTSToTimestamp(PTS);

    }



    status_t err = mQueue->appendData(data, size, timeUs);

media/libstagefright/mpeg2ts/ESQueue.cpp

+4 −0
Original line number Diff line number Diff line
@@ -444,6 +444,10 @@ int64_t ElementaryStreamQueue::fetchTimestamp(size_t size) { 
        }

    }



    if (timeUs == 0ll) {

        LOGV("Returning 0 timestamp");

    }



    return timeUs;

}