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

Commit 76016ccf authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "stagefright: get profile/level from codec-specific-data" into nyc-dev

parents f3d9908a 07b2fbfb

media/libstagefright/MPEG4Extractor.cpp

+3 −2
Original line number Diff line number Diff line
@@ -1566,8 +1566,9 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 


                const char *mime;

                CHECK(mLastTrack->meta->findCString(kKeyMIMEType, &mime));

                if (!strcmp(mime, MEDIA_MIMETYPE_VIDEO_AVC)) {

                    // AVC requires compression ratio of at least 2, and uses

                if (!strcmp(mime, MEDIA_MIMETYPE_VIDEO_AVC)

                        || !strcmp(mime, MEDIA_MIMETYPE_VIDEO_HEVC)) {

                    // AVC & HEVC requires compression ratio of at least 2, and uses

                    // macroblocks

                    max_size = ((width + 15) / 16) * ((height + 15) / 16) * 192;

                } else {

media/libstagefright/MPEG4Writer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1957,6 +1957,7 @@ const uint8_t *MPEG4Writer::Track::parseParamSet( 
            if (mProfileIdc != data[1] ||

                mProfileCompatible != data[2] ||

                mLevelIdc != data[3]) {

                // COULD DO: set profile/level to the lowest required to support all SPSs

                ALOGE("Inconsistent profile/level found in seq parameter sets");

                return NULL;

            }

media/libstagefright/Utils.cpp

+437 −5

File changed.

Preview size limit exceeded, changes collapsed.