diff options
| author | 2018-12-12 17:54:40 +0000 | |
|---|---|---|
| committer | 2018-12-12 17:54:40 +0000 | |
| commit | faba0dc129e2d73bb8fc313bfa337baddb2582d6 (patch) | |
| tree | 017a5719493378ece0da8fb8e58cd857a1d2b176 | |
| parent | 132e0e82515ac79746c5c13fbe79cf34049a9544 (diff) | |
| parent | f39e9ea7ae927dca2db2876eb9bfb42ca7d11cd4 (diff) | |
Merge "Add AudioPresentation selection support for MediaCodec"
| -rw-r--r-- | headers/media_plugin/media/openmax/OMX_AsString.h | 1 | ||||
| -rw-r--r-- | headers/media_plugin/media/openmax/OMX_AudioExt.h | 7 | ||||
| -rw-r--r-- | headers/media_plugin/media/openmax/OMX_IndexExt.h | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/headers/media_plugin/media/openmax/OMX_AsString.h b/headers/media_plugin/media/openmax/OMX_AsString.h index 8e75b54520..152015b67f 100644 --- a/headers/media_plugin/media/openmax/OMX_AsString.h +++ b/headers/media_plugin/media/openmax/OMX_AsString.h @@ -535,6 +535,7 @@ inline static const char *asString(OMX_INDEXEXTTYPE i, const char *def = "??") { // case OMX_IndexConfigCommit: return "ConfigCommit"; case OMX_IndexConfigAndroidVendorExtension: return "ConfigAndroidVendorExtension"; case OMX_IndexParamAudioAndroidAc3: return "ParamAudioAndroidAc3"; + case OMX_IndexConfigAudioPresentation: return "ConfigAudioPresentation"; case OMX_IndexParamAudioAndroidOpus: return "ParamAudioAndroidOpus"; case OMX_IndexParamAudioAndroidAacPresentation: return "ParamAudioAndroidAacPresentation"; case OMX_IndexParamAudioAndroidEac3: return "ParamAudioAndroidEac3"; diff --git a/headers/media_plugin/media/openmax/OMX_AudioExt.h b/headers/media_plugin/media/openmax/OMX_AudioExt.h index 1ea740fbdf..477faedef8 100644 --- a/headers/media_plugin/media/openmax/OMX_AudioExt.h +++ b/headers/media_plugin/media/openmax/OMX_AudioExt.h @@ -127,6 +127,13 @@ typedef struct OMX_AUDIO_PARAM_ANDROID_PROFILETYPE { OMX_U32 nProfileIndex; /**< Used to query for individual profile support information */ } OMX_AUDIO_PARAM_ANDROID_PROFILETYPE; +typedef struct OMX_AUDIO_CONFIG_ANDROID_AUDIOPRESENTATION { + OMX_U32 nSize; /**< size of the structure in bytes */ + OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ + OMX_S32 nPresentationId; /**< presentation id */ + OMX_S32 nProgramId; /**< program id */ +} OMX_AUDIO_CONFIG_ANDROID_AUDIOPRESENTATION; + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/headers/media_plugin/media/openmax/OMX_IndexExt.h b/headers/media_plugin/media/openmax/OMX_IndexExt.h index 9fc3ef344e..479e9b8714 100644 --- a/headers/media_plugin/media/openmax/OMX_IndexExt.h +++ b/headers/media_plugin/media/openmax/OMX_IndexExt.h @@ -65,6 +65,7 @@ typedef enum OMX_INDEXEXTTYPE { OMX_IndexParamAudioProfileQuerySupported, /**< reference: OMX_AUDIO_PARAM_ANDROID_PROFILETYPE */ OMX_IndexParamAudioAndroidAacDrcPresentation, /**< reference: OMX_AUDIO_PARAM_ANDROID_AACDRCPRESENTATIONTYPE */ OMX_IndexParamAudioAndroidAc4, /**< reference: OMX_AUDIO_PARAM_ANDROID_AC4TYPE */ + OMX_IndexConfigAudioPresentation, /**< reference: OMX_AUDIO_CONFIG_ANDROID_AUDIOPRESENTATION */ OMX_IndexExtAudioEndUnused, /* Image parameters and configurations */ |