ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "OMX IL header additions for FLAC" into jb-dev

Browse Source
This commit is contained in:
Jean-Michel Trivi 2012-05-10 09:53:44 -07:00 committed by Android (Google) Code Review
commit 3c32e5da5b
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/media/openmax/OMX_Audio.h
View File

@ -106,6 +106,7 @@ typedef enum OMX_AUDIO_CODINGTYPE {
OMX_AUDIO_CodingWMA, /**< Any variant of WMA encoded data */
OMX_AUDIO_CodingRA, /**< Any variant of RA encoded data */
OMX_AUDIO_CodingMIDI, /**< Any variant of MIDI encoded data */
OMX_AUDIO_CodingFLAC, /**< Any variant of FLAC encoded data */
OMX_AUDIO_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
OMX_AUDIO_CodingVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
OMX_AUDIO_CodingMax = 0x7FFFFFFF
@ -340,6 +341,19 @@ typedef struct OMX_AUDIO_PARAM_VORBISTYPE {
} OMX_AUDIO_PARAM_VORBISTYPE;
/** FLAC params */
typedef struct OMX_AUDIO_PARAM_FLACTYPE {
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
unknown sampling rate. */
OMX_U32 nCompressionLevel;/**< FLAC compression level, from 0 (fastest compression)
to 8 (highest compression */
} OMX_AUDIO_PARAM_FLACTYPE;
/** WMA Version */
typedef enum OMX_AUDIO_WMAFORMATTYPE {
OMX_AUDIO_WMAFormatUnused = 0, /**< format unused or unknown */

1
include/media/openmax/OMX_Index.h
View File

@ -135,6 +135,7 @@ typedef enum OMX_INDEXTYPE {
OMX_IndexParamAudioEvrc, /**< reference: OMX_AUDIO_PARAM_EVRCTYPE */
OMX_IndexParamAudioSmv, /**< reference: OMX_AUDIO_PARAM_SMVTYPE */
OMX_IndexParamAudioVorbis, /**< reference: OMX_AUDIO_PARAM_VORBISTYPE */
OMX_IndexParamAudioFlac, /**< reference: OMX_AUDIO_PARAM_FLACTYPE */
OMX_IndexConfigAudioMidiImmediateEvent, /**< reference: OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE */
OMX_IndexConfigAudioMidiControl, /**< reference: OMX_AUDIO_CONFIG_MIDICONTROLTYPE */