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

Unverified Commit 90713c78 authored by Haripriya Deshmukh's avatar Haripriya Deshmukh Committed by Kevin F. Haggerty
Browse files

Validate OMX Params for VPx encoders 

Bug: 273936274
Bug: 273937171
Bug: 273937136
Bug: 273936553
Bug: 273936601
Test: POC in bug descriptions
(cherry picked from https://partner-android-review.googlesource.com/q/commit:022086b76536cd2e19a44053271190bdf6e181f7)
(cherry picked from commit 0e4ca1cb)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:90641b2799fd3940cdf0bf8a73b2f76839e651a6)
Merged-In: I9bb17112d9f0217b6af0343afecc9c943453b757
Change-Id: I9bb17112d9f0217b6af0343afecc9c943453b757
parent b4337548

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;

    }