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

Commit c87073d6 authored by Iris Chang's avatar Iris Chang Committed by Marco Nelissen
Browse files

Cannot play mov file with samr box 

Problem: Cannot play mov file which has stsd->wave->samr.

Solution: delete the judge condition
"chunk_type == FOURCC('m','p','4','a')" to make other
audio type can play, not only mp4a can be played.

Bug: 123166627
Test: test with the file which has stsd->wave->samr and
check if it can be played normally.

Change-Id: I7816230af39d99b3f73085db04b8bd7acccd3a19
parent 9c3e0dac

media/extractors/mp4/MPEG4Extractor.cpp

+3 −4
Original line number Diff line number Diff line
@@ -1635,9 +1635,8 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 
        case FOURCC(".mp3"):

        case 0x6D730055: // "ms U" mp3 audio

        {

            if (mIsQT && chunk_type == FOURCC("mp4a")

                    && depth >= 1 && mPath[depth - 1] == FOURCC("wave")) {

                // Ignore mp4a embedded in QT wave atom

            if (mIsQT && depth >= 1 && mPath[depth - 1] == FOURCC("wave")) {

                // Ignore all atoms embedded in QT wave atom

                *offset += chunk_size;

                break;

            }
@@ -1666,7 +1665,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 
            off64_t stop_offset = *offset + chunk_size;

            *offset = data_offset + sizeof(buffer);



            if (mIsQT && chunk_type == FOURCC("mp4a")) {

            if (mIsQT) {

                if (version == 1) {

                    if (mDataSource->readAt(*offset, buffer, 16) < 16) {

                        return ERROR_IO;