diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-10-03 22:23:50 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-10-03 22:23:50 -0700 |
| commit | c6a3f9f24edf92868aac5f1f59d1b98ce914b1be (patch) | |
| tree | 88802a7e3f32d27d94aba0e2f2b6b7ed69a6c33d /mm-core | |
| parent | ca78e9cf4155b703b9bd9ad19c712e6c8926a5e5 (diff) | |
| parent | 68b8290bfe51a6f47bb9119720e7c4fe79cb50da (diff) | |
| download | media-c6a3f9f24edf92868aac5f1f59d1b98ce914b1be.tar.gz | |
Merge "mm-core: add index and structure for profile type query"
Diffstat (limited to 'mm-core')
| -rw-r--r-- | mm-core/inc/OMX_IndexExt.h | 6 | ||||
| -rw-r--r-- | mm-core/inc/QOMX_AudioExtensions.h | 11 |
2 files changed, 16 insertions, 1 deletions
diff --git a/mm-core/inc/OMX_IndexExt.h b/mm-core/inc/OMX_IndexExt.h index d8278653..8948393b 100644 --- a/mm-core/inc/OMX_IndexExt.h +++ b/mm-core/inc/OMX_IndexExt.h @@ -58,6 +58,12 @@ 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 */ + 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, diff --git a/mm-core/inc/QOMX_AudioExtensions.h b/mm-core/inc/QOMX_AudioExtensions.h index e9040188..71797b1b 100644 --- a/mm-core/inc/QOMX_AudioExtensions.h +++ b/mm-core/inc/QOMX_AudioExtensions.h @@ -1,5 +1,5 @@ /*-------------------------------------------------------------------------- -Copyright (c) 2009, 2011, 2015 The Linux Foundation. All rights reserved. +Copyright (c) 2009, 2011, 2015, 2017 The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -230,6 +230,15 @@ typedef struct QOMX_AUDIO_PARAM_AC3TYPE { OMX_BOOL bDelaySurroundChannels; } QOMX_AUDIO_PARAM_AC3TYPE; +typedef struct OMX_AUDIO_PARAM_ANDROID_PROFILETYPE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U32 eProfile; /**< type is OMX_AUDIO_AACPROFILETYPE or OMX_AUDIO_WMAPROFILETYPE + depending on context */ + OMX_U32 nProfileIndex; /**< Used to query for individual profile support information */ +} OMX_AUDIO_PARAM_ANDROID_PROFILETYPE; + typedef enum OMX_AUDIO_AC3_CHANNEL_ROUTING { OMX_AUDIO_AC3_CHANNEL_LEFT, |