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

Commit 068cc11d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Modifies the large frame config checks based on non-zero config" into main am: 462ad0cd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2944566



Change-Id: If04bd4bfefa50aad33de1e7a0076db942f631c10
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d51df234 462ad0cd

media/libstagefright/MediaCodec.cpp

+25 −23
Original line number Diff line number Diff line
@@ -4837,10 +4837,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."
@@ -4863,6 +4864,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
                        break;

                    }

                }

            }



            mReplyID = replyID;

            setState(CONFIGURING);