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

Commit c26c0bee authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "Adding Opus related struct definitions to OMX_Index"

parents 646e2fbd 1a8b0ed9

include/media/openmax/OMX_AudioExt.h

+15 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ extern "C" { 
typedef enum OMX_AUDIO_CODINGEXTTYPE {

    OMX_AUDIO_CodingAndroidUnused = OMX_AUDIO_CodingKhronosExtensions + 0x00100000,

    OMX_AUDIO_CodingAndroidAC3,         /**< AC3 encoded data */

    OMX_AUDIO_CodingAndroidOPUS,        /**< OPUS encoded data */

} OMX_AUDIO_CODINGEXTTYPE;



typedef struct OMX_AUDIO_PARAM_ANDROID_AC3TYPE {
@@ -54,6 +55,20 @@ typedef struct OMX_AUDIO_PARAM_ANDROID_AC3TYPE { 
                                        variable or unknown sampling rate. */

} OMX_AUDIO_PARAM_ANDROID_AC3TYPE;



typedef struct OMX_AUDIO_PARAM_ANDROID_OPUSTYPE {

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

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

    OMX_U32 nPortIndex;       /**< port that this structure applies to */

    OMX_U32 nChannels;        /**< Number of channels */

    OMX_U32 nBitRate;         /**< Bit rate of the encoded data data.  Use 0 for variable

                                   rate or unknown bit rates. Encoding is set to the

                                   bitrate closest to specified  value (in bps) */

    OMX_U32 nSampleRate;      /**< Sampling rate of the source data.  Use 0 for

                                   variable or unknown sampling rate. */

    OMX_U32 nAudioBandWidth;  /**< Audio band width (in Hz) to which an encoder should

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

} OMX_AUDIO_PARAM_ANDROID_OPUSTYPE;



#ifdef __cplusplus

}

#endif /* __cplusplus */

include/media/openmax/OMX_IndexExt.h

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ typedef enum OMX_INDEXEXTTYPE { 
    /* Audio parameters and configurations */

    OMX_IndexExtAudioStartUnused = OMX_IndexKhronosExtensions + 0x00400000,

    OMX_IndexParamAudioAndroidAc3,                  /**< reference: OMX_AUDIO_PARAM_ANDROID_AC3TYPE */

    OMX_IndexParamAudioAndroidOpus,                 /**< reference: OMX_AUDIO_PARAM_ANDROID_OPUSTYPE */



    /* Image parameters and configurations */

    OMX_IndexExtImageStartUnused = OMX_IndexKhronosExtensions + 0x00500000,