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

Commit ae0c0a17 authored by Harish Mahendrakar's avatar Harish Mahendrakar Committed by Lajos Molnar
Browse files

Added support for MPEG2 video in MPEG4Extractor 

Change-Id: I70b1c3a07062526fc6d5333f70f4f1d792834e7f
parent 8b07404c

media/libstagefright/MPEG4Extractor.cpp

100644 → 100755
+13 −1
Original line number Diff line number Diff line
@@ -1665,7 +1665,18 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 
                    return err;

                }

            }

            if (mPath.size() >= 2

                    && mPath[mPath.size() - 2] == FOURCC('m', 'p', '4', 'v')) {

                // Check if the video is MPEG2

                ESDS esds(&buffer[4], chunk_data_size - 4);



                uint8_t objectTypeIndication;

                if (esds.getObjectTypeIndication(&objectTypeIndication) == OK) {

                    if (objectTypeIndication >= 0x60 && objectTypeIndication <= 0x65) {

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

                    }

                }

            }

            break;

        }
@@ -2830,6 +2841,7 @@ status_t MPEG4Extractor::verifyTrack(Track *track) { 
            return ERROR_MALFORMED;

        }

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_VIDEO_MPEG4)

            || !strcasecmp(mime, MEDIA_MIMETYPE_VIDEO_MPEG2)

            || !strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC)) {

        if (!track->meta->findData(kKeyESDS, &type, &data, &size)

                || type != kTypeESDS) {