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

Commit 56849dfd authored by Iris Chang's avatar Iris Chang Committed by Ray Essick
Browse files

Skip incorrect MPEG audio frame 

Esqueue may receive incorrect MPEG audio frames with wrong layer or
wrong framesize after seek. MP3 decoder will fail to decode and play
abnormally.

The solution is to skip the frames with wrong layer and wrong
framesize.

Bug: 124268510
Test: play .ts file, seek several times during playback
Change-Id: I7fbe7c68871d4257c95235d172a4f11b405bf6d5
parent be32a246

media/libstagefright/mpeg2ts/ESQueue.cpp

+17 −0
Original line number Diff line number Diff line
@@ -1526,6 +1526,7 @@ sp<ABuffer> ElementaryStreamQueue::dequeueAccessUnitMPEGAudio() { 
                header, &frameSize, &samplingRate, &numChannels,

                &bitrate, &numSamples)) {

        ALOGE("Failed to get audio frame size");

        mBuffer->setRange(0, 0);

        return NULL;

    }
@@ -1550,6 +1551,22 @@ sp<ABuffer> ElementaryStreamQueue::dequeueAccessUnitMPEGAudio() { 
        return NULL;

    }



    if (mFormat != NULL) {

        const char *mime;

        if (mFormat->findCString(kKeyMIMEType, &mime)) {

            if ((layer == 1) && strcmp (mime, MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_I)) {

                ALOGE("Audio layer is not MPEG_LAYER_I");

                return NULL;

            } else if ((layer == 2) && strcmp (mime, MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_II)) {

                ALOGE("Audio layer is not MPEG_LAYER_II");

                return NULL;

            } else if ((layer == 3) && strcmp (mime, MEDIA_MIMETYPE_AUDIO_MPEG)) {

                ALOGE("Audio layer is not AUDIO_MPEG");

                return NULL;

            }

        }

    }



    accessUnit->meta()->setInt64("timeUs", timeUs);

    accessUnit->meta()->setInt32("isSync", 1);