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

Commit d8bb72bf authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

Merge "OMX AAC: define DRC effect type param & xHE object" into pi-dev 

am: ef1f4140

Change-Id: I762210e89e639ad53585051b9a60cdc65d69d971
parents b0f9e355 ef1f4140

headers/media_plugin/media/openmax/OMX_Audio.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -263,6 +263,7 @@ typedef enum OMX_AUDIO_AACPROFILETYPE{ 
  OMX_AUDIO_AACObjectLD = 23,       /**< AAC Low Delay object (Error Resilient) */

  OMX_AUDIO_AACObjectLD = 23,       /**< AAC Low Delay object (Error Resilient) */

  OMX_AUDIO_AACObjectHE_PS = 29,    /**< AAC High Efficiency with Parametric Stereo coding (HE-AAC v2, object type PS) */

  OMX_AUDIO_AACObjectHE_PS = 29,    /**< AAC High Efficiency with Parametric Stereo coding (HE-AAC v2, object type PS) */

  OMX_AUDIO_AACObjectELD = 39,      /** AAC Enhanced Low Delay. NOTE: Pending Khronos standardization **/

  OMX_AUDIO_AACObjectELD = 39,      /** AAC Enhanced Low Delay. NOTE: Pending Khronos standardization **/

  OMX_AUDIO_AACObjectXHE = 42,      /** extended High Efficiency AAC. NOTE: Pending Khronos standardization */

  OMX_AUDIO_AACObjectKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */

  OMX_AUDIO_AACObjectKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */

  OMX_AUDIO_AACObjectVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */

  OMX_AUDIO_AACObjectVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */

  OMX_AUDIO_AACObjectMax = 0x7FFFFFFF

  OMX_AUDIO_AACObjectMax = 0x7FFFFFFF

headers/media_plugin/media/openmax/OMX_AudioExt.h

+14 −0
Original line number Original line Diff line number Diff line
@@ -82,6 +82,7 @@ typedef struct OMX_AUDIO_PARAM_ANDROID_OPUSTYPE { 
                                   limit the audio signal. Use 0 to let encoder decide */

                                   limit the audio signal. Use 0 to let encoder decide */

} OMX_AUDIO_PARAM_ANDROID_OPUSTYPE;

} OMX_AUDIO_PARAM_ANDROID_OPUSTYPE;





/** deprecated. use OMX_AUDIO_PARAM_ANDROID_AACDRCPRESENTATIONTYPE */

typedef struct OMX_AUDIO_PARAM_ANDROID_AACPRESENTATIONTYPE {

typedef struct OMX_AUDIO_PARAM_ANDROID_AACPRESENTATIONTYPE {

    OMX_U32 nSize;            /**< size of the structure in bytes */

    OMX_U32 nSize;            /**< size of the structure in bytes */

    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */

    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */
@@ -94,6 +95,19 @@ typedef struct OMX_AUDIO_PARAM_ANDROID_AACPRESENTATIONTYPE { 
    OMX_S32 nPCMLimiterEnable;     /**< Signal level limiting, 0 for disable, 1 for enable, -1 if unspecified */

    OMX_S32 nPCMLimiterEnable;     /**< Signal level limiting, 0 for disable, 1 for enable, -1 if unspecified */

} OMX_AUDIO_PARAM_ANDROID_AACPRESENTATIONTYPE;

} OMX_AUDIO_PARAM_ANDROID_AACPRESENTATIONTYPE;





typedef struct OMX_AUDIO_PARAM_ANDROID_AACDRCPRESENTATIONTYPE {

    OMX_U32 nSize;            /**< size of the structure in bytes */

    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */

    OMX_S32 nMaxOutputChannels;    /**< Maximum channel count to be output, -1 if unspecified, 0 if downmixing disabled */

    OMX_S32 nDrcCut;               /**< The DRC attenuation factor, between 0 and 127, -1 if unspecified */

    OMX_S32 nDrcBoost;             /**< The DRC amplification factor, between 0 and 127, -1 if unspecified */

    OMX_S32 nHeavyCompression;     /**< 0 for light compression, 1 for heavy compression, -1 if unspecified */

    OMX_S32 nTargetReferenceLevel; /**< Target reference level, between 0 and 127, -1 if unspecified */

    OMX_S32 nEncodedTargetLevel;   /**< Target reference level assumed at the encoder, between 0 and 127, -1 if unspecified */

    OMX_S32 nPCMLimiterEnable;     /**< Signal level limiting, 0 for disable, 1 for enable, -1 if unspecified */

    OMX_S32 nDrcEffectType;        /**< MPEG-D DRC effect type, between -1 and 6, -2 if unspecified */

} OMX_AUDIO_PARAM_ANDROID_AACDRCPRESENTATIONTYPE;



typedef struct OMX_AUDIO_PARAM_ANDROID_PROFILETYPE {

typedef struct OMX_AUDIO_PARAM_ANDROID_PROFILETYPE {

   OMX_U32 nSize;

   OMX_U32 nSize;

   OMX_VERSIONTYPE nVersion;

   OMX_VERSIONTYPE nVersion;

headers/media_plugin/media/openmax/OMX_IndexExt.h

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

    OMX_IndexParamAudioAndroidAacPresentation,      /**< reference: OMX_AUDIO_PARAM_ANDROID_AACPRESENTATIONTYPE */

    OMX_IndexParamAudioAndroidEac3,                 /**< reference: OMX_AUDIO_PARAM_ANDROID_EAC3TYPE */

    OMX_IndexParamAudioAndroidEac3,                 /**< reference: OMX_AUDIO_PARAM_ANDROID_EAC3TYPE */

    OMX_IndexParamAudioProfileQuerySupported,       /**< reference: OMX_AUDIO_PARAM_ANDROID_PROFILETYPE */

    OMX_IndexParamAudioProfileQuerySupported,       /**< reference: OMX_AUDIO_PARAM_ANDROID_PROFILETYPE */

    OMX_IndexParamAudioAndroidAacDrcPresentation,   /**< reference: OMX_AUDIO_PARAM_ANDROID_AACDRCPRESENTATIONTYPE */

    OMX_IndexExtAudioEndUnused,

    OMX_IndexExtAudioEndUnused,





    /* Image parameters and configurations */

    /* Image parameters and configurations */