Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c32e5da authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

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

parents 555f89d8 224c7840

include/media/openmax/OMX_Audio.h

+14 −0
Original line number Original line Diff line number Diff line
@@ -106,6 +106,7 @@ typedef enum OMX_AUDIO_CODINGTYPE { 
    OMX_AUDIO_CodingWMA,         /**< Any variant of WMA encoded data */

    OMX_AUDIO_CodingWMA,         /**< Any variant of WMA encoded data */

    OMX_AUDIO_CodingRA,          /**< Any variant of RA encoded data */

    OMX_AUDIO_CodingRA,          /**< Any variant of RA encoded data */

    OMX_AUDIO_CodingMIDI,        /**< Any variant of MIDI 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_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ 

    OMX_AUDIO_CodingVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */

    OMX_AUDIO_CodingVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */

    OMX_AUDIO_CodingMax = 0x7FFFFFFF

    OMX_AUDIO_CodingMax = 0x7FFFFFFF
@@ -340,6 +341,19 @@ typedef struct OMX_AUDIO_PARAM_VORBISTYPE { 
} 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 */

/** WMA Version */

typedef enum OMX_AUDIO_WMAFORMATTYPE {

typedef enum OMX_AUDIO_WMAFORMATTYPE {

  OMX_AUDIO_WMAFormatUnused = 0, /**< format unused or unknown */

  OMX_AUDIO_WMAFormatUnused = 0, /**< format unused or unknown */

include/media/openmax/OMX_Index.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -135,6 +135,7 @@ typedef enum OMX_INDEXTYPE { 
    OMX_IndexParamAudioEvrc,                /**< reference: OMX_AUDIO_PARAM_EVRCTYPE */

    OMX_IndexParamAudioEvrc,                /**< reference: OMX_AUDIO_PARAM_EVRCTYPE */

    OMX_IndexParamAudioSmv,                 /**< reference: OMX_AUDIO_PARAM_SMVTYPE */

    OMX_IndexParamAudioSmv,                 /**< reference: OMX_AUDIO_PARAM_SMVTYPE */

    OMX_IndexParamAudioVorbis,              /**< reference: OMX_AUDIO_PARAM_VORBISTYPE */

    OMX_IndexParamAudioVorbis,              /**< reference: OMX_AUDIO_PARAM_VORBISTYPE */

    OMX_IndexParamAudioFlac,                /**< reference: OMX_AUDIO_PARAM_FLACTYPE */





    OMX_IndexConfigAudioMidiImmediateEvent, /**< reference: OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE */

    OMX_IndexConfigAudioMidiImmediateEvent, /**< reference: OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE */

    OMX_IndexConfigAudioMidiControl,        /**< reference: OMX_AUDIO_CONFIG_MIDICONTROLTYPE */

    OMX_IndexConfigAudioMidiControl,        /**< reference: OMX_AUDIO_CONFIG_MIDICONTROLTYPE */