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

Commit dcdfe1a1 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android Git Automerger
Browse files

am d35955dd: Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before... 

am d35955dd: Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into mnc-dev

* commit 'd35955dd':
  stagefright: MPEG4Extractor: allow 'hdlr' box before first track
parents ef782669 d35955dd

media/libstagefright/MPEG4Extractor.cpp

+3 −4
Original line number Diff line number Diff line
@@ -1952,16 +1952,15 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 
                return ERROR_IO;

            }



            if (mLastTrack == NULL)

                return ERROR_MALFORMED;



            uint32_t type = ntohl(buffer);

            // For the 3GPP file format, the handler-type within the 'hdlr' box

            // shall be 'text'. We also want to support 'sbtl' handler type

            // for a practical reason as various MPEG4 containers use it.

            if (type == FOURCC('t', 'e', 'x', 't') || type == FOURCC('s', 'b', 't', 'l')) {

                if (mLastTrack != NULL) {

                    mLastTrack->meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_TEXT_3GPP);

                }

            }



            break;

        }