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

Commit e4e1a724 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Attemp to make mkv's AAC CSD data if codecprivate is short" into qt-dev am: b69bbb60 

am: b2e4862f

Change-Id: I360856b627c785bb6a1baa65721005fccadac376
parents f2294ddc b2e4862f

media/extractors/mkv/MatroskaExtractor.cpp

+4 −2
Original line number Diff line number Diff line
@@ -2109,8 +2109,10 @@ void MatroskaExtractor::addTracks() { 


                if (!strcmp("A_AAC", codecID)) {

                    AMediaFormat_setString(meta, AMEDIAFORMAT_KEY_MIME, MEDIA_MIMETYPE_AUDIO_AAC);

                    CHECK(codecPrivateSize >= 2);



                    if (codecPrivateSize < 2) {

                        ALOGW("Incomplete AAC Codec Info %zu byte", codecPrivateSize);

                        continue;

                    }

                    addESDSFromCodecPrivate(

                            meta, true, codecPrivate, codecPrivateSize);

                } else if (!strcmp("A_VORBIS", codecID)) {