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

Commit 3027855f authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 8f5214eb: am 02ec432e: Merge "If the PES packet size exceeds 16-bit range,... 

am 8f5214eb: am 02ec432e: Merge "If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs." into gingerbread

Merge commit '8f5214eb'

* commit '8f5214eb':
  If the PES packet size exceeds 16-bit range, use a packet size of 0 instead. This is valid for video content according to the specs.
parents f7c51552 8f5214eb

media/libstagefright/MPEG2TSWriter.cpp

+8 −0
Original line number Diff line number Diff line
@@ -725,6 +725,14 @@ void MPEG2TSWriter::writeAccessUnit( 


    size_t PES_packet_length = accessUnit->size() + 8;



    if (PES_packet_length >= 65536) {

        // This really should only happen for video.

        CHECK_EQ(stream_id, 0xe0u);



        // It's valid to set this to 0 for video according to the specs.

        PES_packet_length = 0;

    }



    uint8_t *ptr = buffer->data();

    *ptr++ = 0x47;

    *ptr++ = 0x40 | (PID >> 8);