diff options
| author | qctecmdr <qctecmdr@localhost> | 2019-06-12 18:24:05 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-06-12 18:24:04 -0700 |
| commit | 02dc1af9fd1e21e2b7d5b8d08d9ff31fce8d5071 (patch) | |
| tree | eb17382a60bd09ac9ab4061ae499cf21bda5ad7b | |
| parent | f6105da6e4dba0e0e235a645980c148905368dfd (diff) | |
| parent | cc6bec461f0d67dd7c696cbe5852e15778ee8b86 (diff) | |
| download | android_hardware_qcom_media-02dc1af9fd1e21e2b7d5b8d08d9ff31fce8d5071.tar.gz android_hardware_qcom_media-02dc1af9fd1e21e2b7d5b8d08d9ff31fce8d5071.tar.bz2 android_hardware_qcom_media-02dc1af9fd1e21e2b7d5b8d08d9ff31fce8d5071.zip | |
Merge "mm-core: Enable MPEG-H Encoder Format"
| -rw-r--r-- | mm-core/inc/QOMX_AudioExtensions.h | 16 | ||||
| -rw-r--r-- | mm-core/inc/QOMX_AudioIndexExtensions.h | 3 |
2 files changed, 17 insertions, 2 deletions
diff --git a/mm-core/inc/QOMX_AudioExtensions.h b/mm-core/inc/QOMX_AudioExtensions.h index 71797b1b..dab06142 100644 --- a/mm-core/inc/QOMX_AudioExtensions.h +++ b/mm-core/inc/QOMX_AudioExtensions.h @@ -1,5 +1,5 @@ /*-------------------------------------------------------------------------- -Copyright (c) 2009, 2011, 2015, 2017 The Linux Foundation. All rights reserved. +Copyright (c) 2009, 2011, 2015, 2017-2018 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: @@ -98,6 +98,7 @@ typedef enum QOMX_AUDIO_CODINGTYPE { QOMX_AUDIO_CodingEVRCB = 0x7F000001, QOMX_AUDIO_CodingEVRCWB = 0x7F000002, QOMX_AUDIO_CodingFLAC = 0x7F000003, + QOMX_AUDIO_CodingMPEGH = 0x7F000004, QOMX_AUDIO_CodingMax = 0x7FFFFFFF }QOMX_AUDIO_CODINGTYPE; @@ -581,6 +582,19 @@ typedef struct QOMX_AUDIO_PARAM_DSD_TYPE { OMX_U32 nBitsPerSample; } QOMX_AUDIO_PARAM_DSD_TYPE; +typedef struct QOMX_AUDIO_PARAM_MPEGH_TYPE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U32 nSampleRate; /** Sent In-Band as well and can be redundant For Decoder, **/ + OMX_U32 nBitRate; /** Sent In-Band as well and can be redundant For Decoder, **/ + OMX_U32 nSamplesPerFrame; /** Sent In-Band as well and can be redundant For Decoder, **/ + OMX_U32 nDFrames; /** No of Dependent Frames; if 10;every 11 frame is seekable + - Specific to Encoder; Redundant for Decoder **/ + OMX_U32 nHOAOrder; /** HOA Order - Specific to Encoder; May be redundant for + Decoder **/ +} QOMX_AUDIO_PARAM_MPEGH_TYPE; + enum { kKeyIndexAlacFrameLength = 0, kKeyIndexAlacCompatibleVersion = 4, diff --git a/mm-core/inc/QOMX_AudioIndexExtensions.h b/mm-core/inc/QOMX_AudioIndexExtensions.h index 34e4667c..8e83c076 100644 --- a/mm-core/inc/QOMX_AudioIndexExtensions.h +++ b/mm-core/inc/QOMX_AudioIndexExtensions.h @@ -1,5 +1,5 @@ /*-------------------------------------------------------------------------- -Copyright (c) 2009, 2015 The Linux Foundation. All rights reserved. +Copyright (c) 2009, 2015, 2018 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: @@ -75,6 +75,7 @@ typedef enum QOMX_AUDIO_EXTENSIONS_INDEXTYPE QOMX_IndexParamAudioApe = 0x7F200009, /** "OMX.Qualcomm.index.audio.ape" */ QOMX_IndexParamAudioFlacDec = 0x7F20000A, /** "OMX.Qualcomm.index.audio.flacdec**/ QOMX_IndexParamAudioDsdDec = 0x7F20000B, /** "OMX.Qualcomm.index.audio.Dsddec**/ + QOMX_IndexParamAudioMpegh = 0x7F20000C, /** "OMX.Qualcomm.index.audio.mpegh**/ QOMX_IndexParamAudioUnused = 0x7F2FFFFF } QOMX_AUDIO_EXTENSIONS_INDEXTYPE; |