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

Commit 462ad0cd authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Modifies the large frame config checks based on non-zero config" into main

parents 614381a1 0e1c822f

media/libstagefright/MediaCodec.cpp

+25 −23
Original line number Diff line number Diff line
@@ -4839,10 +4839,11 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
                    }

                }

            }

            int32_t largeFrameParam;

            if (format->findInt32(KEY_BUFFER_BATCH_MAX_OUTPUT_SIZE, &largeFrameParam) ||

            int32_t largeFrameParamMax = 0, largeFrameParamThreshold = 0;

            if (format->findInt32(KEY_BUFFER_BATCH_MAX_OUTPUT_SIZE, &largeFrameParamMax) ||

                    format->findInt32(KEY_BUFFER_BATCH_THRESHOLD_OUTPUT_SIZE,

                    &largeFrameParam)) {

                    &largeFrameParamThreshold)) {

                if (largeFrameParamMax > 0 || largeFrameParamThreshold > 0) {

                    if(mComponentName.startsWith("OMX")) {

                        mErrorLog.log(LOG_TAG,

                                "Large Frame params are not supported on OMX codecs."
@@ -4865,6 +4866,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
                        break;

                    }

                }

            }



            mReplyID = replyID;

            setState(CONFIGURING);