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

Commit 69eaed36 authored by Chong Zhang's avatar Chong Zhang
Browse files

IOMX: adding OMX_IndexParamMaxFrameDurationForBitrateControl 

Also adding end tag for index groups where we explictly validate.

bug: 31399200
Change-Id: I164ea60258bae809dd4ff389f2480add926a9c4b
parent f29cd52b

include/media/openmax/OMX_AsString.h

+2 −0
Original line number Diff line number Diff line
@@ -546,6 +546,8 @@ inline static const char *asString(OMX_INDEXEXTTYPE i, const char *def = "??") { 
        case OMX_IndexConfigAndroidIntraRefresh:        return "ConfigAndroidIntraRefresh";

        case OMX_IndexParamAndroidVideoTemporalLayering: return "ParamAndroidVideoTemporalLayering";

        case OMX_IndexConfigAndroidVideoTemporalLayering: return "ConfigAndroidVideoTemporalLayering";

        case OMX_IndexParamMaxFrameDurationForBitrateControl:

            return "ParamMaxFrameDurationForBitrateControl";

        case OMX_IndexConfigAutoFramerateConversion:    return "ConfigAutoFramerateConversion";

        case OMX_IndexConfigPriority:                   return "ConfigPriority";

        case OMX_IndexConfigOperatingRate:              return "ConfigOperatingRate";

include/media/openmax/OMX_Index.h

+6 −0
Original line number Diff line number Diff line
@@ -98,10 +98,13 @@ typedef enum OMX_INDEXTYPE { 
    OMX_IndexParamMetadataKeyFilter,        /**< reference: OMX_PARAM_METADATAFILTERTYPE */

    OMX_IndexConfigPriorityMgmt,            /**< reference: OMX_PRIORITYMGMTTYPE */

    OMX_IndexParamStandardComponentRole,    /**< reference: OMX_PARAM_COMPONENTROLETYPE */

    OMX_IndexComponentEndUnused,



    OMX_IndexPortStartUnused = 0x02000000,

    OMX_IndexParamPortDefinition,           /**< reference: OMX_PARAM_PORTDEFINITIONTYPE */

    OMX_IndexParamCompBufferSupplier,       /**< reference: OMX_PARAM_BUFFERSUPPLIERTYPE */

    OMX_IndexPortEndUnused,



    OMX_IndexReservedStartUnused = 0x03000000,



    /* Audio parameters and configurations */
@@ -134,6 +137,7 @@ typedef enum OMX_INDEXTYPE { 
    OMX_IndexParamAudioSmv,                 /**< reference: OMX_AUDIO_PARAM_SMVTYPE */

    OMX_IndexParamAudioVorbis,              /**< reference: OMX_AUDIO_PARAM_VORBISTYPE */

    OMX_IndexParamAudioFlac,                /**< reference: OMX_AUDIO_PARAM_FLACTYPE */

    OMX_IndexAudioEndUnused,



    OMX_IndexConfigAudioMidiImmediateEvent, /**< reference: OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE */

    OMX_IndexConfigAudioMidiControl,        /**< reference: OMX_AUDIO_CONFIG_MIDICONTROLTYPE */
@@ -194,6 +198,7 @@ typedef enum OMX_INDEXTYPE { 
    OMX_IndexParamVideoSliceFMO,            /**< reference: OMX_VIDEO_PARAM_AVCSLICEFMO */

    OMX_IndexConfigVideoAVCIntraPeriod,     /**< reference: OMX_VIDEO_CONFIG_AVCINTRAPERIOD */

    OMX_IndexConfigVideoNalSize,            /**< reference: OMX_VIDEO_CONFIG_NALSIZE */

    OMX_IndexVideoEndUnused,



    /* Image & Video common Configurations */

    OMX_IndexCommonStartUnused = 0x07000000,
@@ -231,6 +236,7 @@ typedef enum OMX_INDEXTYPE { 
    OMX_IndexConfigCommonFocusRegion,       /**< reference: OMX_CONFIG_FOCUSREGIONTYPE */

    OMX_IndexConfigCommonFocusStatus,       /**< reference: OMX_PARAM_FOCUSSTATUSTYPE */

    OMX_IndexConfigCommonTransitionEffect,  /**< reference: OMX_CONFIG_TRANSITIONEFFECTTYPE */

    OMX_IndexCommonEndUnused,



    /* Reserved Configuration range */

    OMX_IndexOtherStartUnused = 0x08000000,

include/media/openmax/OMX_IndexExt.h

+4 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ typedef enum OMX_INDEXEXTTYPE { 
    OMX_IndexParamAudioAndroidAacPresentation,      /**< reference: OMX_AUDIO_PARAM_ANDROID_AACPRESENTATIONTYPE */

    OMX_IndexParamAudioAndroidEac3,                 /**< reference: OMX_AUDIO_PARAM_ANDROID_EAC3TYPE */

    OMX_IndexParamAudioProfileQuerySupported,       /**< reference: OMX_AUDIO_PARAM_ANDROID_PROFILETYPE */

    OMX_IndexExtAudioEndUnused,



    /* Image parameters and configurations */

    OMX_IndexExtImageStartUnused = OMX_IndexKhronosExtensions + 0x00500000,
@@ -82,6 +83,8 @@ typedef enum OMX_INDEXEXTTYPE { 
    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_IndexExtVideoEndUnused,



    /* Image & Video common configurations */

    OMX_IndexExtCommonStartUnused = OMX_IndexKhronosExtensions + 0x00700000,
@@ -92,6 +95,7 @@ typedef enum OMX_INDEXEXTTYPE { 
    OMX_IndexConfigPriority,                        /**< reference: OMX_PARAM_U32TYPE */

    OMX_IndexConfigOperatingRate,                   /**< reference: OMX_PARAM_U32TYPE in Q16 format for video and in Hz for audio */

    OMX_IndexParamConsumerUsageBits,                /**< reference: OMX_PARAM_U32TYPE */

    OMX_IndexExtOtherEndUnused,



    /* Time configurations */

    OMX_IndexExtTimeStartUnused = OMX_IndexKhronosExtensions + 0x00900000,