From 224c78405f14b95416d2278e317b98cdb97497cc Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Mon, 30 Apr 2012 10:27:25 -0700 Subject: [PATCH] OMX IL header additions for FLAC Bug 5525503 Change-Id: I8d305d5351d3780f8ca933b8e602f2bf88e9ac78 --- include/media/openmax/OMX_Audio.h | 14 ++++++++++++++ include/media/openmax/OMX_Index.h | 1 + 2 files changed, 15 insertions(+) diff --git a/include/media/openmax/OMX_Audio.h b/include/media/openmax/OMX_Audio.h index a15e70298..89ce0fc95 100644 --- a/include/media/openmax/OMX_Audio.h +++ b/include/media/openmax/OMX_Audio.h @@ -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 */ diff --git a/include/media/openmax/OMX_Index.h b/include/media/openmax/OMX_Index.h index c0b8d9296..be9a1a6cf 100644 --- a/include/media/openmax/OMX_Index.h +++ b/include/media/openmax/OMX_Index.h @@ -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 */