diff options
| author | Rachad <rachad@google.com> | 2015-01-10 02:06:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-10 02:06:34 +0000 |
| commit | b00ad66807d7e9fb539c032da8df954ba65c21a4 (patch) | |
| tree | 2dbf3b2d6898620565e4128cede96feb542d9d06 /include/media | |
| parent | e0e29de5c1e9a630679b44af214dc869cd53b809 (diff) | |
| parent | 2f70741547b39b6ec5bf46220427baccc5e570cb (diff) | |
| download | frameworks_native-b00ad66807d7e9fb539c032da8df954ba65c21a4.zip frameworks_native-b00ad66807d7e9fb539c032da8df954ba65c21a4.tar.gz frameworks_native-b00ad66807d7e9fb539c032da8df954ba65c21a4.tar.bz2 | |
am 2f707415: am 806f23de: OpenMax IL: Added support for E-AC3 codec configuration params
* commit '2f70741547b39b6ec5bf46220427baccc5e570cb':
OpenMax IL: Added support for E-AC3 codec configuration params
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/openmax/OMX_AudioExt.h | 10 | ||||
| -rw-r--r-- | include/media/openmax/OMX_IndexExt.h | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/media/openmax/OMX_AudioExt.h b/include/media/openmax/OMX_AudioExt.h index 5ac15f7..2a1c3f2 100644 --- a/include/media/openmax/OMX_AudioExt.h +++ b/include/media/openmax/OMX_AudioExt.h @@ -47,6 +47,7 @@ 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_CodingAndroidEAC3, /**< EAC3 encoded data */ } OMX_AUDIO_CODINGEXTTYPE; typedef struct OMX_AUDIO_PARAM_ANDROID_AC3TYPE { @@ -58,6 +59,15 @@ typedef struct OMX_AUDIO_PARAM_ANDROID_AC3TYPE { variable or unknown sampling rate. */ } OMX_AUDIO_PARAM_ANDROID_AC3TYPE; +typedef struct OMX_AUDIO_PARAM_ANDROID_EAC3TYPE { + 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 nSampleRate; /**< Sampling rate of the source data. Use 0 for + variable or unknown sampling rate. */ +} OMX_AUDIO_PARAM_ANDROID_EAC3TYPE; + typedef struct OMX_AUDIO_PARAM_ANDROID_OPUSTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ diff --git a/include/media/openmax/OMX_IndexExt.h b/include/media/openmax/OMX_IndexExt.h index 699efcb..ea3d0da 100644 --- a/include/media/openmax/OMX_IndexExt.h +++ b/include/media/openmax/OMX_IndexExt.h @@ -60,6 +60,7 @@ typedef enum OMX_INDEXEXTTYPE { OMX_IndexParamAudioAndroidAc3, /**< reference: OMX_AUDIO_PARAM_ANDROID_AC3TYPE */ OMX_IndexParamAudioAndroidOpus, /**< reference: OMX_AUDIO_PARAM_ANDROID_OPUSTYPE */ OMX_IndexParamAudioAndroidAacPresentation, /**< reference: OMX_AUDIO_PARAM_ANDROID_AACPRESENTATIONTYPE */ + OMX_IndexParamAudioAndroidEac3, /**< reference: OMX_AUDIO_PARAM_ANDROID_EAC3TYPE */ /* Image parameters and configurations */ OMX_IndexExtImageStartUnused = OMX_IndexKhronosExtensions + 0x00500000, |