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

Commit 3fd18882 authored by Abubakar Alkali's avatar Abubakar Alkali Committed by Android (Google) Code Review
Browse files

Merge "Validate OMX Params for VPx encoders" into rvc-dev

parents edf60c63 90641b27

media/libstagefright/codecs/on2/enc/SoftVP8Encoder.cpp

+10 −0
Original line number Diff line number Diff line
@@ -120,6 +120,11 @@ OMX_ERRORTYPE SoftVP8Encoder::internalSetParameter(OMX_INDEXTYPE index, 


OMX_ERRORTYPE SoftVP8Encoder::internalGetVp8Params(

        OMX_VIDEO_PARAM_VP8TYPE* vp8Params) {

    if (!isValidOMXParam(vp8Params)) {

        android_errorWriteLog(0x534e4554, "273936274");

        return OMX_ErrorBadParameter;

    }



    if (vp8Params->nPortIndex != kOutputPortIndex) {

        return OMX_ErrorUnsupportedIndex;

    }
@@ -133,6 +138,11 @@ OMX_ERRORTYPE SoftVP8Encoder::internalGetVp8Params( 


OMX_ERRORTYPE SoftVP8Encoder::internalSetVp8Params(

        const OMX_VIDEO_PARAM_VP8TYPE* vp8Params) {

    if (!isValidOMXParam(vp8Params)) {

        android_errorWriteLog(0x534e4554, "273937171");

        return OMX_ErrorBadParameter;

    }



    if (vp8Params->nPortIndex != kOutputPortIndex) {

        return OMX_ErrorUnsupportedIndex;

    }

media/libstagefright/codecs/on2/enc/SoftVP9Encoder.cpp

+10 −0
Original line number Diff line number Diff line
@@ -119,6 +119,11 @@ OMX_ERRORTYPE SoftVP9Encoder::internalSetParameter( 


OMX_ERRORTYPE SoftVP9Encoder::internalGetVp9Params(

        OMX_VIDEO_PARAM_VP9TYPE *vp9Params) {

    if (!isValidOMXParam(vp9Params)) {

        android_errorWriteLog(0x534e4554, "273936553");

        return OMX_ErrorBadParameter;

    }



    if (vp9Params->nPortIndex != kOutputPortIndex) {

        return OMX_ErrorUnsupportedIndex;

    }
@@ -133,6 +138,11 @@ OMX_ERRORTYPE SoftVP9Encoder::internalGetVp9Params( 


OMX_ERRORTYPE SoftVP9Encoder::internalSetVp9Params(

        const OMX_VIDEO_PARAM_VP9TYPE *vp9Params) {

    if (!isValidOMXParam(vp9Params)) {

        android_errorWriteLog(0x534e4554, "273937136");

        return OMX_ErrorBadParameter;

    }



    if (vp9Params->nPortIndex != kOutputPortIndex) {

        return OMX_ErrorUnsupportedIndex;

    }

media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp

+9 −0
Original line number Diff line number Diff line
@@ -485,6 +485,11 @@ OMX_ERRORTYPE SoftVPXEncoder::internalSetBitrateParams( 


OMX_ERRORTYPE SoftVPXEncoder::internalGetAndroidVpxParams(

        OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE *vpxAndroidParams) {

    if (!isValidOMXParam(vpxAndroidParams)) {

        android_errorWriteLog(0x534e4554, "273936601");

        return OMX_ErrorBadParameter;

    }



    if (vpxAndroidParams->nPortIndex != kOutputPortIndex) {

        return OMX_ErrorUnsupportedIndex;

    }
@@ -501,6 +506,10 @@ OMX_ERRORTYPE SoftVPXEncoder::internalGetAndroidVpxParams( 


OMX_ERRORTYPE SoftVPXEncoder::internalSetAndroidVpxParams(

        const OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE *vpxAndroidParams) {

    if (!isValidOMXParam(vpxAndroidParams)) {

        android_errorWriteLog(0x534e4554, "273937551");

        return OMX_ErrorBadParameter;

    }

    if (vpxAndroidParams->nPortIndex != kOutputPortIndex) {

        return OMX_ErrorUnsupportedIndex;

    }