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

Commit 7d807755 authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge "Change softvpx buffer count to 10" into pi-dev am: 4a6842fc 

am: 3fdcae8a

Change-Id: I2c354eec2149a306a01697de270018ec9996756c
parents ec04b2c7 3fdcae8a

media/libstagefright/codecs/on2/dec/SoftVPX.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ protected: 


private:

    enum {

        kNumBuffers = 16

        kNumBuffers = 10

    };



    enum {

media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp

+15 −5
Original line number Diff line number Diff line
@@ -563,6 +563,10 @@ OMX_ERRORTYPE SoftVideoDecoderOMXComponent::getConfig( 
            DescribeColorAspectsParams* colorAspectsParams =

                    (DescribeColorAspectsParams *)params;



            if (!isValidOMXParam(colorAspectsParams)) {

                return OMX_ErrorBadParameter;

            }



            if (colorAspectsParams->nPortIndex != kOutputPortIndex) {

                return OMX_ErrorBadParameter;

            }
@@ -584,6 +588,10 @@ OMX_ERRORTYPE SoftVideoDecoderOMXComponent::getConfig( 
            DescribeHDRStaticInfoParams* hdrStaticInfoParams =

                    (DescribeHDRStaticInfoParams *)params;



            if (!isValidOMXParam(hdrStaticInfoParams)) {

                return OMX_ErrorBadParameter;

            }



            if (hdrStaticInfoParams->nPortIndex != kOutputPortIndex) {

                return OMX_ErrorBadPortIndex;

            }
@@ -635,15 +643,17 @@ OMX_ERRORTYPE SoftVideoDecoderOMXComponent::setConfig( 
            const DescribeHDRStaticInfoParams* hdrStaticInfoParams =

                    (DescribeHDRStaticInfoParams *)params;



            if (!isValidOMXParam(hdrStaticInfoParams)) {

                return OMX_ErrorBadParameter;

            }



            if (hdrStaticInfoParams->nPortIndex != kOutputPortIndex) {

                return OMX_ErrorBadPortIndex;

            }



            if (hdrStaticInfoParams != NULL) {

            mOutputFormat = OMX_COLOR_FormatYUV420Planar16;

            mHdrStaticInfo = hdrStaticInfoParams->sInfo;

            updatePortDefinitions(false);

            }



            return OMX_ErrorNone;

        }