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

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

Merge "Validate OMX Params for VPx encoders" into rvc-dev am: 3fd18882 am:... 

Merge "Validate OMX Params for VPx encoders" into rvc-dev am: 3fd18882 am: 1ccb8b4d am: 9b2cc102 am: d1fa2825 am: e46bfeb6 am: faf30491 am: 255b91ee

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



Change-Id: I2273a0afed72a93123a0f8f27e7e0e97d9e1a817
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 373d9e53 255b91ee

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;

    }