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

Commit f8dfd8c3 authored by Abubakar Alkali's avatar Abubakar Alkali Committed by Automerger Merge Worker
Browse files

Merge "SoftVideoDecodeOMXComponent: validate OMX params for dynamic HDR" into... 

Merge "SoftVideoDecodeOMXComponent: validate OMX params for dynamic HDR" into rvc-dev am: 00371b64 am: b6b779f7 am: bbe67764 am: 4bcc7008 am: 10ccff24 am: 7d91bc54 am: a67e16c4 am: 0b929e02 am: 1315aa58

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



Change-Id: I85fcfd99f0b53c7bd2eb6d761819fe05f3073268
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a77b0f3d 1315aa58

media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp

+8 −0
Original line number Diff line number Diff line
@@ -616,6 +616,10 @@ OMX_ERRORTYPE SoftVideoDecoderOMXComponent::getConfig( 
                DescribeHDR10PlusInfoParams* outParams =

                        (DescribeHDR10PlusInfoParams *)params;



                if (!isValidOMXParam(outParams)) {

                    return OMX_ErrorBadParameter;

                }



                outParams->nParamSizeUsed = info->size();



                // If the buffer provided by the client does not have enough
@@ -694,6 +698,10 @@ OMX_ERRORTYPE SoftVideoDecoderOMXComponent::internalSetConfig( 
            const DescribeHDR10PlusInfoParams* inParams =

                    (DescribeHDR10PlusInfoParams *)params;



            if (!isValidOMXParam(inParams)) {

                return OMX_ErrorBadParameter;

            }



            if (*frameConfig) {

                // This is a request to append to the current frame config set.

                // For now, we only support kDescribeHdr10PlusInfoIndex, which