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

Commit bcef8760 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move VP9 Encoder parameters to the end of the enum"

parents 1a516bbd 79d98e22

include/media/openmax/OMX_AsString.h

+4 −0
Original line number Diff line number Diff line
@@ -534,6 +534,8 @@ inline static const char *asString(OMX_INDEXEXTTYPE i, const char *def = "??") { 
        case OMX_IndexParamAudioAndroidAc3:             return "ParamAudioAndroidAc3";

        case OMX_IndexParamAudioAndroidOpus:            return "ParamAudioAndroidOpus";

        case OMX_IndexParamAudioAndroidAacPresentation: return "ParamAudioAndroidAacPresentation";

        case OMX_IndexParamAudioAndroidEac3:            return "ParamAudioAndroidEac3";

        case OMX_IndexParamAudioProfileQuerySupported:  return "ParamAudioProfileQuerySupported";

//      case OMX_IndexParamNalStreamFormatSupported:    return "ParamNalStreamFormatSupported";

//      case OMX_IndexParamNalStreamFormat:             return "ParamNalStreamFormat";

//      case OMX_IndexParamNalStreamFormatSelect:       return "ParamNalStreamFormatSelect";
@@ -548,6 +550,8 @@ inline static const char *asString(OMX_INDEXEXTTYPE i, const char *def = "??") { 
        case OMX_IndexConfigAndroidVideoTemporalLayering: return "ConfigAndroidVideoTemporalLayering";

        case OMX_IndexParamMaxFrameDurationForBitrateControl:

            return "ParamMaxFrameDurationForBitrateControl";

        case OMX_IndexParamVideoVp9:                    return "ParamVideoVp9";

        case OMX_IndexParamVideoAndroidVp9Encoder:      return "ParamVideoAndroidVp9Encoder";

        case OMX_IndexConfigAutoFramerateConversion:    return "ConfigAutoFramerateConversion";

        case OMX_IndexConfigPriority:                   return "ConfigPriority";

        case OMX_IndexConfigOperatingRate:              return "ConfigOperatingRate";

include/media/openmax/OMX_IndexExt.h

+2 −2
Original line number Diff line number Diff line
@@ -76,14 +76,14 @@ typedef enum OMX_INDEXEXTTYPE { 
    OMX_IndexConfigVideoVp8ReferenceFrame,          /**< reference: OMX_VIDEO_VP8REFERENCEFRAMETYPE */

    OMX_IndexConfigVideoVp8ReferenceFrameType,      /**< reference: OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE */

    OMX_IndexParamVideoAndroidVp8Encoder,           /**< reference: OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE */

    OMX_IndexParamVideoVp9,                         /**< reference: OMX_VIDEO_PARAM_VP9TYPE */

    OMX_IndexParamVideoAndroidVp9Encoder,           /**< reference: OMX_VIDEO_PARAM_ANDROID_VP9ENCODERTYPE */

    OMX_IndexParamVideoHevc,                        /**< reference: OMX_VIDEO_PARAM_HEVCTYPE */

    OMX_IndexParamSliceSegments,                    /**< reference: OMX_VIDEO_SLICESEGMENTSTYPE */

    OMX_IndexConfigAndroidIntraRefresh,             /**< reference: OMX_VIDEO_CONFIG_ANDROID_INTRAREFRESHTYPE */

    OMX_IndexParamAndroidVideoTemporalLayering,     /**< reference: OMX_VIDEO_PARAM_ANDROID_TEMPORALLAYERINGTYPE */

    OMX_IndexConfigAndroidVideoTemporalLayering,    /**< reference: OMX_VIDEO_CONFIG_ANDROID_TEMPORALLAYERINGTYPE */

    OMX_IndexParamMaxFrameDurationForBitrateControl,/**< reference: OMX_PARAM_U32TYPE */

    OMX_IndexParamVideoVp9,                         /**< reference: OMX_VIDEO_PARAM_VP9TYPE */

    OMX_IndexParamVideoAndroidVp9Encoder,           /**< reference: OMX_VIDEO_PARAM_ANDROID_VP9ENCODERTYPE */

    OMX_IndexExtVideoEndUnused,



    /* Image & Video common configurations */