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

Commit 618e9492 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... 

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

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



Change-Id: I035aac8023b2456424b02eafed8956da6e13354b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1836df8f 068cc11d

media/libstagefright/MediaCodec.cpp

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

                    }

                }

                }

            }

            }

            int32_t largeFrameParam;

            int32_t largeFrameParamMax = 0, largeFrameParamThreshold = 0;

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

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

                    format->findInt32(KEY_BUFFER_BATCH_THRESHOLD_OUTPUT_SIZE,

                    format->findInt32(KEY_BUFFER_BATCH_THRESHOLD_OUTPUT_SIZE,

                    &largeFrameParam)) {

                    &largeFrameParamThreshold)) {

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

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

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

                        mErrorLog.log(LOG_TAG,

                        mErrorLog.log(LOG_TAG,

                                "Large Frame params are not supported on OMX codecs."

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

                        break;

                    }

                    }

                }

                }

            }





            mReplyID = replyID;

            mReplyID = replyID;

            setState(CONFIGURING);

            setState(CONFIGURING);