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

Commit b69bbb60 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

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

parents 90d1d538 d3b761d1

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)) {