diff options
Diffstat (limited to 'domx/omx_core')
| -rw-r--r-- | domx/omx_core/Android.mk | 3 | ||||
| -rwxr-xr-x | domx/omx_core/inc/OMX_Audio.h | 613 | ||||
| -rwxr-xr-x | domx/omx_core/inc/OMX_Component.h | 213 | ||||
| -rwxr-xr-x | domx/omx_core/inc/OMX_ContentPipe.h | 105 | ||||
| -rwxr-xr-x | domx/omx_core/inc/OMX_Core.h | 619 | ||||
| -rwxr-xr-x | domx/omx_core/inc/OMX_IVCommon.h | 430 | ||||
| -rwxr-xr-x | domx/omx_core/inc/OMX_Image.h | 195 | ||||
| -rwxr-xr-x | domx/omx_core/inc/OMX_Index.h | 58 | ||||
| -rwxr-xr-x | domx/omx_core/inc/OMX_Other.h | 17 | ||||
| -rwxr-xr-x | domx/omx_core/inc/OMX_TI_Common.h | 122 | ||||
| -rwxr-xr-x | domx/omx_core/inc/OMX_TI_IVCommon.h | 1457 | ||||
| -rwxr-xr-x | domx/omx_core/inc/OMX_TI_Image.h | 7 | ||||
| -rwxr-xr-x | domx/omx_core/inc/OMX_TI_Index.h | 326 | ||||
| -rwxr-xr-x | domx/omx_core/inc/OMX_TI_Video.h | 1875 | ||||
| -rwxr-xr-x | domx/omx_core/inc/OMX_Types.h | 119 | ||||
| -rwxr-xr-x | domx/omx_core/inc/OMX_Video.h | 626 | ||||
| -rwxr-xr-x | domx/omx_core/src/OMX_Core.c | 93 | ||||
| -rwxr-xr-x | domx/omx_core/src/OMX_Core_Wrapper.c | 28 |
18 files changed, 5046 insertions, 1860 deletions
diff --git a/domx/omx_core/Android.mk b/domx/omx_core/Android.mk index 1c217b3..843ace9 100644 --- a/domx/omx_core/Android.mk +++ b/domx/omx_core/Android.mk @@ -12,8 +12,7 @@ LOCAL_C_INCLUDES += \ LOCAL_SHARED_LIBRARIES := \ libdl \ - liblog \ - libmm_osal + libmm_osal LOCAL_CFLAGS += -DSTATIC_TABLE -D_Android -DCHECK_SECURE_STATE LOCAL_MODULE:= libOMX_Core diff --git a/domx/omx_core/inc/OMX_Audio.h b/domx/omx_core/inc/OMX_Audio.h index 04f1a99..42caa9f 100755 --- a/domx/omx_core/inc/OMX_Audio.h +++ b/domx/omx_core/inc/OMX_Audio.h @@ -1,23 +1,40 @@ +/* ------------------------------------------------------------------ + * Copyright (C) 1998-2009 PacketVideo + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. + * See the License for the specific language governing permissions + * and limitations under the License. + * ------------------------------------------------------------------- + */ /* - * Copyright (c) 2008 The Khronos Group Inc. - * + * Copyright (c) 2008 The Khronos Group Inc. + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: + * to the following conditions: * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * + * in all copies or substantial portions of the Software. + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ @@ -36,7 +53,7 @@ extern "C" { /* Each OMX header must include all required header files to allow the * header to compile without errors. The includes below are required - * for this header file to compile successfully + * for this header file to compile successfully */ #include <OMX_Core.h> @@ -44,7 +61,7 @@ extern "C" { /** @defgroup midi MIDI * @ingroup audio */ - + /** @defgroup effects Audio effects * @ingroup audio */ @@ -54,10 +71,10 @@ extern "C" { * @{ */ -/** Enumeration used to define the possible audio codings. - * If "OMX_AUDIO_CodingUnused" is selected, the coding selection must - * be done in a vendor specific way. Since this is for an audio - * processing element this enum is relevant. However, for another +/** Enumeration used to define the possible audio codings. + * If "OMX_AUDIO_CodingUnused" is selected, the coding selection must + * be done in a vendor specific way. Since this is for an audio + * processing element this enum is relevant. However, for another * type of component other enums would be in this area. */ typedef enum OMX_AUDIO_CODINGTYPE { @@ -89,14 +106,15 @@ 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_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + 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 } OMX_AUDIO_CODINGTYPE; -/** The PortDefinition structure is used to define all of the parameters - * necessary for the compliant component to setup an input or an output audio +/** The PortDefinition structure is used to define all of the parameters + * necessary for the compliant component to setup an input or an output audio * path. If additional information is needed to define the parameters of the * port (such as frequency), additional structures must be sent such as the * OMX_AUDIO_PARAM_PCMMODETYPE structure to supply the extra parameters for the port. @@ -104,11 +122,11 @@ typedef enum OMX_AUDIO_CODINGTYPE { typedef struct OMX_AUDIO_PORTDEFINITIONTYPE { OMX_STRING cMIMEType; /**< MIME type of data for the port */ OMX_NATIVE_DEVICETYPE pNativeRender; /** < platform specific reference - for an output device, + for an output device, otherwise this field is 0 */ - OMX_BOOL bFlagErrorConcealment; /**< Turns on error concealment if it is + OMX_BOOL bFlagErrorConcealment; /**< Turns on error concealment if it is supported by the OMX component */ - OMX_AUDIO_CODINGTYPE eEncoding; /**< Type of data expected for this + OMX_AUDIO_CODINGTYPE eEncoding; /**< Type of data expected for this port (e.g. PCM, AMR, MP3, etc) */ } OMX_AUDIO_PORTDEFINITIONTYPE; @@ -125,15 +143,15 @@ typedef struct OMX_AUDIO_PARAM_PORTFORMATTYPE { } OMX_AUDIO_PARAM_PORTFORMATTYPE; -/** PCM mode type */ -typedef enum OMX_AUDIO_PCMMODETYPE { - OMX_AUDIO_PCMModeLinear = 0, /**< Linear PCM encoded data */ - OMX_AUDIO_PCMModeALaw, /**< A law PCM encoded data (G.711) */ - OMX_AUDIO_PCMModeMULaw, /**< Mu law PCM encoded data (G.711) */ - OMX_AUDIO_PCMModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ +/** PCM mode type */ +typedef enum OMX_AUDIO_PCMMODETYPE { + OMX_AUDIO_PCMModeLinear = 0, /**< Linear PCM encoded data */ + OMX_AUDIO_PCMModeALaw, /**< A law PCM encoded data (G.711) */ + OMX_AUDIO_PCMModeMULaw, /**< Mu law PCM encoded data (G.711) */ + OMX_AUDIO_PCMModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_PCMModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_AUDIO_PCMModeMax = 0x7FFFFFFF -} OMX_AUDIO_PCMMODETYPE; + OMX_AUDIO_PCMModeMax = 0x7FFFFFFF +} OMX_AUDIO_PCMMODETYPE; typedef enum OMX_AUDIO_CHANNELTYPE { @@ -147,45 +165,45 @@ typedef enum OMX_AUDIO_CHANNELTYPE { OMX_AUDIO_ChannelCS = 0x7, /**< Back surround */ OMX_AUDIO_ChannelLR = 0x8, /**< Left rear. */ OMX_AUDIO_ChannelRR = 0x9, /**< Right rear. */ - OMX_AUDIO_ChannelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_ChannelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_ChannelVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_AUDIO_ChannelMax = 0x7FFFFFFF + OMX_AUDIO_ChannelMax = 0x7FFFFFFF } OMX_AUDIO_CHANNELTYPE; #define OMX_AUDIO_MAXCHANNELS 16 /**< maximum number distinct audio channels that a buffer may contain */ #define OMX_MIN_PCMPAYLOAD_MSEC 5 /**< Minimum audio buffer payload size for uncompressed (PCM) audio */ -/** PCM format description */ -typedef struct OMX_AUDIO_PARAM_PCMMODETYPE { - OMX_U32 nSize; /**< Size of this 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 (e.g. 2 for stereo) */ - OMX_NUMERICALDATATYPE eNumData; /**< indicates PCM data as signed or unsigned */ - OMX_ENDIANTYPE eEndian; /**< indicates PCM data as little or big endian */ - OMX_BOOL bInterleaved; /**< True for normal interleaved data; false for - non-interleaved data (e.g. block data) */ - OMX_U32 nBitPerSample; /**< Bit per sample */ - OMX_U32 nSamplingRate; /**< Sampling rate of the source data. Use 0 for - variable or unknown sampling rate. */ - OMX_AUDIO_PCMMODETYPE ePCMMode; /**< PCM mode enumeration */ +/** PCM format description */ +typedef struct OMX_AUDIO_PARAM_PCMMODETYPE { + OMX_U32 nSize; /**< Size of this 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 (e.g. 2 for stereo) */ + OMX_NUMERICALDATATYPE eNumData; /**< indicates PCM data as signed or unsigned */ + OMX_ENDIANTYPE eEndian; /**< indicates PCM data as little or big endian */ + OMX_BOOL bInterleaved; /**< True for normal interleaved data; false for + non-interleaved data (e.g. block data) */ + OMX_U32 nBitPerSample; /**< Bit per sample */ + OMX_U32 nSamplingRate; /**< Sampling rate of the source data. Use 0 for + variable or unknown sampling rate. */ + OMX_AUDIO_PCMMODETYPE ePCMMode; /**< PCM mode enumeration */ OMX_AUDIO_CHANNELTYPE eChannelMapping[OMX_AUDIO_MAXCHANNELS]; /**< Slot i contains channel defined by eChannelMap[i] */ -} OMX_AUDIO_PARAM_PCMMODETYPE; +} OMX_AUDIO_PARAM_PCMMODETYPE; /** Audio channel mode. This is used by both AAC and MP3, although the names are more appropriate - * for the MP3. For example, JointStereo for MP3 is CouplingChannels for AAC. + * for the MP3. For example, JointStereo for MP3 is CouplingChannels for AAC. */ typedef enum OMX_AUDIO_CHANNELMODETYPE { - OMX_AUDIO_ChannelModeStereo = 0, /**< 2 channels, the bitrate allocation between those + OMX_AUDIO_ChannelModeStereo = 0, /**< 2 channels, the bitrate allocation between those two channels changes accordingly to each channel information */ - OMX_AUDIO_ChannelModeJointStereo, /**< mode that takes advantage of what is common between + OMX_AUDIO_ChannelModeJointStereo, /**< mode that takes advantage of what is common between 2 channels for higher compression gain */ - OMX_AUDIO_ChannelModeDual, /**< 2 mono-channels, each channel is encoded with half + OMX_AUDIO_ChannelModeDual, /**< 2 mono-channels, each channel is encoded with half the bitrate of the overall bitrate */ OMX_AUDIO_ChannelModeMono, /**< Mono channel mode */ - OMX_AUDIO_ChannelModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_ChannelModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_ChannelModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_ChannelModeMax = 0x7FFFFFFF } OMX_AUDIO_CHANNELMODETYPE; @@ -195,7 +213,7 @@ typedef enum OMX_AUDIO_MP3STREAMFORMATTYPE { OMX_AUDIO_MP3StreamFormatMP1Layer3 = 0, /**< MP3 Audio MPEG 1 Layer 3 Stream format */ OMX_AUDIO_MP3StreamFormatMP2Layer3, /**< MP3 Audio MPEG 2 Layer 3 Stream format */ OMX_AUDIO_MP3StreamFormatMP2_5Layer3, /**< MP3 Audio MPEG2.5 Layer 3 Stream format */ - OMX_AUDIO_MP3StreamFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_MP3StreamFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_MP3StreamFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_MP3StreamFormatMax = 0x7FFFFFFF } OMX_AUDIO_MP3STREAMFORMATTYPE; @@ -225,7 +243,7 @@ typedef enum OMX_AUDIO_AACSTREAMFORMATTYPE { OMX_AUDIO_AACStreamFormatADIF, /**< AAC Audio Data Interchange Format */ OMX_AUDIO_AACStreamFormatMP4FF, /**< AAC inside MPEG-4/ISO File Format */ OMX_AUDIO_AACStreamFormatRAW, /**< AAC Raw Format */ - OMX_AUDIO_AACStreamFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_AACStreamFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_AACStreamFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_AACStreamFormatMax = 0x7FFFFFFF } OMX_AUDIO_AACSTREAMFORMATTYPE; @@ -244,7 +262,8 @@ typedef enum OMX_AUDIO_AACPROFILETYPE{ OMX_AUDIO_AACObjectERLC = 17, /**< ER AAC Low Complexity object (Error Resilient AAC-LC) */ OMX_AUDIO_AACObjectLD = 23, /**< AAC Low Delay object (Error Resilient) */ OMX_AUDIO_AACObjectHE_PS = 29, /**< AAC High Efficiency with Parametric Stereo coding (HE-AAC v2, object type PS) */ - OMX_AUDIO_AACObjectKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_AACObjectELD = 39, /** AAC Enhanced Low Delay. NOTE: Pending Khronos standardization **/ + OMX_AUDIO_AACObjectKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_AACObjectVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_AACObjectMax = 0x7FFFFFFF } OMX_AUDIO_AACPROFILETYPE; @@ -317,18 +336,31 @@ typedef struct OMX_AUDIO_PARAM_VORBISTYPE { constraints to be enforced by the encoder. This mode can be slower, and may also be lower quality. It is primarily useful for streaming. */ - OMX_BOOL bDownmix; /**< Downmix input from stereo to mono (has no effect on - non-stereo streams). Useful for lower-bitrate encoding. */ + OMX_BOOL bDownmix; /**< Downmix input from stereo to mono (has no effect on + non-stereo streams). Useful for lower-bitrate encoding. */ } 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 */ OMX_AUDIO_WMAFormat7, /**< Windows Media Audio format 7 */ OMX_AUDIO_WMAFormat8, /**< Windows Media Audio format 8 */ OMX_AUDIO_WMAFormat9, /**< Windows Media Audio format 9 */ - OMX_AUDIO_WMAFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_WMAFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_WMAFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_WMAFormatMax = 0x7FFFFFFF } OMX_AUDIO_WMAFORMATTYPE; @@ -340,7 +372,7 @@ typedef enum OMX_AUDIO_WMAPROFILETYPE { OMX_AUDIO_WMAProfileL1, /**< Windows Media audio version 9 profile L1 */ OMX_AUDIO_WMAProfileL2, /**< Windows Media audio version 9 profile L2 */ OMX_AUDIO_WMAProfileL3, /**< Windows Media audio version 9 profile L3 */ - OMX_AUDIO_WMAProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_WMAProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_WMAProfileVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_WMAProfileMax = 0x7FFFFFFF } OMX_AUDIO_WMAPROFILETYPE; @@ -362,7 +394,7 @@ typedef struct OMX_AUDIO_PARAM_WMATYPE { OMX_U32 nSuperBlockAlign; /**< WMA Type-specific data */ } OMX_AUDIO_PARAM_WMATYPE; -/** +/** * RealAudio format */ typedef enum OMX_AUDIO_RAFORMATTYPE { @@ -374,32 +406,32 @@ typedef enum OMX_AUDIO_RAFORMATTYPE { OMX_AUDIO_RA10_LOSSLESS, /**< RealAudio Lossless */ OMX_AUDIO_RA10_MULTICHANNEL, /**< RealAudio Multichannel */ OMX_AUDIO_RA10_VOICE, /**< RealAudio Voice for bitrates below 15 kbps */ - OMX_AUDIO_RAFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_RAFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_RAFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_VIDEO_RAFormatMax = 0x7FFFFFFF } OMX_AUDIO_RAFORMATTYPE; -/** RA (Real Audio) params */ -typedef struct OMX_AUDIO_PARAM_RATYPE { - OMX_U32 nSize; /**< Size of this 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 nSamplingRate; /**< is the sampling rate of the source data */ - OMX_U32 nBitsPerFrame; /**< is the value for bits per frame */ - OMX_U32 nSamplePerFrame; /**< is the value for samples per frame */ - OMX_U32 nCouplingQuantBits; /**< is the number of coupling quantization bits in the stream */ - OMX_U32 nCouplingStartRegion; /**< is the coupling start region in the stream */ - OMX_U32 nNumRegions; /**< is the number of regions value */ +/** RA (Real Audio) params */ +typedef struct OMX_AUDIO_PARAM_RATYPE { + OMX_U32 nSize; /**< Size of this 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 nSamplingRate; /**< is the sampling rate of the source data */ + OMX_U32 nBitsPerFrame; /**< is the value for bits per frame */ + OMX_U32 nSamplePerFrame; /**< is the value for samples per frame */ + OMX_U32 nCouplingQuantBits; /**< is the number of coupling quantization bits in the stream */ + OMX_U32 nCouplingStartRegion; /**< is the coupling start region in the stream */ + OMX_U32 nNumRegions; /**< is the number of regions value */ OMX_AUDIO_RAFORMATTYPE eFormat; /**< is the RealAudio audio format */ -} OMX_AUDIO_PARAM_RATYPE; +} OMX_AUDIO_PARAM_RATYPE; /** SBC Allocation Method Type */ typedef enum OMX_AUDIO_SBCALLOCMETHODTYPE { OMX_AUDIO_SBCAllocMethodLoudness, /**< Loudness allocation method */ OMX_AUDIO_SBCAllocMethodSNR, /**< SNR allocation method */ - OMX_AUDIO_SBCAllocMethodKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_SBCAllocMethodKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_SBCAllocMethodVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_SBCAllocMethodMax = 0x7FFFFFFF } OMX_AUDIO_SBCALLOCMETHODTYPE; @@ -424,18 +456,18 @@ typedef struct OMX_AUDIO_PARAM_SBCTYPE { } OMX_AUDIO_PARAM_SBCTYPE; -/** ADPCM stream format parameters */ -typedef struct OMX_AUDIO_PARAM_ADPCMTYPE { - 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 in the data stream (not - necessarily the same as the number of channels - to be rendered. */ - OMX_U32 nBitsPerSample; /**< Number of bits in each sample */ - OMX_U32 nSampleRate; /**< Sampling rate of the source data. Use 0 for - variable or unknown sampling rate. */ -} OMX_AUDIO_PARAM_ADPCMTYPE; +/** ADPCM stream format parameters */ +typedef struct OMX_AUDIO_PARAM_ADPCMTYPE { + 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 in the data stream (not + necessarily the same as the number of channels + to be rendered. */ + OMX_U32 nBitsPerSample; /**< Number of bits in each sample */ + OMX_U32 nSampleRate; /**< Sampling rate of the source data. Use 0 for + variable or unknown sampling rate. */ +} OMX_AUDIO_PARAM_ADPCMTYPE; /** G723 rate */ @@ -443,25 +475,25 @@ typedef enum OMX_AUDIO_G723RATE { OMX_AUDIO_G723ModeUnused = 0, /**< AMRNB Mode unused / unknown */ OMX_AUDIO_G723ModeLow, /**< 5300 bps */ OMX_AUDIO_G723ModeHigh, /**< 6300 bps */ - OMX_AUDIO_G723ModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_G723ModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_G723ModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_G723ModeMax = 0x7FFFFFFF } OMX_AUDIO_G723RATE; /** G723 - Sample rate must be 8 KHz */ -typedef struct OMX_AUDIO_PARAM_G723TYPE { - 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 in the data stream (not - necessarily the same as the number of channels - to be rendered. */ - OMX_BOOL bDTX; /**< Enable Discontinuous Transmisssion */ +typedef struct OMX_AUDIO_PARAM_G723TYPE { + 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 in the data stream (not + necessarily the same as the number of channels + to be rendered. */ + OMX_BOOL bDTX; /**< Enable Discontinuous Transmisssion */ OMX_AUDIO_G723RATE eBitRate; /**< todo: Should this be moved to a config? */ - OMX_BOOL bHiPassFilter; /**< Enable High Pass Filter */ - OMX_BOOL bPostFilter; /**< Enable Post Filter */ -} OMX_AUDIO_PARAM_G723TYPE; + OMX_BOOL bHiPassFilter; /**< Enable High Pass Filter */ + OMX_BOOL bPostFilter; /**< Enable Post Filter */ +} OMX_AUDIO_PARAM_G723TYPE; /** ITU G726 (ADPCM) rate */ @@ -471,22 +503,22 @@ typedef enum OMX_AUDIO_G726MODE { OMX_AUDIO_G726Mode24, /**< 24 kbps */ OMX_AUDIO_G726Mode32, /**< 32 kbps, most common rate, also G721 */ OMX_AUDIO_G726Mode40, /**< 40 kbps */ - OMX_AUDIO_G726ModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_G726ModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_G726ModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_G726ModeMax = 0x7FFFFFFF } OMX_AUDIO_G726MODE; -/** G.726 stream format parameters - must be at 8KHz */ -typedef struct OMX_AUDIO_PARAM_G726TYPE { - 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 in the data stream (not - necessarily the same as the number of channels - to be rendered. */ +/** G.726 stream format parameters - must be at 8KHz */ +typedef struct OMX_AUDIO_PARAM_G726TYPE { + 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 in the data stream (not + necessarily the same as the number of channels + to be rendered. */ OMX_AUDIO_G726MODE eG726Mode; -} OMX_AUDIO_PARAM_G726TYPE; +} OMX_AUDIO_PARAM_G726TYPE; /** G729 coder type */ @@ -495,7 +527,7 @@ typedef enum OMX_AUDIO_G729TYPE { OMX_AUDIO_G729A, /**< ITU G.729 annex A encoded data */ OMX_AUDIO_G729B, /**< ITU G.729 with annex B encoded data */ OMX_AUDIO_G729AB, /**< ITU G.729 annexes A and B encoded data */ - OMX_AUDIO_G729KhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_G729KhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_G729VendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_G729Max = 0x7FFFFFFF } OMX_AUDIO_G729TYPE; @@ -514,23 +546,23 @@ typedef struct OMX_AUDIO_PARAM_G729TYPE { } OMX_AUDIO_PARAM_G729TYPE; -/** AMR Frame format */ -typedef enum OMX_AUDIO_AMRFRAMEFORMATTYPE { - OMX_AUDIO_AMRFrameFormatConformance = 0, /**< Frame Format is AMR Conformance - (Standard) Format */ - OMX_AUDIO_AMRFrameFormatIF1, /**< Frame Format is AMR Interface - Format 1 */ - OMX_AUDIO_AMRFrameFormatIF2, /**< Frame Format is AMR Interface - Format 2*/ - OMX_AUDIO_AMRFrameFormatFSF, /**< Frame Format is AMR File Storage - Format */ - OMX_AUDIO_AMRFrameFormatRTPPayload, /**< Frame Format is AMR Real-Time - Transport Protocol Payload Format */ - OMX_AUDIO_AMRFrameFormatITU, /**< Frame Format is ITU Format (added at Motorola request) */ - OMX_AUDIO_AMRFrameFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ +/** AMR Frame format */ +typedef enum OMX_AUDIO_AMRFRAMEFORMATTYPE { + OMX_AUDIO_AMRFrameFormatConformance = 0, /**< Frame Format is AMR Conformance + (Standard) Format */ + OMX_AUDIO_AMRFrameFormatIF1, /**< Frame Format is AMR Interface + Format 1 */ + OMX_AUDIO_AMRFrameFormatIF2, /**< Frame Format is AMR Interface + Format 2*/ + OMX_AUDIO_AMRFrameFormatFSF, /**< Frame Format is AMR File Storage + Format */ + OMX_AUDIO_AMRFrameFormatRTPPayload, /**< Frame Format is AMR Real-Time + Transport Protocol Payload Format */ + OMX_AUDIO_AMRFrameFormatITU, /**< Frame Format is ITU Format (added at Motorola request) */ + OMX_AUDIO_AMRFrameFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_AMRFrameFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_AUDIO_AMRFrameFormatMax = 0x7FFFFFFF -} OMX_AUDIO_AMRFRAMEFORMATTYPE; + OMX_AUDIO_AMRFrameFormatMax = 0x7FFFFFFF +} OMX_AUDIO_AMRFRAMEFORMATTYPE; /** AMR band mode */ @@ -538,7 +570,7 @@ typedef enum OMX_AUDIO_AMRBANDMODETYPE { OMX_AUDIO_AMRBandModeUnused = 0, /**< AMRNB Mode unused / unknown */ OMX_AUDIO_AMRBandModeNB0, /**< AMRNB Mode 0 = 4750 bps */ OMX_AUDIO_AMRBandModeNB1, /**< AMRNB Mode 1 = 5150 bps */ - OMX_AUDIO_AMRBandModeNB2, /**< AMRNB Mode 2 = 5900 bps */ + OMX_AUDIO_AMRBandModeNB2, /**< AMRNB Mode 2 = 5900 bps */ OMX_AUDIO_AMRBandModeNB3, /**< AMRNB Mode 3 = 6700 bps */ OMX_AUDIO_AMRBandModeNB4, /**< AMRNB Mode 4 = 7400 bps */ OMX_AUDIO_AMRBandModeNB5, /**< AMRNB Mode 5 = 7950 bps */ @@ -546,36 +578,36 @@ typedef enum OMX_AUDIO_AMRBANDMODETYPE { OMX_AUDIO_AMRBandModeNB7, /**< AMRNB Mode 7 = 12200 bps */ OMX_AUDIO_AMRBandModeWB0, /**< AMRWB Mode 0 = 6600 bps */ OMX_AUDIO_AMRBandModeWB1, /**< AMRWB Mode 1 = 8850 bps */ - OMX_AUDIO_AMRBandModeWB2, /**< AMRWB Mode 2 = 12650 bps */ - OMX_AUDIO_AMRBandModeWB3, /**< AMRWB Mode 3 = 14250 bps */ + OMX_AUDIO_AMRBandModeWB2, /**< AMRWB Mode 2 = 12650 bps */ + OMX_AUDIO_AMRBandModeWB3, /**< AMRWB Mode 3 = 14250 bps */ OMX_AUDIO_AMRBandModeWB4, /**< AMRWB Mode 4 = 15850 bps */ OMX_AUDIO_AMRBandModeWB5, /**< AMRWB Mode 5 = 18250 bps */ OMX_AUDIO_AMRBandModeWB6, /**< AMRWB Mode 6 = 19850 bps */ OMX_AUDIO_AMRBandModeWB7, /**< AMRWB Mode 7 = 23050 bps */ - OMX_AUDIO_AMRBandModeWB8, /**< AMRWB Mode 8 = 23850 bps */ - OMX_AUDIO_AMRBandModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_AMRBandModeWB8, /**< AMRWB Mode 8 = 23850 bps */ + OMX_AUDIO_AMRBandModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_AMRBandModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_AMRBandModeMax = 0x7FFFFFFF } OMX_AUDIO_AMRBANDMODETYPE; - - -/** AMR Discontinuous Transmission mode */ -typedef enum OMX_AUDIO_AMRDTXMODETYPE { - OMX_AUDIO_AMRDTXModeOff = 0, /**< AMR Discontinuous Transmission Mode is disabled */ - OMX_AUDIO_AMRDTXModeOnVAD1, /**< AMR Discontinuous Transmission Mode using - Voice Activity Detector 1 (VAD1) is enabled */ - OMX_AUDIO_AMRDTXModeOnVAD2, /**< AMR Discontinuous Transmission Mode using - Voice Activity Detector 2 (VAD2) is enabled */ - OMX_AUDIO_AMRDTXModeOnAuto, /**< The codec will automatically select between - Off, VAD1 or VAD2 modes */ + + +/** AMR Discontinuous Transmission mode */ +typedef enum OMX_AUDIO_AMRDTXMODETYPE { + OMX_AUDIO_AMRDTXModeOff = 0, /**< AMR Discontinuous Transmission Mode is disabled */ + OMX_AUDIO_AMRDTXModeOnVAD1, /**< AMR Discontinuous Transmission Mode using + Voice Activity Detector 1 (VAD1) is enabled */ + OMX_AUDIO_AMRDTXModeOnVAD2, /**< AMR Discontinuous Transmission Mode using + Voice Activity Detector 2 (VAD2) is enabled */ + OMX_AUDIO_AMRDTXModeOnAuto, /**< The codec will automatically select between + Off, VAD1 or VAD2 modes */ OMX_AUDIO_AMRDTXasEFR, /**< DTX as EFR instead of AMR standard (3GPP 26.101, frame type =8,9,10) */ - OMX_AUDIO_AMRDTXModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_AMRDTXModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_AMRDTXModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_AUDIO_AMRDTXModeMax = 0x7FFFFFFF -} OMX_AUDIO_AMRDTXMODETYPE; - + OMX_AUDIO_AMRDTXModeMax = 0x7FFFFFFF +} OMX_AUDIO_AMRDTXMODETYPE; + /** AMR params */ typedef struct OMX_AUDIO_PARAM_AMRTYPE { @@ -584,7 +616,7 @@ typedef struct OMX_AUDIO_PARAM_AMRTYPE { OMX_U32 nPortIndex; /**< port that this structure applies to */ OMX_U32 nChannels; /**< Number of channels */ OMX_U32 nBitRate; /**< Bit rate read only field */ - OMX_AUDIO_AMRBANDMODETYPE eAMRBandMode; /**< AMR Band Mode enumeration */ + OMX_AUDIO_AMRBANDMODETYPE eAMRBandMode; /**< AMR Band Mode enumeration */ OMX_AUDIO_AMRDTXMODETYPE eAMRDTXMode; /**< AMR DTX Mode enumeration */ OMX_AUDIO_AMRFRAMEFORMATTYPE eAMRFrameFormat; /**< AMR frame format enumeration */ } OMX_AUDIO_PARAM_AMRTYPE; @@ -692,7 +724,7 @@ typedef enum OMX_AUDIO_CDMARATETYPE { OMX_AUDIO_CDMARateQuarter, /**< CDMA encoded frame in quarter rate */ OMX_AUDIO_CDMARateEighth, /**< CDMA encoded frame in eighth rate (DTX)*/ OMX_AUDIO_CDMARateErasure, /**< CDMA erasure frame */ - OMX_AUDIO_CDMARateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_CDMARateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_CDMARateVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_CDMARateMax = 0x7FFFFFFF } OMX_AUDIO_CDMARATETYPE; @@ -764,7 +796,7 @@ typedef struct OMX_AUDIO_PARAM_SMVTYPE { } OMX_AUDIO_PARAM_SMVTYPE; -/** MIDI Format +/** MIDI Format * @ingroup midi */ typedef enum OMX_AUDIO_MIDIFORMATTYPE @@ -777,33 +809,33 @@ typedef enum OMX_AUDIO_MIDIFORMATTYPE OMX_AUDIO_MIDIFormatXMF0, /**< eXtensible Music Format type 0 */ OMX_AUDIO_MIDIFormatXMF1, /**< eXtensible Music Format type 1 */ OMX_AUDIO_MIDIFormatMobileXMF, /**< Mobile XMF (eXtensible Music Format type 2) */ - OMX_AUDIO_MIDIFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_MIDIFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_MIDIFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_MIDIFormatMax = 0x7FFFFFFF } OMX_AUDIO_MIDIFORMATTYPE; -/** MIDI params +/** MIDI params * @ingroup midi */ typedef struct OMX_AUDIO_PARAM_MIDITYPE { 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 nFileSize; /**< size of the MIDI file in bytes, where the entire - MIDI file passed in, otherwise if 0x0, the MIDI data - is merged and streamed (instead of passed as an + OMX_U32 nFileSize; /**< size of the MIDI file in bytes, where the entire + MIDI file passed in, otherwise if 0x0, the MIDI data + is merged and streamed (instead of passed as an entire MIDI file) */ - OMX_BU32 sMaxPolyphony; /**< Specifies the maximum simultaneous polyphonic - voices. A value of zero indicates that the default - polyphony of the device is used */ - OMX_BOOL bLoadDefaultSound; /**< Whether to load default sound + OMX_BU32 sMaxPolyphony; /**< Specifies the maximum simultaneous polyphonic + voices. A value of zero indicates that the default + polyphony of the device is used */ + OMX_BOOL bLoadDefaultSound; /**< Whether to load default sound bank at initialization */ - OMX_AUDIO_MIDIFORMATTYPE eMidiFormat; /**< Version of the MIDI file */ + OMX_AUDIO_MIDIFORMATTYPE eMidiFormat; /**< Version of the MIDI file */ } OMX_AUDIO_PARAM_MIDITYPE; -/** Type of the MIDI sound bank +/** Type of the MIDI sound bank * @ingroup midi */ typedef enum OMX_AUDIO_MIDISOUNDBANKTYPE { @@ -812,13 +844,13 @@ typedef enum OMX_AUDIO_MIDISOUNDBANKTYPE { OMX_AUDIO_MIDISoundBankDLS2, /**< DLS version 2 */ OMX_AUDIO_MIDISoundBankMobileDLSBase, /**< Mobile DLS, using the base functionality */ OMX_AUDIO_MIDISoundBankMobileDLSPlusOptions, /**< Mobile DLS, using the specification-defined optional feature set */ - OMX_AUDIO_MIDISoundBankKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_MIDISoundBankKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_MIDISoundBankVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_MIDISoundBankMax = 0x7FFFFFFF } OMX_AUDIO_MIDISOUNDBANKTYPE; -/** Bank Layout describes how bank MSB & LSB are used in the DLS instrument definitions sound bank +/** Bank Layout describes how bank MSB & LSB are used in the DLS instrument definitions sound bank * @ingroup midi */ typedef enum OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE { @@ -826,13 +858,13 @@ typedef enum OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE { OMX_AUDIO_MIDISoundBankLayoutGM, /**< GS layout (based on bank MSB 0x00) */ OMX_AUDIO_MIDISoundBankLayoutGM2, /**< General MIDI 2 layout (using MSB 0x78/0x79, LSB 0x00) */ OMX_AUDIO_MIDISoundBankLayoutUser, /**< Does not conform to any bank numbering standards */ - OMX_AUDIO_MIDISoundBankLayoutKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_MIDISoundBankLayoutKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_MIDISoundBankLayoutVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_MIDISoundBankLayoutMax = 0x7FFFFFFF } OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE; -/** MIDI params to load/unload user soundbank +/** MIDI params to load/unload user soundbank * @ingroup midi */ typedef struct OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE { @@ -847,8 +879,8 @@ typedef struct OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE { } OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE; -/** Structure for Live MIDI events and MIP messages. - * (MIP = Maximum Instantaneous Polyphony; part of the SP-MIDI standard.) +/** Structure for Live MIDI events and MIP messages. + * (MIP = Maximum Instantaneous Polyphony; part of the SP-MIDI standard.) * @ingroup midi */ typedef struct OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE { @@ -857,12 +889,12 @@ typedef struct OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE { OMX_U32 nPortIndex; /**< Port that this structure applies to */ OMX_U32 nMidiEventSize; /**< Size of immediate MIDI events or MIP message in bytes */ OMX_U8 nMidiEvents[1]; /**< MIDI event array to be rendered immediately, or an - array for the MIP message buffer, where the size is + array for the MIP message buffer, where the size is indicated by nMidiEventSize */ } OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE; -/** MIDI sound bank/ program pair in a given channel +/** MIDI sound bank/ program pair in a given channel * @ingroup midi */ typedef struct OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE { @@ -872,29 +904,29 @@ typedef struct OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE { OMX_U32 nChannel; /**< Valid channel values range from 1 to 16 */ OMX_U16 nIDProgram; /**< Valid program ID range is 1 to 128 */ OMX_U16 nIDSoundBank; /**< Sound bank ID */ - OMX_U32 nUserSoundBankIndex;/**< User soundbank index, easier to access soundbanks + OMX_U32 nUserSoundBankIndex;/**< User soundbank index, easier to access soundbanks by index if multiple banks are present */ } OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE; -/** MIDI control +/** MIDI control * @ingroup midi */ typedef struct OMX_AUDIO_CONFIG_MIDICONTROLTYPE { 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_BS32 sPitchTransposition; /**< Pitch transposition in semitones, stored as Q22.10 + OMX_BS32 sPitchTransposition; /**< Pitch transposition in semitones, stored as Q22.10 format based on JAVA MMAPI (JSR-135) requirement */ OMX_BU32 sPlayBackRate; /**< Relative playback rate, stored as Q14.17 fixed-point number based on JSR-135 requirement */ - OMX_BU32 sTempo ; /**< Tempo in beats per minute (BPM), stored as Q22.10 + OMX_BU32 sTempo ; /**< Tempo in beats per minute (BPM), stored as Q22.10 fixed-point number based on JSR-135 requirement */ - OMX_U32 nMaxPolyphony; /**< Specifies the maximum simultaneous polyphonic - voices. A value of zero indicates that the default + OMX_U32 nMaxPolyphony; /**< Specifies the maximum simultaneous polyphonic + voices. A value of zero indicates that the default polyphony of the device is used */ OMX_U32 nNumRepeat; /**< Number of times to repeat playback */ - OMX_U32 nStopTime; /**< Time in milliseconds to indicate when playback + OMX_U32 nStopTime; /**< Time in milliseconds to indicate when playback will stop automatically. Set to zero if not used */ OMX_U16 nChannelMuteMask; /**< 16 bit mask for channel mute status */ OMX_U16 nChannelSoloMask; /**< 16 bit mask for channel solo status */ @@ -906,22 +938,22 @@ typedef struct OMX_AUDIO_CONFIG_MIDICONTROLTYPE { } OMX_AUDIO_CONFIG_MIDICONTROLTYPE; -/** MIDI Playback States +/** MIDI Playback States * @ingroup midi */ typedef enum OMX_AUDIO_MIDIPLAYBACKSTATETYPE { - OMX_AUDIO_MIDIPlayBackStateUnknown = 0, /**< Unknown state or state does not map to + OMX_AUDIO_MIDIPlayBackStateUnknown = 0, /**< Unknown state or state does not map to other defined states */ - OMX_AUDIO_MIDIPlayBackStateClosedEngaged, /**< No MIDI resource is currently open. - The MIDI engine is currently processing + OMX_AUDIO_MIDIPlayBackStateClosedEngaged, /**< No MIDI resource is currently open. + The MIDI engine is currently processing MIDI events. */ - OMX_AUDIO_MIDIPlayBackStateParsing, /**< A MIDI resource is open and is being - primed. The MIDI engine is currently + OMX_AUDIO_MIDIPlayBackStateParsing, /**< A MIDI resource is open and is being + primed. The MIDI engine is currently processing MIDI events. */ - OMX_AUDIO_MIDIPlayBackStateOpenEngaged, /**< A MIDI resource is open and primed but + OMX_AUDIO_MIDIPlayBackStateOpenEngaged, /**< A MIDI resource is open and primed but not playing. The MIDI engine is currently processing MIDI events. The transition to - this state is only possible from the + this state is only possible from the OMX_AUDIO_MIDIPlayBackStatePlaying state, when the 'playback head' reaches the end of media data or the playback stops due @@ -936,95 +968,95 @@ typedef enum OMX_AUDIO_MIDIPLAYBACKSTATETYPE { no audible MIDI content during playback currently. The situation may change if resources are freed later.*/ - OMX_AUDIO_MIDIPlayBackStateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_MIDIPlayBackStateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_MIDIPlayBackStateVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_MIDIPlayBackStateMax = 0x7FFFFFFF } OMX_AUDIO_MIDIPLAYBACKSTATETYPE; -/** MIDI status +/** MIDI status * @ingroup midi */ typedef struct OMX_AUDIO_CONFIG_MIDISTATUSTYPE { 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_U16 nNumTracks; /**< Number of MIDI tracks in the file, read only field. - NOTE: May not return a meaningful value until the entire + OMX_U16 nNumTracks; /**< Number of MIDI tracks in the file, read only field. + NOTE: May not return a meaningful value until the entire file is parsed and buffered. */ - OMX_U32 nDuration; /**< The length of the currently open MIDI resource - in milliseconds. NOTE: May not return a meaningful value - until the entire file is parsed and buffered. */ - OMX_U32 nPosition; /**< Current Position of the MIDI resource being played + OMX_U32 nDuration; /**< The length of the currently open MIDI resource + in milliseconds. NOTE: May not return a meaningful value + until the entire file is parsed and buffered. */ + OMX_U32 nPosition; /**< Current Position of the MIDI resource being played in milliseconds */ - OMX_BOOL bVibra; /**< Does Vibra track exist? NOTE: May not return a meaningful + OMX_BOOL bVibra; /**< Does Vibra track exist? NOTE: May not return a meaningful value until the entire file is parsed and buffered. */ - OMX_U32 nNumMetaEvents; /**< Total number of MIDI Meta Events in the currently - open MIDI resource. NOTE: May not return a meaningful value + OMX_U32 nNumMetaEvents; /**< Total number of MIDI Meta Events in the currently + open MIDI resource. NOTE: May not return a meaningful value until the entire file is parsed and buffered. */ - OMX_U32 nNumActiveVoices; /**< Number of active voices in the currently playing - MIDI resource. NOTE: May not return a meaningful value until + OMX_U32 nNumActiveVoices; /**< Number of active voices in the currently playing + MIDI resource. NOTE: May not return a meaningful value until the entire file is parsed and buffered. */ OMX_AUDIO_MIDIPLAYBACKSTATETYPE eMIDIPlayBackState; /**< MIDI playback state enumeration, read only field */ } OMX_AUDIO_CONFIG_MIDISTATUSTYPE; /** MIDI Meta Event structure one per Meta Event. - * MIDI Meta Events are like audio metadata, except that they are interspersed - * with the MIDI content throughout the file and are not localized in the header. - * As such, it is necessary to retrieve information about these Meta Events from - * the engine, as it encounters these Meta Events within the MIDI content. - * For example, SMF files can have up to 14 types of MIDI Meta Events (copyright, - * author, default tempo, etc.) scattered throughout the file. + * MIDI Meta Events are like audio metadata, except that they are interspersed + * with the MIDI content throughout the file and are not localized in the header. + * As such, it is necessary to retrieve information about these Meta Events from + * the engine, as it encounters these Meta Events within the MIDI content. + * For example, SMF files can have up to 14 types of MIDI Meta Events (copyright, + * author, default tempo, etc.) scattered throughout the file. * @ingroup midi */ -typedef struct OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE{ - 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 nIndex; /**< Index of Meta Event */ - OMX_U8 nMetaEventType; /**< Meta Event Type, 7bits (i.e. 0 - 127) */ - OMX_U32 nMetaEventSize; /**< size of the Meta Event in bytes */ +typedef struct OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE{ + 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 nIndex; /**< Index of Meta Event */ + OMX_U8 nMetaEventType; /**< Meta Event Type, 7bits (i.e. 0 - 127) */ + OMX_U32 nMetaEventSize; /**< size of the Meta Event in bytes */ OMX_U32 nTrack; /**< track number for the meta event */ OMX_U32 nPosition; /**< Position of the meta-event in milliseconds */ -} OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE; +} OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE; -/** MIDI Meta Event Data structure - one per Meta Event. +/** MIDI Meta Event Data structure - one per Meta Event. * @ingroup midi - */ -typedef struct OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE{ - 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 nIndex; /**< Index of Meta Event */ - OMX_U32 nMetaEventSize; /**< size of the Meta Event in bytes */ - OMX_U8 nData[1]; /**< array of one or more bytes of meta data - as indicated by the nMetaEventSize field */ -} OMX_AUDIO_CONFIG__MIDIMETAEVENTDATATYPE; + */ +typedef struct OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE{ + 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 nIndex; /**< Index of Meta Event */ + OMX_U32 nMetaEventSize; /**< size of the Meta Event in bytes */ + OMX_U8 nData[1]; /**< array of one or more bytes of meta data + as indicated by the nMetaEventSize field */ +} OMX_AUDIO_CONFIG__MIDIMETAEVENTDATATYPE; /** Audio Volume adjustment for a port */ typedef struct OMX_AUDIO_CONFIG_VOLUMETYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U32 nPortIndex; /**< Port index indicating which port to - set. Select the input port to set - just that port's volume. Select the - output port to adjust the master + OMX_U32 nPortIndex; /**< Port index indicating which port to + set. Select the input port to set + just that port's volume. Select the + output port to adjust the master volume. */ - OMX_BOOL bLinear; /**< Is the volume to be set in linear (0.100) + OMX_BOOL bLinear; /**< Is the volume to be set in linear (0.100) or logarithmic scale (mB) */ OMX_BS32 sVolume; /**< Volume linear setting in the 0..100 range, OR Volume logarithmic setting for this port. The values for volume are in mB (millibels = 1/100 dB) relative - to a gain of 1 (e.g. the output is the same as the - input level). Values are in mB from nMax + to a gain of 1 (e.g. the output is the same as the + input level). Values are in mB from nMax (maximum volume) to nMin mB (typically negative). Since the volume is "voltage" and not a "power", it takes a setting of -600 mB to decrease the volume by 1/2. If - a component cannot accurately set the + a component cannot accurately set the volume to the requested value, it must set the volume to the closest value BELOW the requested value. When getting the @@ -1037,27 +1069,27 @@ typedef struct OMX_AUDIO_CONFIG_VOLUMETYPE { typedef struct OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U32 nPortIndex; /**< Port index indicating which port to - set. Select the input port to set - just that port's volume. Select the - output port to adjust the master + OMX_U32 nPortIndex; /**< Port index indicating which port to + set. Select the input port to set + just that port's volume. Select the + output port to adjust the master volume. */ - OMX_U32 nChannel; /**< channel to select from 0 to N-1, + OMX_U32 nChannel; /**< channel to select from 0 to N-1, using OMX_ALL to apply volume settings to all channels */ - OMX_BOOL bLinear; /**< Is the volume to be set in linear (0.100) or + OMX_BOOL bLinear; /**< Is the volume to be set in linear (0.100) or logarithmic scale (mB) */ OMX_BS32 sVolume; /**< Volume linear setting in the 0..100 range, OR - Volume logarithmic setting for this port. - The values for volume are in mB + Volume logarithmic setting for this port. + The values for volume are in mB (millibels = 1/100 dB) relative to a gain - of 1 (e.g. the output is the same as the - input level). Values are in mB from nMax - (maximum volume) to nMin mB (typically negative). + of 1 (e.g. the output is the same as the + input level). Values are in mB from nMax + (maximum volume) to nMin mB (typically negative). Since the volume is "voltage" and not a "power", it takes a setting of -600 mB to decrease the volume by 1/2. If - a component cannot accurately set the + a component cannot accurately set the volume to the requested value, it must set the volume to the closest value BELOW the requested value. When getting the @@ -1072,12 +1104,12 @@ typedef struct OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE { typedef struct OMX_AUDIO_CONFIG_BALANCETYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U32 nPortIndex; /**< Port index indicating which port to - set. Select the input port to set - just that port's balance. Select the - output port to adjust the master + OMX_U32 nPortIndex; /**< Port index indicating which port to + set. Select the input port to set + just that port's balance. Select the + output port to adjust the master balance. */ - OMX_S32 nBalance; /**< balance setting for this port + OMX_S32 nBalance; /**< balance setting for this port (-100 to 100, where -100 indicates all left, and no right */ } OMX_AUDIO_CONFIG_BALANCETYPE; @@ -1087,10 +1119,10 @@ typedef struct OMX_AUDIO_CONFIG_BALANCETYPE { typedef struct OMX_AUDIO_CONFIG_MUTETYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U32 nPortIndex; /**< Port index indicating which port to - set. Select the input port to set - just that port's mute. Select the - output port to adjust the master + OMX_U32 nPortIndex; /**< Port index indicating which port to + set. Select the input port to set + just that port's mute. Select the + output port to adjust the master mute. */ OMX_BOOL bMute; /**< Mute setting for this port */ } OMX_AUDIO_CONFIG_MUTETYPE; @@ -1101,20 +1133,20 @@ typedef struct OMX_AUDIO_CONFIG_CHANNELMUTETYPE { 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 nChannel; /**< channel to select from 0 to N-1, + OMX_U32 nChannel; /**< channel to select from 0 to N-1, using OMX_ALL to apply mute settings to all channels */ OMX_BOOL bMute; /**< Mute setting for this channel */ OMX_BOOL bIsMIDI; /**< TRUE if nChannel refers to a MIDI channel, - FALSE otherwise */ + FALSE otherwise */ } OMX_AUDIO_CONFIG_CHANNELMUTETYPE; -/** Enable / Disable for loudness control, which boosts bass and to a +/** Enable / Disable for loudness control, which boosts bass and to a * smaller extent high end frequencies to compensate for hearing * ability at the extreme ends of the audio spectrum - */ + */ typedef struct OMX_AUDIO_CONFIG_LOUDNESSTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ @@ -1124,33 +1156,33 @@ typedef struct OMX_AUDIO_CONFIG_LOUDNESSTYPE { /** Enable / Disable for bass, which controls low frequencies - */ + */ typedef struct OMX_AUDIO_CONFIG_BASSTYPE { 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_BOOL bEnable; /**< Enable/disable for bass control */ - OMX_S32 nBass; /**< bass setting for the port, as a - continuous value from -100 to 100 + OMX_S32 nBass; /**< bass setting for the port, as a + continuous value from -100 to 100 (0 means no change in bass level)*/ } OMX_AUDIO_CONFIG_BASSTYPE; /** Enable / Disable for treble, which controls high frequencies tones - */ + */ typedef struct OMX_AUDIO_CONFIG_TREBLETYPE { 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_BOOL bEnable; /**< Enable/disable for treble control */ OMX_S32 nTreble; /**< treble setting for the port, as a - continuous value from -100 to 100 + continuous value from -100 to 100 (0 means no change in treble level) */ } OMX_AUDIO_CONFIG_TREBLETYPE; -/** An equalizer is typically used for two reasons: to compensate for an - * sub-optimal frequency response of a system to make it sound more natural +/** An equalizer is typically used for two reasons: to compensate for an + * sub-optimal frequency response of a system to make it sound more natural * or to create intentionally some unnatural coloring to the sound to create * an effect. * @ingroup effects @@ -1160,33 +1192,33 @@ typedef struct OMX_AUDIO_CONFIG_EQUALIZERTYPE { OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ OMX_U32 nPortIndex; /**< port that this structure applies to */ OMX_BOOL bEnable; /**< Enable/disable for equalizer */ - OMX_BU32 sBandIndex; /**< Band number to be set. Upper Limit is + OMX_BU32 sBandIndex; /**< Band number to be set. Upper Limit is N-1, where N is the number of bands, lower limit is 0 */ OMX_BU32 sCenterFreq; /**< Center frequecies in Hz. This is a - read only element and is used to determine - the lower, center and upper frequency of + read only element and is used to determine + the lower, center and upper frequency of this band. */ OMX_BS32 sBandLevel; /**< band level in millibels */ } OMX_AUDIO_CONFIG_EQUALIZERTYPE; -/** Stereo widening mode type +/** Stereo widening mode type * @ingroup effects - */ + */ typedef enum OMX_AUDIO_STEREOWIDENINGTYPE { OMX_AUDIO_StereoWideningHeadphones, /**< Stereo widening for loudspeakers */ OMX_AUDIO_StereoWideningLoudspeakers, /**< Stereo widening for closely spaced loudspeakers */ - OMX_AUDIO_StereoWideningKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_StereoWideningKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_StereoWideningVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_StereoWideningMax = 0x7FFFFFFF } OMX_AUDIO_STEREOWIDENINGTYPE; /** Control for stereo widening, which is a special 2-channel - * case of the audio virtualizer effect. For example, for 5.1-channel - * output, it translates to virtual surround sound. + * case of the audio virtualizer effect. For example, for 5.1-channel + * output, it translates to virtual surround sound. * @ingroup effects - */ + */ typedef struct OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ @@ -1199,10 +1231,10 @@ typedef struct OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE { /** The chorus effect (or ``choralizer'') is any signal processor which makes - * one sound source (such as a voice) sound like many such sources singing - * (or playing) in unison. Since performance in unison is never exact, chorus - * effects simulate this by making independently modified copies of the input - * signal. Modifications may include (1) delay, (2) frequency shift, and + * one sound source (such as a voice) sound like many such sources singing + * (or playing) in unison. Since performance in unison is never exact, chorus + * effects simulate this by making independently modified copies of the input + * signal. Modifications may include (1) delay, (2) frequency shift, and * (3) amplitude modulation. * @ingroup effects */ @@ -1213,16 +1245,16 @@ typedef struct OMX_AUDIO_CONFIG_CHORUSTYPE { OMX_BOOL bEnable; /**< Enable/disable for chorus */ OMX_BU32 sDelay; /**< average delay in milliseconds */ OMX_BU32 sModulationRate; /**< rate of modulation in millihertz */ - OMX_U32 nModulationDepth; /**< depth of modulation as a percentage of + OMX_U32 nModulationDepth; /**< depth of modulation as a percentage of delay (i.e. 0 to 100) */ OMX_BU32 nFeedback; /**< Feedback from chorus output to input in percentage */ } OMX_AUDIO_CONFIG_CHORUSTYPE; -/** Reverberation is part of the reflected sound that follows the early - * reflections. In a typical room, this consists of a dense succession of - * echoes whose energy decays exponentially. The reverberation effect structure - * as defined here includes both (early) reflections as well as (late) reverberations. +/** Reverberation is part of the reflected sound that follows the early + * reflections. In a typical room, this consists of a dense succession of + * echoes whose energy decays exponentially. The reverberation effect structure + * as defined here includes both (early) reflections as well as (late) reverberations. * @ingroup effects */ typedef struct OMX_AUDIO_CONFIG_REVERBERATIONTYPE { @@ -1230,48 +1262,48 @@ typedef struct OMX_AUDIO_CONFIG_REVERBERATIONTYPE { OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ OMX_U32 nPortIndex; /**< port that this structure applies to */ OMX_BOOL bEnable; /**< Enable/disable for reverberation control */ - OMX_BS32 sRoomLevel; /**< Intensity level for the whole room effect - (i.e. both early reflections and late + OMX_BS32 sRoomLevel; /**< Intensity level for the whole room effect + (i.e. both early reflections and late reverberation) in millibels */ OMX_BS32 sRoomHighFreqLevel; /**< Attenuation at high frequencies relative to the intensity at low frequencies in millibels */ OMX_BS32 sReflectionsLevel; /**< Intensity level of early reflections (relative to room value), in millibels */ - OMX_BU32 sReflectionsDelay; /**< Delay time of the first reflection relative + OMX_BU32 sReflectionsDelay; /**< Delay time of the first reflection relative to the direct path, in milliseconds */ OMX_BS32 sReverbLevel; /**< Intensity level of late reverberation relative to room level, in millibels */ - OMX_BU32 sReverbDelay; /**< Time delay from the first early reflection - to the beginning of the late reverberation + OMX_BU32 sReverbDelay; /**< Time delay from the first early reflection + to the beginning of the late reverberation section, in milliseconds */ OMX_BU32 sDecayTime; /**< Late reverberation decay time at low frequencies, in milliseconds */ - OMX_BU32 nDecayHighFreqRatio; /**< Ratio of high frequency decay time relative + OMX_BU32 nDecayHighFreqRatio; /**< Ratio of high frequency decay time relative to low frequency decay time in percent */ OMX_U32 nDensity; /**< Modal density in the late reverberation decay, in percent (i.e. 0 - 100) */ OMX_U32 nDiffusion; /**< Echo density in the late reverberation decay, in percent (i.e. 0 - 100) */ - OMX_BU32 sReferenceHighFreq; /**< Reference high frequency in Hertz. This is - the frequency used as the reference for all + OMX_BU32 sReferenceHighFreq; /**< Reference high frequency in Hertz. This is + the frequency used as the reference for all the high-frequency settings above */ } OMX_AUDIO_CONFIG_REVERBERATIONTYPE; -/** Possible settings for the Echo Cancelation structure to use +/** Possible settings for the Echo Cancelation structure to use * @ingroup effects */ typedef enum OMX_AUDIO_ECHOCANTYPE { OMX_AUDIO_EchoCanOff = 0, /**< Echo Cancellation is disabled */ - OMX_AUDIO_EchoCanNormal, /**< Echo Cancellation normal operation - + OMX_AUDIO_EchoCanNormal, /**< Echo Cancellation normal operation - echo from plastics and face */ - OMX_AUDIO_EchoCanHFree, /**< Echo Cancellation optimized for + OMX_AUDIO_EchoCanHFree, /**< Echo Cancellation optimized for Hands Free operation */ - OMX_AUDIO_EchoCanCarKit, /**< Echo Cancellation optimized for + OMX_AUDIO_EchoCanCarKit, /**< Echo Cancellation optimized for Car Kit (longer echo) */ - OMX_AUDIO_EchoCanKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_EchoCanKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_EchoCanVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_EchoCanMax = 0x7FFFFFFF } OMX_AUDIO_ECHOCANTYPE; @@ -1280,7 +1312,7 @@ typedef enum OMX_AUDIO_ECHOCANTYPE { /** Enable / Disable for echo cancelation, which removes undesired echo's * from the audio * @ingroup effects - */ + */ typedef struct OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ @@ -1292,7 +1324,7 @@ typedef struct OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE { /** Enable / Disable for noise reduction, which undesired noise from * the audio * @ingroup effects - */ + */ typedef struct OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ @@ -1308,4 +1340,3 @@ typedef struct OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE { #endif /* File EOF */ - diff --git a/domx/omx_core/inc/OMX_Component.h b/domx/omx_core/inc/OMX_Component.h index d595640..c312aef 100755 --- a/domx/omx_core/inc/OMX_Component.h +++ b/domx/omx_core/inc/OMX_Component.h @@ -1,23 +1,40 @@ +/* ------------------------------------------------------------------ + * Copyright (C) 1998-2009 PacketVideo + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. + * See the License for the specific language governing permissions + * and limitations under the License. + * ------------------------------------------------------------------- + */ /* - * Copyright (c) 2008 The Khronos Group Inc. - * + * Copyright (c) 2008 The Khronos Group Inc. + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: + * to the following conditions: * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * + * in all copies or substantial portions of the Software. + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ @@ -38,7 +55,7 @@ extern "C" { /* Each OMX header must include all required header files to allow the * header to compile without errors. The includes below are required - * for this header file to compile successfully + * for this header file to compile successfully */ #include <OMX_Audio.h> @@ -47,12 +64,12 @@ extern "C" { #include <OMX_Other.h> /** @ingroup comp */ -typedef enum OMX_PORTDOMAINTYPE { - OMX_PortDomainAudio, - OMX_PortDomainVideo, - OMX_PortDomainImage, +typedef enum OMX_PORTDOMAINTYPE { + OMX_PortDomainAudio, + OMX_PortDomainVideo, + OMX_PortDomainImage, OMX_PortDomainOther, - OMX_PortDomainKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_PortDomainKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_PortDomainVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_PortDomainMax = 0x7ffffff } OMX_PORTDOMAINTYPE; @@ -71,7 +88,7 @@ typedef struct OMX_PARAM_PORTDEFINITIONTYPE { When disabled a port is unpopulated. A disabled port is not populated with buffers on a transition to IDLE. */ OMX_BOOL bPopulated; /**< Port is populated with all of its buffers as indicated by - nBufferCountActual. A disabled port is always unpopulated. + nBufferCountActual. A disabled port is always unpopulated. An enabled port is populated on a transition to OMX_StateIdle and unpopulated on a transition to loaded. */ OMX_PORTDOMAINTYPE eDomain; /**< Domain of the port. Determines the contents of metadata below. */ @@ -86,26 +103,26 @@ typedef struct OMX_PARAM_PORTDEFINITIONTYPE { } OMX_PARAM_PORTDEFINITIONTYPE; /** @ingroup comp */ -typedef struct OMX_PARAM_U32TYPE { - OMX_U32 nSize; /**< Size of this structure, in Bytes */ - OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U32 nPortIndex; /**< port that this structure applies to */ +typedef struct OMX_PARAM_U32TYPE { + OMX_U32 nSize; /**< Size of this structure, in Bytes */ + OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ + OMX_U32 nPortIndex; /**< port that this structure applies to */ OMX_U32 nU32; /**< U32 value */ } OMX_PARAM_U32TYPE; /** @ingroup rpm */ typedef enum OMX_SUSPENSIONPOLICYTYPE { OMX_SuspensionDisabled, /**< No suspension; v1.0 behavior */ - OMX_SuspensionEnabled, /**< Suspension allowed */ - OMX_SuspensionPolicyKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_SuspensionEnabled, /**< Suspension allowed */ + OMX_SuspensionPolicyKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_SuspensionPolicyStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_SuspensionPolicyMax = 0x7fffffff } OMX_SUSPENSIONPOLICYTYPE; /** @ingroup rpm */ typedef struct OMX_PARAM_SUSPENSIONPOLICYTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; OMX_SUSPENSIONPOLICYTYPE ePolicy; } OMX_PARAM_SUSPENSIONPOLICYTYPE; @@ -113,22 +130,22 @@ typedef struct OMX_PARAM_SUSPENSIONPOLICYTYPE { typedef enum OMX_SUSPENSIONTYPE { OMX_NotSuspended, /**< component is not suspended */ OMX_Suspended, /**< component is suspended */ - OMX_SuspensionKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_SuspensionKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_SuspensionVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_SuspendMax = 0x7FFFFFFF } OMX_SUSPENSIONTYPE; /** @ingroup rpm */ typedef struct OMX_PARAM_SUSPENSIONTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_SUSPENSIONTYPE eType; + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_SUSPENSIONTYPE eType; } OMX_PARAM_SUSPENSIONTYPE ; typedef struct OMX_CONFIG_BOOLEANTYPE { OMX_U32 nSize; OMX_VERSIONTYPE nVersion; - OMX_BOOL bEnabled; + OMX_BOOL bEnabled; } OMX_CONFIG_BOOLEANTYPE; /* Parameter specifying the content uri to use. */ @@ -154,9 +171,9 @@ typedef struct OMX_PARAM_CONTENTPIPETYPE typedef struct OMX_RESOURCECONCEALMENTTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_BOOL bResourceConcealmentForbidden; /**< disallow the use of resource concealment - methods (like degrading algorithm quality to - lower resource consumption or functional bypass) + OMX_BOOL bResourceConcealmentForbidden; /**< disallow the use of resource concealment + methods (like degrading algorithm quality to + lower resource consumption or functional bypass) on a component as a resolution to resource conflicts. */ } OMX_RESOURCECONCEALMENTTYPE; @@ -171,7 +188,7 @@ typedef enum OMX_METADATACHARSETTYPE { OMX_MetadataCharsetJavaConformantUTF8, OMX_MetadataCharsetUTF7, OMX_MetadataCharsetImapUTF7, - OMX_MetadataCharsetUTF16LE, + OMX_MetadataCharsetUTF16LE, OMX_MetadataCharsetUTF16BE, OMX_MetadataCharsetGB12345, OMX_MetadataCharsetHZGB2312, @@ -197,7 +214,7 @@ typedef enum OMX_METADATACHARSETTYPE { OMX_MetadataCharsetISO2022JP1, OMX_MetadataCharsetISOEUCJP, OMX_MetadataCharsetSMS7Bit, - OMX_MetadataCharsetKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_MetadataCharsetKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_MetadataCharsetVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_MetadataCharsetTypeMax= 0x7FFFFFFF } OMX_METADATACHARSETTYPE; @@ -209,7 +226,7 @@ typedef enum OMX_METADATASCOPETYPE OMX_MetadataScopeTopLevel, OMX_MetadataScopePortLevel, OMX_MetadataScopeNodeLevel, - OMX_MetadataScopeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_MetadataScopeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_MetadataScopeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_MetadataScopeTypeMax = 0x7fffffff } OMX_METADATASCOPETYPE; @@ -220,7 +237,7 @@ typedef enum OMX_METADATASEARCHMODETYPE OMX_MetadataSearchValueSizeByIndex, OMX_MetadataSearchItemByIndex, OMX_MetadataSearchNextItemByKey, - OMX_MetadataSearchKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_MetadataSearchKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_MetadataSearchVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_MetadataSearchTypeMax = 0x7fffffff } OMX_METADATASEARCHMODETYPE; @@ -241,7 +258,7 @@ typedef struct OMX_CONFIG_METADATAITEMTYPE OMX_VERSIONTYPE nVersion; OMX_METADATASCOPETYPE eScopeMode; OMX_U32 nScopeSpecifier; - OMX_U32 nMetadataItemIndex; + OMX_U32 nMetadataItemIndex; OMX_METADATASEARCHMODETYPE eSearchMode; OMX_METADATACHARSETTYPE eKeyCharset; OMX_U8 nKeySizeUsed; @@ -270,30 +287,30 @@ typedef struct OMX_CONFIG_CONTAINERNODEIDTYPE OMX_VERSIONTYPE nVersion; OMX_BOOL bAllKeys; OMX_U32 nParentNodeID; - OMX_U32 nNodeIndex; - OMX_U32 nNodeID; + OMX_U32 nNodeIndex; + OMX_U32 nNodeID; OMX_STRING cNodeName; OMX_BOOL bIsLeafType; } OMX_CONFIG_CONTAINERNODEIDTYPE; /** @ingroup metadata */ -typedef struct OMX_PARAM_METADATAFILTERTYPE -{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_BOOL bAllKeys; /* if true then this structure refers to all keys and +typedef struct OMX_PARAM_METADATAFILTERTYPE +{ + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_BOOL bAllKeys; /* if true then this structure refers to all keys and * the three key fields below are ignored */ OMX_METADATACHARSETTYPE eKeyCharset; - OMX_U32 nKeySizeUsed; - OMX_U8 nKey [128]; + OMX_U32 nKeySizeUsed; + OMX_U8 nKey [128]; OMX_U32 nLanguageCountrySizeUsed; OMX_U8 nLanguageCountry[128]; - OMX_BOOL bEnabled; /* if true then key is part of filter (e.g. + OMX_BOOL bEnabled; /* if true then key is part of filter (e.g. * retained for query later). If false then * key is not part of filter */ -} OMX_PARAM_METADATAFILTERTYPE; +} OMX_PARAM_METADATAFILTERTYPE; -/** The OMX_HANDLETYPE structure defines the component handle. The component +/** The OMX_HANDLETYPE structure defines the component handle. The component * handle is used to access all of the component's public methods and also * contains pointers to the component's private data area. The component * handle is initialized by the OMX core (with help from the component) @@ -301,7 +318,7 @@ typedef struct OMX_PARAM_METADATAFILTERTYPE * successfully loaded, the application can safely access any of the * component's public functions (although some may return an error because * the state is inappropriate for the access). - * + * * @ingroup comp */ typedef struct OMX_COMPONENTTYPE @@ -312,26 +329,26 @@ typedef struct OMX_COMPONENTTYPE function will fill in this value. */ OMX_U32 nSize; - /** nVersion is the version of the OMX specification that the structure - is built against. It is the responsibility of the creator of this - structure to initialize this value and every user of this structure - should verify that it knows how to use the exact version of + /** nVersion is the version of the OMX specification that the structure + is built against. It is the responsibility of the creator of this + structure to initialize this value and every user of this structure + should verify that it knows how to use the exact version of this structure found herein. */ OMX_VERSIONTYPE nVersion; - /** pComponentPrivate is a pointer to the component private data area. - This member is allocated and initialized by the component when the - component is first loaded. The application should not access this + /** pComponentPrivate is a pointer to the component private data area. + This member is allocated and initialized by the component when the + component is first loaded. The application should not access this data area. */ OMX_PTR pComponentPrivate; - /** pApplicationPrivate is a pointer that is a parameter to the - OMX_GetHandle method, and contains an application private value - provided by the IL client. This application private data is + /** pApplicationPrivate is a pointer that is a parameter to the + OMX_GetHandle method, and contains an application private value + provided by the IL client. This application private data is returned to the IL Client by OMX in all callbacks */ OMX_PTR pApplicationPrivate; - /** refer to OMX_GetComponentVersion in OMX_core.h or the OMX IL + /** refer to OMX_GetComponentVersion in OMX_core.h or the OMX IL specification for details on the GetComponentVersion method. */ OMX_ERRORTYPE (*GetComponentVersion)( @@ -341,7 +358,7 @@ typedef struct OMX_COMPONENTTYPE OMX_OUT OMX_VERSIONTYPE* pSpecVersion, OMX_OUT OMX_UUIDTYPE* pComponentUUID); - /** refer to OMX_SendCommand in OMX_core.h or the OMX IL + /** refer to OMX_SendCommand in OMX_core.h or the OMX IL specification for details on the SendCommand method. */ OMX_ERRORTYPE (*SendCommand)( @@ -350,43 +367,43 @@ typedef struct OMX_COMPONENTTYPE OMX_IN OMX_U32 nParam1, OMX_IN OMX_PTR pCmdData); - /** refer to OMX_GetParameter in OMX_core.h or the OMX IL + /** refer to OMX_GetParameter in OMX_core.h or the OMX IL specification for details on the GetParameter method. */ OMX_ERRORTYPE (*GetParameter)( - OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nParamIndex, + OMX_IN OMX_HANDLETYPE hComponent, + OMX_IN OMX_INDEXTYPE nParamIndex, OMX_INOUT OMX_PTR pComponentParameterStructure); - /** refer to OMX_SetParameter in OMX_core.h or the OMX IL + /** refer to OMX_SetParameter in OMX_core.h or the OMX IL specification for details on the SetParameter method. */ OMX_ERRORTYPE (*SetParameter)( - OMX_IN OMX_HANDLETYPE hComponent, + OMX_IN OMX_HANDLETYPE hComponent, OMX_IN OMX_INDEXTYPE nIndex, OMX_IN OMX_PTR pComponentParameterStructure); - /** refer to OMX_GetConfig in OMX_core.h or the OMX IL + /** refer to OMX_GetConfig in OMX_core.h or the OMX IL specification for details on the GetConfig method. */ OMX_ERRORTYPE (*GetConfig)( OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nIndex, + OMX_IN OMX_INDEXTYPE nIndex, OMX_INOUT OMX_PTR pComponentConfigStructure); - /** refer to OMX_SetConfig in OMX_core.h or the OMX IL + /** refer to OMX_SetConfig in OMX_core.h or the OMX IL specification for details on the SetConfig method. */ OMX_ERRORTYPE (*SetConfig)( OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nIndex, + OMX_IN OMX_INDEXTYPE nIndex, OMX_IN OMX_PTR pComponentConfigStructure); - /** refer to OMX_GetExtensionIndex in OMX_core.h or the OMX IL + /** refer to OMX_GetExtensionIndex in OMX_core.h or the OMX IL specification for details on the GetExtensionIndex method. */ OMX_ERRORTYPE (*GetExtensionIndex)( @@ -395,50 +412,50 @@ typedef struct OMX_COMPONENTTYPE OMX_OUT OMX_INDEXTYPE* pIndexType); - /** refer to OMX_GetState in OMX_core.h or the OMX IL + /** refer to OMX_GetState in OMX_core.h or the OMX IL specification for details on the GetState method. */ OMX_ERRORTYPE (*GetState)( OMX_IN OMX_HANDLETYPE hComponent, OMX_OUT OMX_STATETYPE* pState); - + /** The ComponentTunnelRequest method will interact with another OMX component to determine if tunneling is possible and to setup the - tunneling. The return codes for this method can be used to + tunneling. The return codes for this method can be used to determine if tunneling is not possible, or if tunneling is not - supported. - + supported. + Base profile components (i.e. non-interop) do not support this - method and should return OMX_ErrorNotImplemented + method and should return OMX_ErrorNotImplemented - The interop profile component MUST support tunneling to another - interop profile component with a compatible port parameters. + The interop profile component MUST support tunneling to another + interop profile component with a compatible port parameters. A component may also support proprietary communication. - - If proprietary communication is supported the negotiation of - proprietary communication is done outside of OMX in a vendor - specific way. It is only required that the proper result be - returned and the details of how the setup is done is left - to the component implementation. - + + If proprietary communication is supported the negotiation of + proprietary communication is done outside of OMX in a vendor + specific way. It is only required that the proper result be + returned and the details of how the setup is done is left + to the component implementation. + When this method is invoked when nPort in an output port, the component will: - 1. Populate the pTunnelSetup structure with the output port's + 1. Populate the pTunnelSetup structure with the output port's requirements and constraints for the tunnel. When this method is invoked when nPort in an input port, the component will: - 1. Query the necessary parameters from the output port to + 1. Query the necessary parameters from the output port to determine if the ports are compatible for tunneling 2. If the ports are compatible, the component should store the tunnel step provided by the output port 3. Determine which port (either input or output) is the buffer supplier, and call OMX_SetParameter on the output port to indicate this selection. - + The component will return from this call within 5 msec. - + @param [in] hComp Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle method. @@ -446,7 +463,7 @@ typedef struct OMX_COMPONENTTYPE nPort is used to select the port on the component to be used for tunneling. @param [in] hTunneledComp - Handle of the component to tunnel with. This is the component + Handle of the component to tunnel with. This is the component handle returned by the call to the OMX_GetHandle method. When this parameter is 0x0 the component should setup the port for communication with the application / IL Client. @@ -469,9 +486,9 @@ typedef struct OMX_COMPONENTTYPE OMX_IN OMX_U32 nPort, OMX_IN OMX_HANDLETYPE hTunneledComp, OMX_IN OMX_U32 nTunneledPort, - OMX_INOUT OMX_TUNNELSETUPTYPE* pTunnelSetup); + OMX_INOUT OMX_TUNNELSETUPTYPE* pTunnelSetup); - /** refer to OMX_UseBuffer in OMX_core.h or the OMX IL + /** refer to OMX_UseBuffer in OMX_core.h or the OMX IL specification for details on the UseBuffer method. @ingroup buf */ @@ -483,7 +500,7 @@ typedef struct OMX_COMPONENTTYPE OMX_IN OMX_U32 nSizeBytes, OMX_IN OMX_U8* pBuffer); - /** refer to OMX_AllocateBuffer in OMX_core.h or the OMX IL + /** refer to OMX_AllocateBuffer in OMX_core.h or the OMX IL specification for details on the AllocateBuffer method. @ingroup buf */ @@ -494,7 +511,7 @@ typedef struct OMX_COMPONENTTYPE OMX_IN OMX_PTR pAppPrivate, OMX_IN OMX_U32 nSizeBytes); - /** refer to OMX_FreeBuffer in OMX_core.h or the OMX IL + /** refer to OMX_FreeBuffer in OMX_core.h or the OMX IL specification for details on the FreeBuffer method. @ingroup buf */ @@ -503,7 +520,7 @@ typedef struct OMX_COMPONENTTYPE OMX_IN OMX_U32 nPortIndex, OMX_IN OMX_BUFFERHEADERTYPE* pBuffer); - /** refer to OMX_EmptyThisBuffer in OMX_core.h or the OMX IL + /** refer to OMX_EmptyThisBuffer in OMX_core.h or the OMX IL specification for details on the EmptyThisBuffer method. @ingroup buf */ @@ -511,7 +528,7 @@ typedef struct OMX_COMPONENTTYPE OMX_IN OMX_HANDLETYPE hComponent, OMX_IN OMX_BUFFERHEADERTYPE* pBuffer); - /** refer to OMX_FillThisBuffer in OMX_core.h or the OMX IL + /** refer to OMX_FillThisBuffer in OMX_core.h or the OMX IL specification for details on the FillThisBuffer method. @ingroup buf */ @@ -526,10 +543,10 @@ typedef struct OMX_COMPONENTTYPE Handle of the component to be accessed. This is the component handle returned by the call to the GetHandle function. @param [in] pCallbacks - pointer to an OMX_CALLBACKTYPE structure used to provide the + pointer to an OMX_CALLBACKTYPE structure used to provide the callback information to the component @param [in] pAppData - pointer to an application defined value. It is anticipated that + pointer to an application defined value. It is anticipated that the application will pass a pointer to a data structure or a "this pointer" in this area to allow the callback (in the application) to determine the context of the call @@ -539,7 +556,7 @@ typedef struct OMX_COMPONENTTYPE */ OMX_ERRORTYPE (*SetCallbacks)( OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_CALLBACKTYPE* pCallbacks, + OMX_IN OMX_CALLBACKTYPE* pCallbacks, OMX_IN OMX_PTR pAppData); /** ComponentDeInit method is used to deinitialize the component diff --git a/domx/omx_core/inc/OMX_ContentPipe.h b/domx/omx_core/inc/OMX_ContentPipe.h index 5f6310c..6b1025e 100755 --- a/domx/omx_core/inc/OMX_ContentPipe.h +++ b/domx/omx_core/inc/OMX_ContentPipe.h @@ -1,23 +1,40 @@ +/* ------------------------------------------------------------------ + * Copyright (C) 1998-2009 PacketVideo + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. + * See the License for the specific language governing permissions + * and limitations under the License. + * ------------------------------------------------------------------- + */ /* - * Copyright (c) 2008 The Khronos Group Inc. - * + * Copyright (c) 2008 The Khronos Group Inc. + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: + * to the following conditions: * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * + * in all copies or substantial portions of the Software. + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ @@ -64,83 +81,83 @@ /** Map types from OMX standard types only here so interface is as generic as possible. */ typedef OMX_U32 CPresult; -typedef char * CPstring; +typedef char * CPstring; typedef void * CPhandle; typedef OMX_U32 CPuint; -typedef OMX_S32 CPint; -typedef char CPbyte; +typedef OMX_S32 CPint; +typedef char CPbyte; typedef OMX_BOOL CPbool; -/** enumeration of origin types used in the CP_PIPETYPE's Seek function +/** enumeration of origin types used in the CP_PIPETYPE's Seek function * @ingroup cp */ typedef enum CP_ORIGINTYPE { - CP_OriginBegin, - CP_OriginCur, - CP_OriginEnd, - CP_OriginKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + CP_OriginBegin, + CP_OriginCur, + CP_OriginEnd, + CP_OriginKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ CP_OriginVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ CP_OriginMax = 0X7FFFFFFF } CP_ORIGINTYPE; -/** enumeration of contact access types used in the CP_PIPETYPE's Open function +/** enumeration of contact access types used in the CP_PIPETYPE's Open function * @ingroup cp */ typedef enum CP_ACCESSTYPE { - CP_AccessRead, - CP_AccessWrite, - CP_AccessReadWrite , - CP_AccessKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + CP_AccessRead, + CP_AccessWrite, + CP_AccessReadWrite , + CP_AccessKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ CP_AccessVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ CP_AccessMax = 0X7FFFFFFF } CP_ACCESSTYPE; -/** enumeration of results returned by the CP_PIPETYPE's CheckAvailableBytes function +/** enumeration of results returned by the CP_PIPETYPE's CheckAvailableBytes function * @ingroup cp */ typedef enum CP_CHECKBYTESRESULTTYPE { - CP_CheckBytesOk, /**< There are at least the request number + CP_CheckBytesOk, /**< There are at least the request number of bytes available */ - CP_CheckBytesNotReady, /**< The pipe is still retrieving bytes - and presently lacks sufficient bytes. - Client will be called when they are + CP_CheckBytesNotReady, /**< The pipe is still retrieving bytes + and presently lacks sufficient bytes. + Client will be called when they are sufficient bytes are available. */ - CP_CheckBytesInsufficientBytes , /**< The pipe has retrieved all bytes - but those available are less than those + CP_CheckBytesInsufficientBytes , /**< The pipe has retrieved all bytes + but those available are less than those requested */ CP_CheckBytesAtEndOfStream, /**< The pipe has reached the end of stream and no more bytes are available. */ CP_CheckBytesOutOfBuffers, /**< All read/write buffers are currently in use. */ - CP_CheckBytesKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + CP_CheckBytesKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ CP_CheckBytesVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ CP_CheckBytesMax = 0X7FFFFFFF } CP_CHECKBYTESRESULTTYPE; -/** enumeration of content pipe events sent to the client callback. +/** enumeration of content pipe events sent to the client callback. * @ingroup cp */ typedef enum CP_EVENTTYPE{ CP_BytesAvailable, /** bytes requested in a CheckAvailableBytes call are now available*/ CP_Overflow, /** enumeration of content pipe events sent to the client callback*/ CP_PipeDisconnected , /** enumeration of content pipe events sent to the client callback*/ - CP_EventKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + CP_EventKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ CP_EventVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ CP_EventMax = 0X7FFFFFFF } CP_EVENTTYPE; -/** content pipe definition +/** content pipe definition * @ingroup cp */ typedef struct CP_PIPETYPE { - /** Open a content stream for reading or writing. */ + /** Open a content stream for reading or writing. */ CPresult (*Open)( CPhandle* hContent, CPstring szURI, CP_ACCESSTYPE eAccess ); - /** Close a content stream. */ + /** Close a content stream. */ CPresult (*Close)( CPhandle hContent ); - /** Create a content source and open it for writing. */ + /** Create a content source and open it for writing. */ CPresult (*Create)( CPhandle *hContent, CPstring szURI ); /** Check the that specified number of bytes are available for reading or writing (depending on access type).*/ @@ -154,19 +171,19 @@ typedef struct CP_PIPETYPE /** Retrieve data of the specified size from the content stream (advance content pointer by size of data). Note: pipe client provides pointer. This function is appropriate for small high frequency reads. */ - CPresult (*Read)( CPhandle hContent, CPbyte *pData, CPuint nSize); + CPresult (*Read)( CPhandle hContent, CPbyte *pData, CPuint nSize); - /** Retrieve a buffer allocated by the pipe that contains the requested number of bytes. + /** Retrieve a buffer allocated by the pipe that contains the requested number of bytes. Buffer contains the next block of bytes, as specified by nSize, of the content. nSize also - returns the size of the block actually read. Content pointer advances the by the returned size. - Note: pipe provides pointer. This function is appropriate for large reads. The client must call - ReleaseReadBuffer when done with buffer. + returns the size of the block actually read. Content pointer advances the by the returned size. + Note: pipe provides pointer. This function is appropriate for large reads. The client must call + ReleaseReadBuffer when done with buffer. In some cases the requested block may not reside in contiguous memory within the - pipe implementation. For instance if the pipe leverages a circular buffer then the requested - block may straddle the boundary of the circular buffer. By default a pipe implementation + pipe implementation. For instance if the pipe leverages a circular buffer then the requested + block may straddle the boundary of the circular buffer. By default a pipe implementation performs a copy in this case to provide the block to the pipe client in one contiguous buffer. - If, however, the client sets bForbidCopy, then the pipe returns only those bytes preceding the memory + If, however, the client sets bForbidCopy, then the pipe returns only those bytes preceding the memory boundary. Here the client may retrieve the data in segments over successive calls. */ CPresult (*ReadBuffer)( CPhandle hContent, CPbyte **ppBuffer, CPuint *nSize, CPbool bForbidCopy); @@ -175,14 +192,14 @@ typedef struct CP_PIPETYPE /** Write data of the specified size to the content (advance content pointer by size of data). Note: pipe client provides pointer. This function is appropriate for small high frequency writes. */ - CPresult (*Write)( CPhandle hContent, CPbyte *data, CPuint nSize); + CPresult (*Write)( CPhandle hContent, CPbyte *data, CPuint nSize); - /** Retrieve a buffer allocated by the pipe used to write data to the content. + /** Retrieve a buffer allocated by the pipe used to write data to the content. Client will fill buffer with output data. Note: pipe provides pointer. This function is appropriate for large writes. The client must call WriteBuffer when done it has filled the buffer with data.*/ CPresult (*GetWriteBuffer)( CPhandle hContent, CPbyte **ppBuffer, CPuint nSize); - /** Deliver a buffer obtained via GetWriteBuffer to the pipe. Pipe will write the + /** Deliver a buffer obtained via GetWriteBuffer to the pipe. Pipe will write the the contents of the buffer to content and advance content pointer by the size of the buffer */ CPresult (*WriteBuffer)( CPhandle hContent, CPbyte *pBuffer, CPuint nFilledSize); diff --git a/domx/omx_core/inc/OMX_Core.h b/domx/omx_core/inc/OMX_Core.h index a076f2f..729dc36 100755 --- a/domx/omx_core/inc/OMX_Core.h +++ b/domx/omx_core/inc/OMX_Core.h @@ -1,23 +1,40 @@ +/* ------------------------------------------------------------------ + * Copyright (C) 1998-2009 PacketVideo + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. + * See the License for the specific language governing permissions + * and limitations under the License. + * ------------------------------------------------------------------- + */ /* - * Copyright (c) 2008 The Khronos Group Inc. - * + * Copyright (c) 2008 The Khronos Group Inc. + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: + * to the following conditions: * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * + * in all copies or substantial portions of the Software. + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ @@ -36,14 +53,14 @@ extern "C" { /* Each OMX header shall include all required header files to allow the * header to compile without errors. The includes below are required - * for this header file to compile successfully + * for this header file to compile successfully */ #include <OMX_Index.h> /** The OMX_COMMANDTYPE enumeration is used to specify the action in the - * OMX_SendCommand macro. + * OMX_SendCommand macro. * @ingroup core */ typedef enum OMX_COMMANDTYPE @@ -53,7 +70,7 @@ typedef enum OMX_COMMANDTYPE OMX_CommandPortDisable, /**< Disable a port on a component. */ OMX_CommandPortEnable, /**< Enable a port on a component. */ OMX_CommandMarkBuffer, /**< Mark a component/buffer for observation */ - OMX_CommandKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_CommandKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_CommandVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_CommandMax = 0X7FFFFFFF } OMX_COMMANDTYPE; @@ -76,28 +93,28 @@ typedef enum OMX_COMMANDTYPE * specified configuration and will transition to the idle state if the * allocation is successful. If the component cannot successfully * transition to the idle state for any reason, the state of the component - * shall be fully rolled back to the Loaded state (e.g. all allocated + * shall be fully rolled back to the Loaded state (e.g. all allocated * resources shall be released). When the component receives the command * to go to the Executing state, it shall begin processing buffers by * sending all input buffers it holds to the application. While * the component is in the Idle state, the application may also send the * Pause command. If the component receives the pause command while in the - * Idle state, the component shall send all input buffers it holds to the + * Idle state, the component shall send all input buffers it holds to the * application, but shall not begin processing buffers. This will allow the * application to prefill buffers. - * + * * @ingroup comp */ typedef enum OMX_STATETYPE { - OMX_StateInvalid, /**< component has detected that it's internal data + OMX_StateInvalid, /**< component has detected that it's internal data structures are corrupted to the point that it cannot determine it's state properly */ OMX_StateLoaded, /**< component has been loaded but has not completed initialization. The OMX_SetParameter macro - and the OMX_GetParameter macro are the only - valid macros allowed to be sent to the + and the OMX_GetParameter macro are the only + valid macros allowed to be sent to the component in this state. */ OMX_StateIdle, /**< component initialization has been completed successfully and the component is ready to @@ -105,17 +122,17 @@ typedef enum OMX_STATETYPE OMX_StateExecuting, /**< component has accepted the start command and is processing data (if data is available) */ OMX_StatePause, /**< component has received pause command */ - OMX_StateWaitForResources, /**< component is waiting for resources, either after + OMX_StateWaitForResources, /**< component is waiting for resources, either after preemption or before it gets the resources requested. See specification for complete details. */ - OMX_StateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_StateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_StateVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_StateMax = 0X7FFFFFFF } OMX_STATETYPE; -/** The OMX_ERRORTYPE enumeration defines the standard OMX Errors. These - * errors should cover most of the common failure cases. However, - * vendors are free to add additional error messages of their own as +/** The OMX_ERRORTYPE enumeration defines the standard OMX Errors. These + * errors should cover most of the common failure cases. However, + * vendors are free to add additional error messages of their own as * long as they follow these rules: * 1. Vendor error messages shall be in the range of 0x90000000 to * 0x9000FFFF. @@ -186,25 +203,25 @@ typedef enum OMX_ERRORTYPE /** This error occurs when trying to transition into the state you are already in */ OMX_ErrorSameState = (OMX_S32) 0x80001012, - /** Resources allocated to an executing or paused component have been + /** Resources allocated to an executing or paused component have been preempted, causing the component to return to the idle state */ - OMX_ErrorResourcesPreempted = (OMX_S32) 0x80001013, + OMX_ErrorResourcesPreempted = (OMX_S32) 0x80001013, - /** A non-supplier port sends this error to the IL client (via the EventHandler callback) + /** A non-supplier port sends this error to the IL client (via the EventHandler callback) during the allocation of buffers (on a transition from the LOADED to the IDLE state or - on a port restart) when it deems that it has waited an unusually long time for the supplier + on a port restart) when it deems that it has waited an unusually long time for the supplier to send it an allocated buffer via a UseBuffer call. */ OMX_ErrorPortUnresponsiveDuringAllocation = (OMX_S32) 0x80001014, - /** A non-supplier port sends this error to the IL client (via the EventHandler callback) - during the deallocation of buffers (on a transition from the IDLE to LOADED state or - on a port stop) when it deems that it has waited an unusually long time for the supplier + /** A non-supplier port sends this error to the IL client (via the EventHandler callback) + during the deallocation of buffers (on a transition from the IDLE to LOADED state or + on a port stop) when it deems that it has waited an unusually long time for the supplier to request the deallocation of a buffer header via a FreeBuffer call. */ OMX_ErrorPortUnresponsiveDuringDeallocation = (OMX_S32) 0x80001015, - /** A supplier port sends this error to the IL client (via the EventHandler callback) - during the stopping of a port (either on a transition from the IDLE to LOADED - state or a port stop) when it deems that it has waited an unusually long time for + /** A supplier port sends this error to the IL client (via the EventHandler callback) + during the stopping of a port (either on a transition from the IDLE to LOADED + state or a port stop) when it deems that it has waited an unusually long time for the non-supplier to return a buffer via an EmptyThisBuffer or FillThisBuffer call. */ OMX_ErrorPortUnresponsiveDuringStop = (OMX_S32) 0x80001016, @@ -212,7 +229,7 @@ typedef enum OMX_ERRORTYPE OMX_ErrorIncorrectStateTransition = (OMX_S32) 0x80001017, /* Attempting a command that is not allowed during the present state. */ - OMX_ErrorIncorrectStateOperation = (OMX_S32) 0x80001018, + OMX_ErrorIncorrectStateOperation = (OMX_S32) 0x80001018, /** The values encapsulated in the parameter or config structure are not supported. */ OMX_ErrorUnsupportedSetting = (OMX_S32) 0x80001019, @@ -232,12 +249,12 @@ typedef enum OMX_ERRORTYPE /** Component suspended due to an inability to acquire dynamic resources */ OMX_ErrorDynamicResourcesUnavailable = (OMX_S32) 0x8000101E, - /** When the macroblock error reporting is enabled the component returns new error + /** When the macroblock error reporting is enabled the component returns new error for every frame that has errors */ OMX_ErrorMbErrorsInFrame = (OMX_S32) 0x8000101F, /** A component reports this error when it cannot parse or determine the format of an input stream. */ - OMX_ErrorFormatNotDetected = (OMX_S32) 0x80001020, + OMX_ErrorFormatNotDetected = (OMX_S32) 0x80001020, /** The content open operation failed. */ OMX_ErrorContentPipeOpenFailed = (OMX_S32) 0x80001021, @@ -251,7 +268,7 @@ typedef enum OMX_ERRORTYPE /** Tunneling is unsupported by the component*/ OMX_ErrorTunnelingUnsupported = (OMX_S32) 0x80001024, - OMX_ErrorKhronosExtensions = (OMX_S32)0x8F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_ErrorKhronosExtensions = (OMX_S32)0x8F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_ErrorVendorStartUnused = (OMX_S32)0x90000000, /**< Reserved region for introducing Vendor Extensions */ OMX_ErrorMax = 0x7FFFFFFF } OMX_ERRORTYPE; @@ -287,69 +304,69 @@ typedef struct OMX_PARAM_COMPONENTROLETYPE { OMX_U8 cRole[OMX_MAX_STRINGNAME_SIZE]; /**< name of standard component which defines component role */ } OMX_PARAM_COMPONENTROLETYPE; -/** End of Stream Buffer Flag: +/** End of Stream Buffer Flag: * - * A component sets EOS when it has no more data to emit on a particular - * output port. Thus an output port shall set EOS on the last buffer it - * emits. A component's determination of when an output port should + * A component sets EOS when it has no more data to emit on a particular + * output port. Thus an output port shall set EOS on the last buffer it + * emits. A component's determination of when an output port should * cease sending data is implemenation specific. * @ingroup buf */ -#define OMX_BUFFERFLAG_EOS 0x00000001 +#define OMX_BUFFERFLAG_EOS 0x00000001 -/** Start Time Buffer Flag: +/** Start Time Buffer Flag: * * The source of a stream (e.g. a demux component) sets the STARTTIME * flag on the buffer that contains the starting timestamp for the * stream. The starting timestamp corresponds to the first data that * should be displayed at startup or after a seek. * The first timestamp of the stream is not necessarily the start time. - * For instance, in the case of a seek to a particular video frame, - * the target frame may be an interframe. Thus the first buffer of + * For instance, in the case of a seek to a particular video frame, + * the target frame may be an interframe. Thus the first buffer of * the stream will be the intra-frame preceding the target frame and * the starttime will occur with the target frame (with any other * required frames required to reconstruct the target intervening). * - * The STARTTIME flag is directly associated with the buffer's - * timestamp ' thus its association to buffer data and its + * The STARTTIME flag is directly associated with the buffer's + * timestamp ' thus its association to buffer data and its * propagation is identical to the timestamp's. * - * When a Sync Component client receives a buffer with the - * STARTTIME flag it shall perform a SetConfig on its sync port + * When a Sync Component client receives a buffer with the + * STARTTIME flag it shall perform a SetConfig on its sync port * using OMX_ConfigTimeClientStartTime and passing the buffer's * timestamp. - * + * * @ingroup buf */ #define OMX_BUFFERFLAG_STARTTIME 0x00000002 - -/** Decode Only Buffer Flag: + +/** Decode Only Buffer Flag: * * The source of a stream (e.g. a demux component) sets the DECODEONLY * flag on any buffer that should shall be decoded but should not be - * displayed. This flag is used, for instance, when a source seeks to - * a target interframe that requires the decode of frames preceding the - * target to facilitate the target's reconstruction. In this case the - * source would emit the frames preceding the target downstream + * displayed. This flag is used, for instance, when a source seeks to + * a target interframe that requires the decode of frames preceding the + * target to facilitate the target's reconstruction. In this case the + * source would emit the frames preceding the target downstream * but mark them as decode only. * - * The DECODEONLY is associated with buffer data and propagated in a + * The DECODEONLY is associated with buffer data and propagated in a * manner identical to the buffer timestamp. * - * A component that renders data should ignore all buffers with + * A component that renders data should ignore all buffers with * the DECODEONLY flag set. - * + * * @ingroup buf */ #define OMX_BUFFERFLAG_DECODEONLY 0x00000004 -/* Data Corrupt Flag: This flag is set when the IL client believes the data in the associated buffer is corrupt +/* Data Corrupt Flag: This flag is set when the IL client believes the data in the associated buffer is corrupt * @ingroup buf */ @@ -357,29 +374,29 @@ typedef struct OMX_PARAM_COMPONENTROLETYPE { /* End of Frame: The buffer contains exactly one end of frame and no data * occurs after the end of frame. This flag is an optional hint. The absence - * of this flag does not imply the absence of an end of frame within the buffer. + * of this flag does not imply the absence of an end of frame within the buffer. * @ingroup buf */ #define OMX_BUFFERFLAG_ENDOFFRAME 0x00000010 -/* Sync Frame Flag: This flag is set when the buffer content contains a coded sync frame ' - * a frame that has no dependency on any other frame information +/* Sync Frame Flag: This flag is set when the buffer content contains a coded sync frame ' + * a frame that has no dependency on any other frame information * @ingroup buf */ #define OMX_BUFFERFLAG_SYNCFRAME 0x00000020 /* Extra data present flag: there is extra data appended to the data stream - * residing in the buffer - * @ingroup buf + * residing in the buffer + * @ingroup buf */ #define OMX_BUFFERFLAG_EXTRADATA 0x00000040 -/** Codec Config Buffer Flag: +/** Codec Config Buffer Flag: * OMX_BUFFERFLAG_CODECCONFIG is an optional flag that is set by an * output port when all bytes in the buffer form part or all of a set of * codec specific configuration data. Examples include SPS/PPS nal units * for OMX_VIDEO_CodingAVC or AudioSpecificConfig data for -* OMX_AUDIO_CodingAAC. Any component that for a given stream sets +* OMX_AUDIO_CodingAAC. Any component that for a given stream sets * OMX_BUFFERFLAG_CODECCONFIG shall not mix codec configuration bytes * with frame data in the same buffer, and shall send all buffers * containing codec configuration bytes before any buffers containing @@ -399,50 +416,50 @@ typedef struct OMX_BUFFERHEADERTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U8* pBuffer; /**< Pointer to actual block of memory + OMX_U8* pBuffer; /**< Pointer to actual block of memory that is acting as the buffer */ OMX_U32 nAllocLen; /**< size of the buffer allocated, in bytes */ - OMX_U32 nFilledLen; /**< number of bytes currently in the + OMX_U32 nFilledLen; /**< number of bytes currently in the buffer */ OMX_U32 nOffset; /**< start offset of valid data in bytes from the start of the buffer */ OMX_PTR pAppPrivate; /**< pointer to any data the application wants to associate with this buffer */ OMX_PTR pPlatformPrivate; /**< pointer to any data the platform - wants to associate with this buffer */ + wants to associate with this buffer */ OMX_PTR pInputPortPrivate; /**< pointer to any data the input port wants to associate with this buffer */ OMX_PTR pOutputPortPrivate; /**< pointer to any data the output port wants to associate with this buffer */ - OMX_HANDLETYPE hMarkTargetComponent; /**< The component that will generate a + OMX_HANDLETYPE hMarkTargetComponent; /**< The component that will generate a mark event upon processing this buffer. */ - OMX_PTR pMarkData; /**< Application specific data associated with - the mark sent on a mark event to disambiguate + OMX_PTR pMarkData; /**< Application specific data associated with + the mark sent on a mark event to disambiguate this mark from others. */ OMX_U32 nTickCount; /**< Optional entry that the component and application can update with a tick count when they access the component. This value should be in microseconds. Since this is a value relative to an arbitrary - starting point, this value cannot be used + starting point, this value cannot be used to determine absolute time. This is an optional entry and not all components will update it.*/ - OMX_TICKS nTimeStamp; /**< Timestamp corresponding to the sample - starting at the first logical sample - boundary in the buffer. Timestamps of + OMX_TICKS nTimeStamp; /**< Timestamp corresponding to the sample + starting at the first logical sample + boundary in the buffer. Timestamps of successive samples within the buffer may - be inferred by adding the duration of the + be inferred by adding the duration of the of the preceding buffer to the timestamp of the preceding buffer.*/ OMX_U32 nFlags; /**< buffer specific flags */ - OMX_U32 nOutputPortIndex; /**< The index of the output port (if any) using + OMX_U32 nOutputPortIndex; /**< The index of the output port (if any) using this buffer */ OMX_U32 nInputPortIndex; /**< The index of the input port (if any) using this buffer */ } OMX_BUFFERHEADERTYPE; -/** The OMX_EXTRADATATYPE enumeration is used to define the +/** The OMX_EXTRADATATYPE enumeration is used to define the * possible extra data payload types. * NB: this enum is binary backwards compatible with the previous * OMX_EXTRADATA_QUANT define. This should be replaced with @@ -450,9 +467,9 @@ typedef struct OMX_BUFFERHEADERTYPE */ typedef enum OMX_EXTRADATATYPE { - OMX_ExtraDataNone = 0, /**< Indicates that no more extra data sections follow */ + OMX_ExtraDataNone = 0, /**< Indicates that no more extra data sections follow */ OMX_ExtraDataQuantization, /**< The data payload contains quantization data */ - OMX_ExtraDataKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_ExtraDataKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_ExtraDataVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_ExtraDataMax = 0x7FFFFFFF } OMX_EXTRADATATYPE; @@ -460,7 +477,7 @@ typedef enum OMX_EXTRADATATYPE typedef struct OMX_OTHER_EXTRADATATYPE { OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; + OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_EXTRADATATYPE eType; /* Extra Data type */ OMX_U32 nDataSize; /* Size of the supporting data to follow */ @@ -473,7 +490,7 @@ typedef struct OMX_PORT_PARAM_TYPE { OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ OMX_U32 nPorts; /**< The number of ports for this component */ OMX_U32 nStartPortNumber; /** first port number for this type of port */ -} OMX_PORT_PARAM_TYPE; +} OMX_PORT_PARAM_TYPE; /** @ingroup comp */ typedef enum OMX_EVENTTYPE @@ -482,14 +499,14 @@ typedef enum OMX_EVENTTYPE OMX_EventError, /**< component has detected an error condition */ OMX_EventMark, /**< component has detected a buffer mark */ OMX_EventPortSettingsChanged, /**< component is reported a port settings change */ - OMX_EventBufferFlag, /**< component has detected an EOS */ + OMX_EventBufferFlag, /**< component has detected an EOS */ OMX_EventResourcesAcquired, /**< component has been granted resources and is automatically starting the state change from OMX_StateWaitForResources to OMX_StateIdle. */ OMX_EventComponentResumed, /**< Component resumed due to reacquisition of resources */ OMX_EventDynamicResourcesAvailable, /**< Component has acquired previously unavailable dynamic resources */ OMX_EventPortFormatDetected, /**< Component has detected a supported format. */ - OMX_EventKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_EventKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_EventVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_EventMax = 0x7FFFFFFF } OMX_EVENTTYPE; @@ -500,7 +517,7 @@ typedef struct OMX_CALLBACKTYPE event of interest occurs. Events are defined in the OMX_EVENTTYPE enumeration. Please see that enumeration for details of what will be returned for each type of event. Callbacks should not return - an error to the component, so if an error occurs, the application + an error to the component, so if an error occurs, the application shall handle it internally. This is a blocking call. The application should return from this call within 5 msec to avoid @@ -510,14 +527,14 @@ typedef struct OMX_CALLBACKTYPE handle of the component to access. This is the component handle returned by the call to the GetHandle function. @param pAppData - pointer to an application defined value that was provided in the + pointer to an application defined value that was provided in the pAppData parameter to the OMX_GetHandle method for the component. - This application defined value is provided so that the application + This application defined value is provided so that the application can have a component specific context when receiving the callback. @param eEvent Event that the component wants to notify the application about. @param nData1 - nData will be the OMX_ERRORTYPE for an error event and will be + nData will be the OMX_ERRORTYPE for an error event and will be an OMX_COMMANDTYPE for a command complete event and OMX_INDEXTYPE for a OMX_PortSettingsChanged event. @param nData2 nData2 will hold further information related to the event. Can be OMX_STATETYPE for @@ -536,21 +553,21 @@ typedef struct OMX_CALLBACKTYPE OMX_IN OMX_PTR pEventData); /** The EmptyBufferDone method is used to return emptied buffers from an - input port back to the application for reuse. This is a blocking call + input port back to the application for reuse. This is a blocking call so the application should not attempt to refill the buffers during this call, but should queue them and refill them in another thread. There is no error return, so the application shall handle any errors generated - internally. - + internally. + The application should return from this call within 5 msec. - + @param hComponent handle of the component to access. This is the component handle returned by the call to the GetHandle function. @param pAppData - pointer to an application defined value that was provided in the + pointer to an application defined value that was provided in the pAppData parameter to the OMX_GetHandle method for the component. - This application defined value is provided so that the application + This application defined value is provided so that the application can have a component specific context when receiving the callback. @param pBuffer pointer to an OMX_BUFFERHEADERTYPE structure allocated with UseBuffer @@ -563,23 +580,23 @@ typedef struct OMX_CALLBACKTYPE OMX_IN OMX_BUFFERHEADERTYPE* pBuffer); /** The FillBufferDone method is used to return filled buffers from an - output port back to the application for emptying and then reuse. - This is a blocking call so the application should not attempt to - empty the buffers during this call, but should queue the buffers - and empty them in another thread. There is no error return, so - the application shall handle any errors generated internally. The + output port back to the application for emptying and then reuse. + This is a blocking call so the application should not attempt to + empty the buffers during this call, but should queue the buffers + and empty them in another thread. There is no error return, so + the application shall handle any errors generated internally. The application shall also update the buffer header to indicate the - number of bytes placed into the buffer. + number of bytes placed into the buffer. The application should return from this call within 5 msec. - + @param hComponent handle of the component to access. This is the component handle returned by the call to the GetHandle function. @param pAppData - pointer to an application defined value that was provided in the + pointer to an application defined value that was provided in the pAppData parameter to the OMX_GetHandle method for the component. - This application defined value is provided so that the application + This application defined value is provided so that the application can have a component specific context when receiving the callback. @param pBuffer pointer to an OMX_BUFFERHEADERTYPE structure allocated with UseBuffer @@ -603,13 +620,13 @@ typedef enum OMX_BUFFERSUPPLIERTYPE or don't care */ OMX_BufferSupplyInput, /**< input port supplies the buffers */ OMX_BufferSupplyOutput, /**< output port supplies the buffers */ - OMX_BufferSupplyKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_BufferSupplyKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_BufferSupplyVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_BufferSupplyMax = 0x7FFFFFFF } OMX_BUFFERSUPPLIERTYPE; -/** buffer supplier parameter +/** buffer supplier parameter * @ingroup tun */ typedef struct OMX_PARAM_BUFFERSUPPLIERTYPE { @@ -620,61 +637,61 @@ typedef struct OMX_PARAM_BUFFERSUPPLIERTYPE { } OMX_PARAM_BUFFERSUPPLIERTYPE; -/**< indicates that buffers received by an input port of a tunnel - may not modify the data in the buffers +/**< indicates that buffers received by an input port of a tunnel + may not modify the data in the buffers @ingroup tun */ -#define OMX_PORTTUNNELFLAG_READONLY 0x00000001 +#define OMX_PORTTUNNELFLAG_READONLY 0x00000001 /** The OMX_TUNNELSETUPTYPE structure is used to pass data from an output port to an input port as part the two ComponentTunnelRequest calls - resulting from a OMX_SetupTunnel call from the IL Client. + resulting from a OMX_SetupTunnel call from the IL Client. @ingroup tun - */ + */ typedef struct OMX_TUNNELSETUPTYPE { OMX_U32 nTunnelFlags; /**< bit flags for tunneling */ OMX_BUFFERSUPPLIERTYPE eSupplier; /**< supplier preference */ -} OMX_TUNNELSETUPTYPE; +} OMX_TUNNELSETUPTYPE; /* OMX Component headers is included to enable the core to use - macros for functions into the component for OMX release 1.0. + macros for functions into the component for OMX release 1.0. Developers should not access any structures or data from within the component header directly */ /* TO BE REMOVED - #include <OMX_Component.h> */ -/** GetComponentVersion will return information about the component. +/** GetComponentVersion will return information about the component. This is a blocking call. This macro will go directly from the application to the component (via a core macro). The component will return from this call within 5 msec. @param [in] hComponent handle of component to execute the command @param [out] pComponentName - pointer to an empty string of length 128 bytes. The component - will write its name into this string. The name will be - terminated by a single zero byte. The name of a component will - be 127 bytes or less to leave room for the trailing zero byte. + pointer to an empty string of length 128 bytes. The component + will write its name into this string. The name will be + terminated by a single zero byte. The name of a component will + be 127 bytes or less to leave room for the trailing zero byte. An example of a valid component name is "OMX.ABC.ChannelMixer\0". @param [out] pComponentVersion - pointer to an OMX Version structure that the component will fill - in. The component will fill in a value that indicates the - component version. NOTE: the component version is NOT the same - as the OMX Specification version (found in all structures). The - component version is defined by the vendor of the component and + pointer to an OMX Version structure that the component will fill + in. The component will fill in a value that indicates the + component version. NOTE: the component version is NOT the same + as the OMX Specification version (found in all structures). The + component version is defined by the vendor of the component and its value is entirely up to the component vendor. @param [out] pSpecVersion - pointer to an OMX Version structure that the component will fill - in. The SpecVersion is the version of the specification that the - component was built against. Please note that this value may or - may not match the structure's version. For example, if the - component was built against the 2.0 specification, but the - application (which creates the structure is built against the + pointer to an OMX Version structure that the component will fill + in. The SpecVersion is the version of the specification that the + component was built against. Please note that this value may or + may not match the structure's version. For example, if the + component was built against the 2.0 specification, but the + application (which creates the structure is built against the 1.0 specification the versions would be different. @param [out] pComponentUUID - pointer to the UUID of the component which will be filled in by - the component. The UUID is a unique identifier that is set at - RUN time for the component and is unique to each instantion of + pointer to the UUID of the component which will be filled in by + the component. The UUID is a unique identifier that is set at + RUN time for the component and is unique to each instantion of the component. @return OMX_ERRORTYPE If the command successfully executes, the return code will be @@ -697,46 +714,46 @@ typedef struct OMX_TUNNELSETUPTYPE /** Send a command to the component. This call is a non-blocking call. The component should check the parameters and then queue the command - to the component thread to be executed. The component thread shall - send the EventHandler() callback at the conclusion of the command. + to the component thread to be executed. The component thread shall + send the EventHandler() callback at the conclusion of the command. This macro will go directly from the application to the component (via a core macro). The component will return from this call within 5 msec. - + When the command is "OMX_CommandStateSet" the component will queue a state transition to the new state idenfied in nParam. - + When the command is "OMX_CommandFlush", to flush a port's buffer queues, - the command will force the component to return all buffers NOT CURRENTLY - BEING PROCESSED to the application, in the order in which the buffers + the command will force the component to return all buffers NOT CURRENTLY + BEING PROCESSED to the application, in the order in which the buffers were received. - - When the command is "OMX_CommandPortDisable" or + + When the command is "OMX_CommandPortDisable" or "OMX_CommandPortEnable", the component's port (given by the value of - nParam) will be stopped or restarted. - + nParam) will be stopped or restarted. + When the command "OMX_CommandMarkBuffer" is used to mark a buffer, the pCmdData will point to a OMX_MARKTYPE structure containing the component handle of the component to examine the buffer chain for the mark. nParam1 contains the index of the port on which the buffer mark is applied. - Specification text for more details. - + Specification text for more details. + @param [in] hComponent handle of component to execute the command @param [in] Cmd Command for the component to execute @param [in] nParam - Parameter for the command to be executed. When Cmd has the value - OMX_CommandStateSet, value is a member of OMX_STATETYPE. When Cmd has - the value OMX_CommandFlush, value of nParam indicates which port(s) - to flush. -1 is used to flush all ports a single port index will + Parameter for the command to be executed. When Cmd has the value + OMX_CommandStateSet, value is a member of OMX_STATETYPE. When Cmd has + the value OMX_CommandFlush, value of nParam indicates which port(s) + to flush. -1 is used to flush all ports a single port index will only flush that port. When Cmd has the value "OMX_CommandPortDisable" - or "OMX_CommandPortEnable", the component's port is given by + or "OMX_CommandPortEnable", the component's port is given by the value of nParam. When Cmd has the value "OMX_CommandMarkBuffer" the components pot is given by the value of nParam. @param [in] pCmdData Parameter pointing to the OMX_MARKTYPE structure when Cmd has the value - "OMX_CommandMarkBuffer". + "OMX_CommandMarkBuffer". @return OMX_ERRORTYPE If the command successfully executes, the return code will be OMX_ErrorNone. Otherwise the appropriate OMX error will be returned. @@ -754,21 +771,21 @@ typedef struct OMX_TUNNELSETUPTYPE pCmdData) /* Macro End */ -/** The OMX_GetParameter macro will get one of the current parameter - settings from the component. This macro cannot only be invoked when +/** The OMX_GetParameter macro will get one of the current parameter + settings from the component. This macro cannot only be invoked when the component is in the OMX_StateInvalid state. The nParamIndex parameter is used to indicate which structure is being requested from - the component. The application shall allocate the correct structure - and shall fill in the structure size and version information before + the component. The application shall allocate the correct structure + and shall fill in the structure size and version information before invoking this macro. When the parameter applies to a port, the caller shall fill in the appropriate nPortIndex value indicating the - port on which the parameter applies. If the component has not had - any settings changed, then the component should return a set of - valid DEFAULT parameters for the component. This is a blocking - call. - + port on which the parameter applies. If the component has not had + any settings changed, then the component should return a set of + valid DEFAULT parameters for the component. This is a blocking + call. + The component should return from this call within 20 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @@ -776,7 +793,7 @@ typedef struct OMX_TUNNELSETUPTYPE Index of the structure to be filled. This value is from the OMX_INDEXTYPE enumeration. @param [in,out] pComponentParameterStructure - Pointer to application allocated structure to be filled by the + Pointer to application allocated structure to be filled by the component. @return OMX_ERRORTYPE If the command successfully executes, the return code will be @@ -797,17 +814,17 @@ typedef struct OMX_TUNNELSETUPTYPE structure to a component. Each structure shall be sent one at a time, in a separate invocation of the macro. This macro can only be invoked when the component is in the OMX_StateLoaded state, or the - port is disabled (when the parameter applies to a port). The + port is disabled (when the parameter applies to a port). The nParamIndex parameter is used to indicate which structure is being - passed to the component. The application shall allocate the - correct structure and shall fill in the structure size and version + passed to the component. The application shall allocate the + correct structure and shall fill in the structure size and version information (as well as the actual data) before invoking this macro. The application is free to dispose of this structure after the call - as the component is required to copy any data it shall retain. This - is a blocking call. - + as the component is required to copy any data it shall retain. This + is a blocking call. + The component should return from this call within 20 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @@ -832,18 +849,18 @@ typedef struct OMX_TUNNELSETUPTYPE pComponentParameterStructure) /* Macro End */ -/** The OMX_GetConfig macro will get one of the configuration structures - from a component. This macro can be invoked anytime after the - component has been loaded. The nParamIndex call parameter is used to - indicate which structure is being requested from the component. The - application shall allocate the correct structure and shall fill in the - structure size and version information before invoking this macro. - If the component has not had this configuration parameter sent before, - then the component should return a set of valid DEFAULT values for the - component. This is a blocking call. - +/** The OMX_GetConfig macro will get one of the configuration structures + from a component. This macro can be invoked anytime after the + component has been loaded. The nParamIndex call parameter is used to + indicate which structure is being requested from the component. The + application shall allocate the correct structure and shall fill in the + structure size and version information before invoking this macro. + If the component has not had this configuration parameter sent before, + then the component should return a set of valid DEFAULT values for the + component. This is a blocking call. + The component should return from this call within 5 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @@ -851,13 +868,13 @@ typedef struct OMX_TUNNELSETUPTYPE Index of the structure to be filled. This value is from the OMX_INDEXTYPE enumeration. @param [in,out] pComponentConfigStructure - pointer to application allocated structure to be filled by the + pointer to application allocated structure to be filled by the component. @return OMX_ERRORTYPE If the command successfully executes, the return code will be OMX_ErrorNone. Otherwise the appropriate OMX error will be returned. @ingroup comp -*/ +*/ #define OMX_GetConfig( \ hComponent, \ nConfigIndex, \ @@ -868,18 +885,18 @@ typedef struct OMX_TUNNELSETUPTYPE pComponentConfigStructure) /* Macro End */ -/** The OMX_SetConfig macro will send one of the configuration +/** The OMX_SetConfig macro will send one of the configuration structures to a component. Each structure shall be sent one at a time, - each in a separate invocation of the macro. This macro can be invoked - anytime after the component has been loaded. The application shall - allocate the correct structure and shall fill in the structure size - and version information (as well as the actual data) before invoking - this macro. The application is free to dispose of this structure after - the call as the component is required to copy any data it shall retain. - This is a blocking call. - + each in a separate invocation of the macro. This macro can be invoked + anytime after the component has been loaded. The application shall + allocate the correct structure and shall fill in the structure size + and version information (as well as the actual data) before invoking + this macro. The application is free to dispose of this structure after + the call as the component is required to copy any data it shall retain. + This is a blocking call. + The component should return from this call within 5 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @@ -904,22 +921,22 @@ typedef struct OMX_TUNNELSETUPTYPE pComponentConfigStructure) /* Macro End */ -/** The OMX_GetExtensionIndex macro will invoke a component to translate - a vendor specific configuration or parameter string into an OMX - structure index. There is no requirement for the vendor to support - this command for the indexes already found in the OMX_INDEXTYPE - enumeration (this is done to save space in small components). The +/** The OMX_GetExtensionIndex macro will invoke a component to translate + a vendor specific configuration or parameter string into an OMX + structure index. There is no requirement for the vendor to support + this command for the indexes already found in the OMX_INDEXTYPE + enumeration (this is done to save space in small components). The component shall support all vendor supplied extension indexes not found - in the master OMX_INDEXTYPE enumeration. This is a blocking call. - + in the master OMX_INDEXTYPE enumeration. This is a blocking call. + The component should return from this call within 5 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the GetHandle function. @param [in] cParameterName OMX_STRING that shall be less than 128 characters long including - the trailing null byte. This is the string that will get + the trailing null byte. This is the string that will get translated by the component into a configuration index. @param [out] pIndexType a pointer to a OMX_INDEXTYPE to receive the index value. @@ -938,18 +955,18 @@ typedef struct OMX_TUNNELSETUPTYPE pIndexType) /* Macro End */ -/** The OMX_GetState macro will invoke the component to get the current +/** The OMX_GetState macro will invoke the component to get the current state of the component and place the state value into the location - pointed to by pState. - + pointed to by pState. + The component should return from this call within 5 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @param [out] pState pointer to the location to receive the state. The value returned - is one of the OMX_STATETYPE members + is one of the OMX_STATETYPE members @return OMX_ERRORTYPE If the command successfully executes, the return code will be OMX_ErrorNone. Otherwise the appropriate OMX error will be returned. @@ -964,17 +981,17 @@ typedef struct OMX_TUNNELSETUPTYPE /** The OMX_UseBuffer macro will request that the component use - a buffer (and allocate its own buffer header) already allocated - by another component, or by the IL Client. This is a blocking + a buffer (and allocate its own buffer header) already allocated + by another component, or by the IL Client. This is a blocking call. - + The component should return from this call within 20 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @param [out] ppBuffer - pointer to an OMX_BUFFERHEADERTYPE structure used to receive the + pointer to an OMX_BUFFERHEADERTYPE structure used to receive the pointer to the buffer header @return OMX_ERRORTYPE If the command successfully executes, the return code will be @@ -998,25 +1015,25 @@ typedef struct OMX_TUNNELSETUPTYPE pBuffer) -/** The OMX_AllocateBuffer macro will request that the component allocate - a new buffer and buffer header. The component will allocate the - buffer and the buffer header and return a pointer to the buffer +/** The OMX_AllocateBuffer macro will request that the component allocate + a new buffer and buffer header. The component will allocate the + buffer and the buffer header and return a pointer to the buffer header. This is a blocking call. - + The component should return from this call within 5 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @param [out] ppBuffer - pointer to an OMX_BUFFERHEADERTYPE structure used to receive + pointer to an OMX_BUFFERHEADERTYPE structure used to receive the pointer to the buffer header @param [in] nPortIndex nPortIndex is used to select the port on the component the buffer will be used with. The port can be found by using the nPortIndex value as an index into the Port Definition array of the component. @param [in] pAppPrivate - pAppPrivate is used to initialize the pAppPrivate member of the + pAppPrivate is used to initialize the pAppPrivate member of the buffer header structure. @param [in] nSizeBytes size of the buffer to allocate. Used when bAllocateNew is true. @@ -1024,7 +1041,7 @@ typedef struct OMX_TUNNELSETUPTYPE If the command successfully executes, the return code will be OMX_ErrorNone. Otherwise the appropriate OMX error will be returned. @ingroup comp buf - */ + */ #define OMX_AllocateBuffer( \ hComponent, \ ppBuffer, \ @@ -1040,13 +1057,13 @@ typedef struct OMX_TUNNELSETUPTYPE /** The OMX_FreeBuffer macro will release a buffer header from the component - which was allocated using either OMX_AllocateBuffer or OMX_UseBuffer. If - the component allocated the buffer (see the OMX_UseBuffer macro) then - the component shall free the buffer and buffer header. This is a - blocking call. - + which was allocated using either OMX_AllocateBuffer or OMX_UseBuffer. If + the component allocated the buffer (see the OMX_UseBuffer macro) then + the component shall free the buffer and buffer header. This is a + blocking call. + The component should return from this call within 20 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @@ -1071,17 +1088,17 @@ typedef struct OMX_TUNNELSETUPTYPE pBuffer) /* Macro End */ -/** The OMX_EmptyThisBuffer macro will send a buffer full of data to an +/** The OMX_EmptyThisBuffer macro will send a buffer full of data to an input port of a component. The buffer will be emptied by the component and returned to the application via the EmptyBufferDone call back. This is a non-blocking call in that the component will record the buffer - and return immediately and then empty the buffer, later, at the proper - time. As expected, this macro may be invoked only while the component + and return immediately and then empty the buffer, later, at the proper + time. As expected, this macro may be invoked only while the component is in the OMX_StateExecuting. If nPortIndex does not specify an input - port, the component shall return an error. - + port, the component shall return an error. + The component should return from this call within 5 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @@ -1101,17 +1118,17 @@ typedef struct OMX_TUNNELSETUPTYPE pBuffer) /* Macro End */ -/** The OMX_FillThisBuffer macro will send an empty buffer to an +/** The OMX_FillThisBuffer macro will send an empty buffer to an output port of a component. The buffer will be filled by the component and returned to the application via the FillBufferDone call back. This is a non-blocking call in that the component will record the buffer - and return immediately and then fill the buffer, later, at the proper - time. As expected, this macro may be invoked only while the component + and return immediately and then fill the buffer, later, at the proper + time. As expected, this macro may be invoked only while the component is in the OMX_ExecutingState. If nPortIndex does not specify an output - port, the component shall return an error. - + port, the component shall return an error. + The component should return from this call within 5 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @@ -1135,14 +1152,14 @@ typedef struct OMX_TUNNELSETUPTYPE /** The OMX_UseEGLImage macro will request that the component use a EGLImage provided by EGL (and allocate its own buffer header) This is a blocking call. - + The component should return from this call within 20 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @param [out] ppBuffer - pointer to an OMX_BUFFERHEADERTYPE structure used to receive the + pointer to an OMX_BUFFERHEADERTYPE structure used to receive the pointer to the buffer header. Note that the memory location used for this buffer is NOT visible to the IL Client. @param [in] nPortIndex @@ -1150,13 +1167,13 @@ typedef struct OMX_TUNNELSETUPTYPE be used with. The port can be found by using the nPortIndex value as an index into the Port Definition array of the component. @param [in] pAppPrivate - pAppPrivate is used to initialize the pAppPrivate member of the + pAppPrivate is used to initialize the pAppPrivate member of the buffer header structure. @param [in] eglImage eglImage contains the handle of the EGLImage to use as a buffer on the - specified port. The component is expected to validate properties of + specified port. The component is expected to validate properties of the EGLImage against the configuration of the port to ensure the component - can use the EGLImage as a buffer. + can use the EGLImage as a buffer. @return OMX_ERRORTYPE If the command successfully executes, the return code will be OMX_ErrorNone. Otherwise the appropriate OMX error will be returned. @@ -1177,8 +1194,8 @@ typedef struct OMX_TUNNELSETUPTYPE /** The OMX_Init method is used to initialize the OMX core. It shall be the first call made into OMX and it should only be executed one time without - an interviening OMX_Deinit call. - + an interviening OMX_Deinit call. + The core should return from this call within 20 msec. @return OMX_ERRORTYPE @@ -1189,13 +1206,13 @@ typedef struct OMX_TUNNELSETUPTYPE OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_Init(void); -/** The OMX_Deinit method is used to deinitialize the OMX core. It shall be - the last call made into OMX. In the event that the core determines that - thare are components loaded when this call is made, the core may return +/** The OMX_Deinit method is used to deinitialize the OMX core. It shall be + the last call made into OMX. In the event that the core determines that + thare are components loaded when this call is made, the core may return with an error rather than try to unload the components. - + The core should return from this call within 20 msec. - + @return OMX_ERRORTYPE If the command successfully executes, the return code will be OMX_ErrorNone. Otherwise the appropriate OMX error will be returned. @@ -1212,23 +1229,23 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_Deinit(void); installation of new components, it is only requried to detect newly installed components when the first call to enumerate component names is made (i.e. when nIndex is 0x0). - + The core should return from this call in 20 msec. - + @param [out] cComponentName pointer to a null terminated string with the component name. The names of the components are strings less than 127 bytes in length - plus the trailing null for a maximum size of 128 bytes. An example - of a valid component name is "OMX.TI.AUDIO.DSP.MIXER\0". Names are - assigned by the vendor, but shall start with "OMX." and then have + plus the trailing null for a maximum size of 128 bytes. An example + of a valid component name is "OMX.TI.AUDIO.DSP.MIXER\0". Names are + assigned by the vendor, but shall start with "OMX." and then have the Vendor designation next. @param [in] nNameLength - number of characters in the cComponentName string. With all - component name strings restricted to less than 128 characters + number of characters in the cComponentName string. With all + component name strings restricted to less than 128 characters (including the trailing null) it is recomended that the caller provide a input string for the cComponentName of 128 characters. @param [in] nIndex - number containing the enumeration index for the component. + number containing the enumeration index for the component. Multiple calls to OMX_ComponentNameEnum with increasing values of nIndex will enumerate through the component names in the system until OMX_ErrorNoMore is returned. The value of nIndex @@ -1236,7 +1253,7 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_Deinit(void); in the system. @return OMX_ERRORTYPE If the command successfully executes, the return code will be - OMX_ErrorNone. When the value of nIndex exceeds the number of + OMX_ErrorNone. When the value of nIndex exceeds the number of components in the system minus 1, OMX_ErrorNoMore will be returned. Otherwise the appropriate OMX error will be returned. @ingroup core @@ -1249,18 +1266,18 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_ComponentNameEnum( /** The OMX_GetHandle method will locate the component specified by the component name given, load that component into memory and then invoke - the component's methods to create an instance of the component. - + the component's methods to create an instance of the component. + The core should return from this call within 20 msec. - + @param [out] pHandle pointer to an OMX_HANDLETYPE pointer to be filled in by this method. @param [in] cComponentName pointer to a null terminated string with the component name. The names of the components are strings less than 127 bytes in length - plus the trailing null for a maximum size of 128 bytes. An example - of a valid component name is "OMX.TI.AUDIO.DSP.MIXER\0". Names are - assigned by the vendor, but shall start with "OMX." and then have + plus the trailing null for a maximum size of 128 bytes. An example + of a valid component name is "OMX.TI.AUDIO.DSP.MIXER\0". Names are + assigned by the vendor, but shall start with "OMX." and then have the Vendor designation next. @param [in] pAppData pointer to an application defined value that will be returned @@ -1268,24 +1285,24 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_ComponentNameEnum( of the callback. @param [in] pCallBacks pointer to a OMX_CALLBACKTYPE structure that will be passed to the - component to initialize it with. + component to initialize it with. @return OMX_ERRORTYPE If the command successfully executes, the return code will be OMX_ErrorNone. Otherwise the appropriate OMX error will be returned. @ingroup core */ OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_GetHandle( - OMX_OUT OMX_HANDLETYPE* pHandle, + OMX_OUT OMX_HANDLETYPE* pHandle, OMX_IN OMX_STRING cComponentName, OMX_IN OMX_PTR pAppData, OMX_IN OMX_CALLBACKTYPE* pCallBacks); -/** The OMX_FreeHandle method will free a handle allocated by the OMX_GetHandle +/** The OMX_FreeHandle method will free a handle allocated by the OMX_GetHandle method. If the component reference count goes to zero, the component will - be unloaded from memory. - - The core should return from this call within 20 msec when the component is + be unloaded from memory. + + The core should return from this call within 20 msec when the component is in the OMX_StateLoaded state. @param [in] hComponent @@ -1304,34 +1321,34 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_FreeHandle( /** The OMX_SetupTunnel method will handle the necessary calls to the components to setup the specified tunnel the two components. NOTE: This is an actual method (not a #define macro). This method will make calls into - the component ComponentTunnelRequest method to do the actual tunnel - connection. + the component ComponentTunnelRequest method to do the actual tunnel + connection. - The ComponentTunnelRequest method on both components will be called. - This method shall not be called unless the component is in the + The ComponentTunnelRequest method on both components will be called. + This method shall not be called unless the component is in the OMX_StateLoaded state except when the ports used for the tunnel are disabled. In this case, the component may be in the OMX_StateExecuting, - OMX_StatePause, or OMX_StateIdle states. + OMX_StatePause, or OMX_StateIdle states. The core should return from this call within 20 msec. - + @param [in] hOutput Handle of the component to be accessed. Also this is the handle of the component whose port, specified in the nPortOutput parameter will be used the source for the tunnel. This is the component handle - returned by the call to the OMX_GetHandle function. There is a + returned by the call to the OMX_GetHandle function. There is a requirement that hOutput be the source for the data when tunelling (i.e. nPortOutput is an output port). If 0x0, the component specified in hInput will have it's port specified in nPortInput setup for communication with the application / IL client. @param [in] nPortOutput nPortOutput is used to select the source port on component to be - used in the tunnel. + used in the tunnel. @param [in] hInput This is the component to setup the tunnel with. This is the handle of the component whose port, specified in the nPortInput parameter will be used the destination for the tunnel. This is the component handle - returned by the call to the OMX_GetHandle function. There is a + returned by the call to the OMX_GetHandle function. There is a requirement that hInput be the destination for the data when tunelling (i.e. nPortInut is an input port). If 0x0, the component specified in hOutput will have it's port specified in nPortPOutput @@ -1342,9 +1359,9 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_FreeHandle( @return OMX_ERRORTYPE If the command successfully executes, the return code will be OMX_ErrorNone. Otherwise the appropriate OMX error will be returned. - When OMX_ErrorNotImplemented is returned, one or both components is + When OMX_ErrorNotImplemented is returned, one or both components is a non-interop component and does not support tunneling. - + On failure, the ports of both components are setup for communication with the application / IL Client. @ingroup core tun @@ -1354,50 +1371,50 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_SetupTunnel( OMX_IN OMX_U32 nPortOutput, OMX_IN OMX_HANDLETYPE hInput, OMX_IN OMX_U32 nPortInput); - + /** @ingroup cp */ OMX_API OMX_ERRORTYPE OMX_GetContentPipe( OMX_OUT OMX_HANDLETYPE *hPipe, OMX_IN OMX_STRING szURI); /** The OMX_GetComponentsOfRole method will return the number of components that support the given - role and (if the compNames field is non-NULL) the names of those components. The call will fail if + role and (if the compNames field is non-NULL) the names of those components. The call will fail if an insufficiently sized array of names is supplied. To ensure the array is sufficiently sized the client should: * first call this function with the compNames field NULL to determine the number of component names - * second call this function with the compNames field pointing to an array of names allocated + * second call this function with the compNames field pointing to an array of names allocated according to the number returned by the first call. The core should return from this call within 5 msec. - + @param [in] role - This is generic standard component name consisting only of component class + This is generic standard component name consisting only of component class name and the type within that class (e.g. 'audio_decoder.aac'). @param [inout] pNumComps - This is used both as input and output. - + This is used both as input and output. + If compNames is NULL, the input is ignored and the output specifies how many components support the given role. - - If compNames is not NULL, on input it bounds the size of the input structure and + + If compNames is not NULL, on input it bounds the size of the input structure and on output, it specifies the number of components string names listed within the compNames parameter. @param [inout] compNames - If NULL this field is ignored. If non-NULL this points to an array of 128-byte strings which accepts - a list of the names of all physical components that implement the specified standard component name. + If NULL this field is ignored. If non-NULL this points to an array of 128-byte strings which accepts + a list of the names of all physical components that implement the specified standard component name. Each name is NULL terminated. numComps indicates the number of names. @ingroup core */ -OMX_API OMX_ERRORTYPE OMX_GetComponentsOfRole ( +OMX_API OMX_ERRORTYPE OMX_GetComponentsOfRole ( OMX_IN OMX_STRING role, OMX_INOUT OMX_U32 *pNumComps, OMX_INOUT OMX_U8 **compNames); /** The OMX_GetRolesOfComponent method will return the number of roles supported by the given - component and (if the roles field is non-NULL) the names of those roles. The call will fail if + component and (if the roles field is non-NULL) the names of those roles. The call will fail if an insufficiently sized array of names is supplied. To ensure the array is sufficiently sized the client should: * first call this function with the roles field NULL to determine the number of role names - * second call this function with the roles field pointing to an array of names allocated + * second call this function with the roles field pointing to an array of names allocated according to the number returned by the first call. The core should return from this call within 5 msec. @@ -1405,20 +1422,20 @@ OMX_API OMX_ERRORTYPE OMX_GetComponentsOfRole ( @param [in] compName This is the name of the component being queried about. @param [inout] pNumRoles - This is used both as input and output. - + This is used both as input and output. + If roles is NULL, the input is ignored and the output specifies how many roles the component supports. - - If compNames is not NULL, on input it bounds the size of the input structure and + + If compNames is not NULL, on input it bounds the size of the input structure and on output, it specifies the number of roles string names listed within the roles parameter. @param [out] roles - If NULL this field is ignored. If non-NULL this points to an array of 128-byte strings - which accepts a list of the names of all standard components roles implemented on the + If NULL this field is ignored. If non-NULL this points to an array of 128-byte strings + which accepts a list of the names of all standard components roles implemented on the specified component name. numComps indicates the number of names. @ingroup core */ -OMX_API OMX_ERRORTYPE OMX_GetRolesOfComponent ( - OMX_IN OMX_STRING compName, +OMX_API OMX_ERRORTYPE OMX_GetRolesOfComponent ( + OMX_IN OMX_STRING compName, OMX_INOUT OMX_U32 *pNumRoles, OMX_OUT OMX_U8 **roles); diff --git a/domx/omx_core/inc/OMX_IVCommon.h b/domx/omx_core/inc/OMX_IVCommon.h index 4c4995c..ca21e87 100755 --- a/domx/omx_core/inc/OMX_IVCommon.h +++ b/domx/omx_core/inc/OMX_IVCommon.h @@ -1,27 +1,44 @@ +/* ------------------------------------------------------------------ + * Copyright (C) 1998-2009 PacketVideo + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. + * See the License for the specific language governing permissions + * and limitations under the License. + * ------------------------------------------------------------------- + */ /** - * Copyright (c) 2008 The Khronos Group Inc. - * + * Copyright (c) 2008 The Khronos Group Inc. + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: + * to the following conditions: * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * + * in all copies or substantial portions of the Software. + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -/** +/** * @file OMX_IVCommon.h - OpenMax IL version 1.1.2 * The structures needed by Video and Image components to exchange * parameters and configuration data with the components. @@ -36,7 +53,7 @@ extern "C" { /** * Each OMX header must include all required header files to allow the header * to compile without errors. The includes below are required for this header - * file to compile successfully + * file to compile successfully */ #include <OMX_Core.h> @@ -47,8 +64,8 @@ extern "C" { */ -/** - * Enumeration defining possible uncompressed image/video formats. +/** + * Enumeration defining possible uncompressed image/video formats. * * ENUMS: * Unused : Placeholder value when format is N/A @@ -96,7 +113,7 @@ typedef enum OMX_COLOR_FORMATTYPE { OMX_COLOR_Format16bitBGR565, OMX_COLOR_Format18bitRGB666, OMX_COLOR_Format18bitARGB1665, - OMX_COLOR_Format19bitARGB1666, + OMX_COLOR_Format19bitARGB1666, OMX_COLOR_Format24bitRGB888, OMX_COLOR_Format24bitBGR888, OMX_COLOR_Format24bitARGB1887, @@ -119,53 +136,62 @@ typedef enum OMX_COLOR_FORMATTYPE { OMX_COLOR_FormatRawBayer8bit, OMX_COLOR_FormatRawBayer10bit, OMX_COLOR_FormatRawBayer8bitcompressed, - OMX_COLOR_FormatL2, - OMX_COLOR_FormatL4, - OMX_COLOR_FormatL8, - OMX_COLOR_FormatL16, - OMX_COLOR_FormatL24, + OMX_COLOR_FormatL2, + OMX_COLOR_FormatL4, + OMX_COLOR_FormatL8, + OMX_COLOR_FormatL16, + OMX_COLOR_FormatL24, OMX_COLOR_FormatL32, OMX_COLOR_FormatYUV420PackedSemiPlanar, OMX_COLOR_FormatYUV422PackedSemiPlanar, OMX_COLOR_Format18BitBGR666, OMX_COLOR_Format24BitARGB6666, OMX_COLOR_Format24BitABGR6666, - OMX_COLOR_FormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_COLOR_FormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_COLOR_FormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ + /**<Reserved android opaque colorformat. Tells the encoder that + * the actual colorformat will be relayed by the + * Gralloc Buffers. + * FIXME: In the process of reserving some enum values for + * Android-specific OMX IL colorformats. Change this enum to + * an acceptable range once that is done. + * */ + OMX_COLOR_FormatAndroidOpaque = 0x7F000789, + OMX_QCOM_COLOR_FormatYVU420SemiPlanar = 0x7FA30C00, OMX_COLOR_FormatMax = 0x7FFFFFFF } OMX_COLOR_FORMATTYPE; -/** +/** * Defines the matrix for conversion from RGB to YUV or vice versa. - * iColorMatrix should be initialized with the fixed point values + * iColorMatrix should be initialized with the fixed point values * used in converting between formats. */ typedef struct OMX_CONFIG_COLORCONVERSIONTYPE { OMX_U32 nSize; /**< Size of the structure in bytes */ - OMX_VERSIONTYPE nVersion; /**< OMX specification version info */ + OMX_VERSIONTYPE nVersion; /**< OMX specification version info */ OMX_U32 nPortIndex; /**< Port that this struct applies to */ OMX_S32 xColorMatrix[3][3]; /**< Stored in signed Q16 format */ OMX_S32 xColorOffset[4]; /**< Stored in signed Q16 format */ }OMX_CONFIG_COLORCONVERSIONTYPE; -/** - * Structure defining percent to scale each frame dimension. For example: +/** + * Structure defining percent to scale each frame dimension. For example: * To make the width 50% larger, use fWidth = 1.5 and to make the width * 1/2 the original size, use fWidth = 0.5 */ typedef struct OMX_CONFIG_SCALEFACTORTYPE { OMX_U32 nSize; /**< Size of the structure in bytes */ - OMX_VERSIONTYPE nVersion; /**< OMX specification version info */ + OMX_VERSIONTYPE nVersion; /**< OMX specification version info */ OMX_U32 nPortIndex; /**< Port that this struct applies to */ OMX_S32 xWidth; /**< Fixed point value stored as Q16 */ OMX_S32 xHeight; /**< Fixed point value stored as Q16 */ }OMX_CONFIG_SCALEFACTORTYPE; -/** - * Enumeration of possible image filter types +/** + * Enumeration of possible image filter types */ typedef enum OMX_IMAGEFILTERTYPE { OMX_ImageFilterNone, @@ -176,23 +202,23 @@ typedef enum OMX_IMAGEFILTERTYPE { OMX_ImageFilterOilPaint, OMX_ImageFilterHatch, OMX_ImageFilterGpen, - OMX_ImageFilterAntialias, - OMX_ImageFilterDeRing, + OMX_ImageFilterAntialias, + OMX_ImageFilterDeRing, OMX_ImageFilterSolarize, - OMX_ImageFilterKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_ImageFilterKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_ImageFilterVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_ImageFilterMax = 0x7FFFFFFF } OMX_IMAGEFILTERTYPE; -/** - * Image filter configuration +/** + * Image filter configuration * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes + * nSize : Size of the structure in bytes * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * eImageFilter : Image filter type enumeration + * nPortIndex : Port that this structure applies to + * eImageFilter : Image filter type enumeration */ typedef struct OMX_CONFIG_IMAGEFILTERTYPE { OMX_U32 nSize; @@ -202,22 +228,22 @@ typedef struct OMX_CONFIG_IMAGEFILTERTYPE { } OMX_CONFIG_IMAGEFILTERTYPE; -/** - * Customized U and V for color enhancement +/** + * Customized U and V for color enhancement * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * bColorEnhancement : Enable/disable color enhancement - * nCustomizedU : Practical values: 16-240, range: 0-255, value set for + * nCustomizedU : Practical values: 16-240, range: 0-255, value set for * U component - * nCustomizedV : Practical values: 16-240, range: 0-255, value set for + * nCustomizedV : Practical values: 16-240, range: 0-255, value set for * V component */ typedef struct OMX_CONFIG_COLORENHANCEMENTTYPE { OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; + OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_BOOL bColorEnhancement; OMX_U8 nCustomizedU; @@ -225,12 +251,12 @@ typedef struct OMX_CONFIG_COLORENHANCEMENTTYPE { } OMX_CONFIG_COLORENHANCEMENTTYPE; -/** - * Define color key and color key mask +/** + * Define color key and color key mask * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * nARGBColor : 32bit Alpha, Red, Green, Blue Color * nARGBMask : 32bit Mask for Alpha, Red, Green, Blue channels @@ -244,12 +270,12 @@ typedef struct OMX_CONFIG_COLORKEYTYPE { } OMX_CONFIG_COLORKEYTYPE; -/** - * List of color blend types for pre/post processing +/** + * List of color blend types for pre/post processing * * ENUMS: * None : No color blending present - * AlphaConstant : Function is (alpha_constant * src) + + * AlphaConstant : Function is (alpha_constant * src) + * (1 - alpha_constant) * dst) * AlphaPerPixel : Function is (alpha * src) + (1 - alpha) * dst) * Alternate : Function is alternating pixels from src and dst @@ -265,21 +291,21 @@ typedef enum OMX_COLORBLENDTYPE { OMX_ColorBlendAnd, OMX_ColorBlendOr, OMX_ColorBlendInvert, - OMX_ColorBlendKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_ColorBlendKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_ColorBlendVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_ColorBlendMax = 0x7FFFFFFF } OMX_COLORBLENDTYPE; -/** - * Color blend configuration +/** + * Color blend configuration * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to * nRGBAlphaConstant : Constant global alpha values when global alpha is used - * eColorBlend : Color blend type enumeration + * eColorBlend : Color blend type enumeration */ typedef struct OMX_CONFIG_COLORBLENDTYPE { OMX_U32 nSize; @@ -290,15 +316,15 @@ typedef struct OMX_CONFIG_COLORBLENDTYPE { } OMX_CONFIG_COLORBLENDTYPE; -/** +/** * Hold frame dimension * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes + * nSize : Size of the structure in bytes * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nWidth : Frame width in pixels - * nHeight : Frame height in pixels + * nPortIndex : Port that this structure applies to + * nWidth : Frame width in pixels + * nHeight : Frame height in pixels */ typedef struct OMX_FRAMESIZETYPE { OMX_U32 nSize; @@ -310,69 +336,69 @@ typedef struct OMX_FRAMESIZETYPE { /** - * Rotation configuration + * Rotation configuration * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes + * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to - * nRotation : +/- integer rotation value + * nRotation : +/- integer rotation value */ typedef struct OMX_CONFIG_ROTATIONTYPE { OMX_U32 nSize; OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; - OMX_S32 nRotation; + OMX_S32 nRotation; } OMX_CONFIG_ROTATIONTYPE; -/** - * Possible mirroring directions for pre/post processing +/** + * Possible mirroring directions for pre/post processing * * ENUMS: - * None : No mirroring - * Vertical : Vertical mirroring, flip on X axis - * Horizontal : Horizontal mirroring, flip on Y axis + * None : No mirroring + * Vertical : Vertical mirroring, flip on X axis + * Horizontal : Horizontal mirroring, flip on Y axis * Both : Both vertical and horizontal mirroring */ typedef enum OMX_MIRRORTYPE { OMX_MirrorNone = 0, OMX_MirrorVertical, OMX_MirrorHorizontal, - OMX_MirrorBoth, - OMX_MirrorKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_MirrorBoth, + OMX_MirrorKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_MirrorVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_MirrorMax = 0x7FFFFFFF + OMX_MirrorMax = 0x7FFFFFFF } OMX_MIRRORTYPE; -/** - * Mirroring configuration +/** + * Mirroring configuration * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes + * nSize : Size of the structure in bytes * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * eMirror : Mirror type enumeration + * nPortIndex : Port that this structure applies to + * eMirror : Mirror type enumeration */ typedef struct OMX_CONFIG_MIRRORTYPE { OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; + OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_MIRRORTYPE eMirror; } OMX_CONFIG_MIRRORTYPE; -/** - * Position information only +/** + * Position information only * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes + * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to - * nX : X coordinate for the point - * nY : Y coordinate for the point - */ + * nX : X coordinate for the point + * nY : Y coordinate for the point + */ typedef struct OMX_CONFIG_POINTTYPE { OMX_U32 nSize; OMX_VERSIONTYPE nVersion; @@ -382,37 +408,37 @@ typedef struct OMX_CONFIG_POINTTYPE { } OMX_CONFIG_POINTTYPE; -/** - * Frame size plus position +/** + * Frame size plus position * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to * nLeft : X Coordinate of the top left corner of the rectangle * nTop : Y Coordinate of the top left corner of the rectangle - * nWidth : Width of the rectangle - * nHeight : Height of the rectangle + * nWidth : Width of the rectangle + * nHeight : Height of the rectangle */ typedef struct OMX_CONFIG_RECTTYPE { OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_S32 nLeft; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_S32 nLeft; OMX_S32 nTop; OMX_U32 nWidth; OMX_U32 nHeight; } OMX_CONFIG_RECTTYPE; -/** - * Deblocking state; it is required to be set up before starting the codec +/** + * Deblocking state; it is required to be set up before starting the codec * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to - * bDeblocking : Enable/disable deblocking mode + * bDeblocking : Enable/disable deblocking mode */ typedef struct OMX_PARAM_DEBLOCKINGTYPE { OMX_U32 nSize; @@ -422,13 +448,13 @@ typedef struct OMX_PARAM_DEBLOCKINGTYPE { } OMX_PARAM_DEBLOCKINGTYPE; -/** - * Stabilization state +/** + * Stabilization state * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to * bStab : Enable/disable frame stabilization state */ typedef struct OMX_CONFIG_FRAMESTABTYPE { @@ -439,8 +465,8 @@ typedef struct OMX_CONFIG_FRAMESTABTYPE { } OMX_CONFIG_FRAMESTABTYPE; -/** - * White Balance control type +/** + * White Balance control type * * STRUCT MEMBERS: * SunLight : Referenced in JSR-234 @@ -457,20 +483,20 @@ typedef enum OMX_WHITEBALCONTROLTYPE { OMX_WhiteBalControlIncandescent, OMX_WhiteBalControlFlash, OMX_WhiteBalControlHorizon, - OMX_WhiteBalControlKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_WhiteBalControlKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_WhiteBalControlVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_WhiteBalControlMax = 0x7FFFFFFF } OMX_WHITEBALCONTROLTYPE; -/** - * White Balance control configuration +/** + * White Balance control configuration * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes + * nSize : Size of the structure in bytes * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * eWhiteBalControl : White balance enumeration + * nPortIndex : Port that this structure applies to + * eWhiteBalControl : White balance enumeration */ typedef struct OMX_CONFIG_WHITEBALCONTROLTYPE { OMX_U32 nSize; @@ -480,8 +506,8 @@ typedef struct OMX_CONFIG_WHITEBALCONTROLTYPE { } OMX_CONFIG_WHITEBALCONTROLTYPE; -/** - * Exposure control type +/** + * Exposure control type */ typedef enum OMX_EXPOSURECONTROLTYPE { OMX_ExposureControlOff = 0, @@ -494,20 +520,20 @@ typedef enum OMX_EXPOSURECONTROLTYPE { OMX_ExposureControlBeach, OMX_ExposureControlLargeAperture, OMX_ExposureControlSmallApperture, - OMX_ExposureControlKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_ExposureControlKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_ExposureControlVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_ExposureControlMax = 0x7FFFFFFF } OMX_EXPOSURECONTROLTYPE; -/** - * White Balance control configuration +/** + * White Balance control configuration * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes + * nSize : Size of the structure in bytes * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * eExposureControl : Exposure control enumeration + * nPortIndex : Port that this structure applies to + * eExposureControl : Exposure control enumeration */ typedef struct OMX_CONFIG_EXPOSURECONTROLTYPE { OMX_U32 nSize; @@ -517,16 +543,16 @@ typedef struct OMX_CONFIG_EXPOSURECONTROLTYPE { } OMX_CONFIG_EXPOSURECONTROLTYPE; -/** - * Defines sensor supported mode. +/** + * Defines sensor supported mode. * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes + * nSize : Size of the structure in bytes * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nFrameRate : Single shot mode is indicated by a 0 + * nPortIndex : Port that this structure applies to + * nFrameRate : Single shot mode is indicated by a 0 * bOneShot : Enable for single shot, disable for streaming - * sFrameSize : Framesize + * sFrameSize : Framesize */ typedef struct OMX_PARAM_SENSORMODETYPE { OMX_U32 nSize; @@ -538,13 +564,13 @@ typedef struct OMX_PARAM_SENSORMODETYPE { } OMX_PARAM_SENSORMODETYPE; -/** - * Defines contrast level +/** + * Defines contrast level * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to * nContrast : Values allowed for contrast -100 to 100, zero means no change */ typedef struct OMX_CONFIG_CONTRASTTYPE { @@ -555,14 +581,14 @@ typedef struct OMX_CONFIG_CONTRASTTYPE { } OMX_CONFIG_CONTRASTTYPE; -/** - * Defines brightness level +/** + * Defines brightness level * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nBrightness : 0-100% + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to + * nBrightness : 0-100% */ typedef struct OMX_CONFIG_BRIGHTNESSTYPE { OMX_U32 nSize; @@ -572,16 +598,16 @@ typedef struct OMX_CONFIG_BRIGHTNESSTYPE { } OMX_CONFIG_BRIGHTNESSTYPE; -/** - * Defines backlight level configuration for a video sink, e.g. LCD panel +/** + * Defines backlight level configuration for a video sink, e.g. LCD panel * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * nBacklight : Values allowed for backlight 0-100% - * nTimeout : Number of milliseconds before backlight automatically turns - * off. A value of 0x0 disables backight timeout + * nTimeout : Number of milliseconds before backlight automatically turns + * off. A value of 0x0 disables backight timeout */ typedef struct OMX_CONFIG_BACKLIGHTTYPE { OMX_U32 nSize; @@ -592,12 +618,12 @@ typedef struct OMX_CONFIG_BACKLIGHTTYPE { } OMX_CONFIG_BACKLIGHTTYPE; -/** - * Defines setting for Gamma +/** + * Defines setting for Gamma * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * nGamma : Values allowed for gamma -100 to 100, zero means no change */ @@ -609,14 +635,14 @@ typedef struct OMX_CONFIG_GAMMATYPE { } OMX_CONFIG_GAMMATYPE; -/** - * Define for setting saturation - * +/** + * Define for setting saturation + * * STRUCT MEMBERS: * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to - * nSaturation : Values allowed for saturation -100 to 100, zero means + * nSaturation : Values allowed for saturation -100 to 100, zero means * no change */ typedef struct OMX_CONFIG_SATURATIONTYPE { @@ -627,14 +653,14 @@ typedef struct OMX_CONFIG_SATURATIONTYPE { } OMX_CONFIG_SATURATIONTYPE; -/** - * Define for setting Lightness +/** + * Define for setting Lightness * * STRUCT MEMBERS: * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to - * nLightness : Values allowed for lightness -100 to 100, zero means no + * nLightness : Values allowed for lightness -100 to 100, zero means no * change */ typedef struct OMX_CONFIG_LIGHTNESSTYPE { @@ -645,17 +671,17 @@ typedef struct OMX_CONFIG_LIGHTNESSTYPE { } OMX_CONFIG_LIGHTNESSTYPE; -/** - * Plane blend configuration +/** + * Plane blend configuration * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes + * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Index of input port associated with the plane. - * nDepth : Depth of the plane in relation to the screen. Higher - * numbered depths are "behind" lower number depths. + * nDepth : Depth of the plane in relation to the screen. Higher + * numbered depths are "behind" lower number depths. * This number defaults to the Port Index number. - * nAlpha : Transparency blending component for the entire plane. + * nAlpha : Transparency blending component for the entire plane. * See blending modes for more detail. */ typedef struct OMX_CONFIG_PLANEBLENDTYPE { @@ -667,17 +693,17 @@ typedef struct OMX_CONFIG_PLANEBLENDTYPE { } OMX_CONFIG_PLANEBLENDTYPE; -/** +/** * Define interlace type * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to - * bEnable : Enable control variable for this functionality + * bEnable : Enable control variable for this functionality * (see below) - * nInterleavePortIndex : Index of input or output port associated with - * the interleaved plane. + * nInterleavePortIndex : Index of input or output port associated with + * the interleaved plane. * pPlanarPortIndexes[4] : Index of input or output planar ports. */ typedef struct OMX_PARAM_INTERLEAVETYPE { @@ -689,8 +715,8 @@ typedef struct OMX_PARAM_INTERLEAVETYPE { } OMX_PARAM_INTERLEAVETYPE; -/** - * Defines the picture effect used for an input picture +/** + * Defines the picture effect used for an input picture */ typedef enum OMX_TRANSITIONEFFECTTYPE { OMX_EffectNone, @@ -700,18 +726,18 @@ typedef enum OMX_TRANSITIONEFFECTTYPE { OMX_EffectDissolve, OMX_EffectWipe, OMX_EffectUnspecifiedMixOfTwoScenes, - OMX_EffectKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_EffectKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_EffectVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_EffectMax = 0x7FFFFFFF } OMX_TRANSITIONEFFECTTYPE; -/** - * Structure used to configure current transition effect +/** + * Structure used to configure current transition effect * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * eEffect : Effect to enable */ @@ -723,43 +749,43 @@ typedef struct OMX_CONFIG_TRANSITIONEFFECTTYPE { } OMX_CONFIG_TRANSITIONEFFECTTYPE; -/** - * Defines possible data unit types for encoded video data. The data unit +/** + * Defines possible data unit types for encoded video data. The data unit * types are used both for encoded video input for playback as well as - * encoded video output from recording. + * encoded video output from recording. */ typedef enum OMX_DATAUNITTYPE { OMX_DataUnitCodedPicture, OMX_DataUnitVideoSegment, OMX_DataUnitSeveralSegments, OMX_DataUnitArbitraryStreamSection, - OMX_DataUnitKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_DataUnitKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_DataUnitVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_DataUnitMax = 0x7FFFFFFF } OMX_DATAUNITTYPE; -/** - * Defines possible encapsulation types for coded video data unit. The - * encapsulation information is used both for encoded video input for - * playback as well as encoded video output from recording. +/** + * Defines possible encapsulation types for coded video data unit. The + * encapsulation information is used both for encoded video input for + * playback as well as encoded video output from recording. */ typedef enum OMX_DATAUNITENCAPSULATIONTYPE { OMX_DataEncapsulationElementaryStream, OMX_DataEncapsulationGenericPayload, OMX_DataEncapsulationRtpPayload, - OMX_DataEncapsulationKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_DataEncapsulationKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_DataEncapsulationVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_DataEncapsulationMax = 0x7FFFFFFF } OMX_DATAUNITENCAPSULATIONTYPE; -/** - * Structure used to configure the type of being decoded/encoded +/** + * Structure used to configure the type of being decoded/encoded */ typedef struct OMX_PARAM_DATAUNITTYPE { OMX_U32 nSize; /**< Size of the structure in bytes */ - OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ + OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ OMX_U32 nPortIndex; /**< Port that this structure applies to */ OMX_DATAUNITTYPE eUnitType; OMX_DATAUNITENCAPSULATIONTYPE eEncapsulationType; @@ -767,25 +793,25 @@ typedef struct OMX_PARAM_DATAUNITTYPE { /** - * Defines dither types + * Defines dither types */ typedef enum OMX_DITHERTYPE { OMX_DitherNone, OMX_DitherOrdered, OMX_DitherErrorDiffusion, OMX_DitherOther, - OMX_DitherKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_DitherKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_DitherVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_DitherMax = 0x7FFFFFFF } OMX_DITHERTYPE; -/** - * Structure used to configure current type of dithering +/** + * Structure used to configure current type of dithering */ typedef struct OMX_CONFIG_DITHERTYPE { OMX_U32 nSize; /**< Size of the structure in bytes */ - OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ + OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ OMX_U32 nPortIndex; /**< Port that this structure applies to */ OMX_DITHERTYPE eDither; /**< Type of dithering to use */ } OMX_CONFIG_DITHERTYPE; @@ -794,28 +820,28 @@ typedef struct OMX_CONFIG_CAPTUREMODETYPE { OMX_U32 nSize; OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; /**< Port that this structure applies to */ - OMX_BOOL bContinuous; /**< If true then ignore frame rate and emit capture + OMX_BOOL bContinuous; /**< If true then ignore frame rate and emit capture * data as fast as possible (otherwise obey port's frame rate). */ - OMX_BOOL bFrameLimited; /**< If true then terminate capture after the port emits the - * specified number of frames (otherwise the port does not - * terminate the capture until instructed to do so by the client). - * Even if set, the client may manually terminate the capture prior + OMX_BOOL bFrameLimited; /**< If true then terminate capture after the port emits the + * specified number of frames (otherwise the port does not + * terminate the capture until instructed to do so by the client). + * Even if set, the client may manually terminate the capture prior * to reaching the limit. */ OMX_U32 nFrameLimit; /**< Limit on number of frames emitted during a capture (only * valid if bFrameLimited is set). */ } OMX_CONFIG_CAPTUREMODETYPE; typedef enum OMX_METERINGTYPE { - + OMX_MeteringModeAverage, /**< Center-weighted average metering. */ OMX_MeteringModeSpot, /**< Spot (partial) metering. */ OMX_MeteringModeMatrix, /**< Matrix or evaluative metering. */ - - OMX_MeteringKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + + OMX_MeteringKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_MeteringVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_EVModeMax = 0x7fffffff } OMX_METERINGTYPE; - + typedef struct OMX_CONFIG_EXPOSUREVALUETYPE { OMX_U32 nSize; OMX_VERSIONTYPE nVersion; @@ -824,14 +850,14 @@ typedef struct OMX_CONFIG_EXPOSUREVALUETYPE { OMX_S32 xEVCompensation; /**< Fixed point value stored as Q16 */ OMX_U32 nApertureFNumber; /**< e.g. nApertureFNumber = 2 implies "f/2" - Q16 format */ OMX_BOOL bAutoAperture; /**< Whether aperture number is defined automatically */ - OMX_U32 nShutterSpeedMsec; /**< Shutterspeed in milliseconds */ - OMX_BOOL bAutoShutterSpeed; /**< Whether shutter speed is defined automatically */ + OMX_U32 nShutterSpeedMsec; /**< Shutterspeed in milliseconds */ + OMX_BOOL bAutoShutterSpeed; /**< Whether shutter speed is defined automatically */ OMX_U32 nSensitivity; /**< e.g. nSensitivity = 100 implies "ISO 100" */ OMX_BOOL bAutoSensitivity; /**< Whether sensitivity is defined automatically */ } OMX_CONFIG_EXPOSUREVALUETYPE; -/** - * Focus region configuration +/** + * Focus region configuration * * STRUCT MEMBERS: * nSize : Size of the structure in bytes @@ -862,8 +888,8 @@ typedef struct OMX_CONFIG_FOCUSREGIONTYPE { OMX_BOOL bBottomRight; } OMX_CONFIG_FOCUSREGIONTYPE; -/** - * Focus Status type +/** + * Focus Status type */ typedef enum OMX_FOCUSSTATUSTYPE { OMX_FocusStatusOff = 0, @@ -871,13 +897,13 @@ typedef enum OMX_FOCUSSTATUSTYPE { OMX_FocusStatusReached, OMX_FocusStatusUnableToReach, OMX_FocusStatusLost, - OMX_FocusStatusKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_FocusStatusKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_FocusStatusVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_FocusStatusMax = 0x7FFFFFFF } OMX_FOCUSSTATUSTYPE; -/** - * Focus status configuration +/** + * Focus status configuration * * STRUCT MEMBERS: * nSize : Size of the structure in bytes diff --git a/domx/omx_core/inc/OMX_Image.h b/domx/omx_core/inc/OMX_Image.h index a6d4666..23a0209 100755 --- a/domx/omx_core/inc/OMX_Image.h +++ b/domx/omx_core/inc/OMX_Image.h @@ -1,28 +1,45 @@ +/* ------------------------------------------------------------------ + * Copyright (C) 1998-2009 PacketVideo + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. + * See the License for the specific language governing permissions + * and limitations under the License. + * ------------------------------------------------------------------- + */ /** - * Copyright (c) 2008 The Khronos Group Inc. - * + * Copyright (c) 2008 The Khronos Group Inc. + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: + * to the following conditions: * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * + * in all copies or substantial portions of the Software. + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/** +/** * @file OMX_Image.h - OpenMax IL version 1.1.2 - * The structures needed by Image components to exchange parameters and + * The structures needed by Image components to exchange parameters and * configuration data with the components. */ #ifndef OMX_Image_h @@ -34,9 +51,9 @@ extern "C" { /** - * Each OMX header must include all required header files to allow the - * header to compile without errors. The includes below are required - * for this header file to compile successfully + * Each OMX header must include all required header files to allow the + * header to compile without errors. The includes below are required + * for this header file to compile successfully */ #include <OMX_IVCommon.h> @@ -47,8 +64,8 @@ extern "C" { * @{ */ -/** - * Enumeration used to define the possible image compression coding. +/** + * Enumeration used to define the possible image compression coding. */ typedef enum OMX_IMAGE_CODINGTYPE { OMX_IMAGE_CodingUnused, /**< Value when format is N/A */ @@ -61,59 +78,59 @@ typedef enum OMX_IMAGE_CODINGTYPE { OMX_IMAGE_CodingPNG, /**< PNG image format */ OMX_IMAGE_CodingLZW, /**< LZW image format */ OMX_IMAGE_CodingBMP, /**< Windows Bitmap format */ - OMX_IMAGE_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_IMAGE_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_IMAGE_CodingVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_IMAGE_CodingMax = 0x7FFFFFFF } OMX_IMAGE_CODINGTYPE; /** - * Data structure used to define an image path. The number of image paths - * for input and output will vary by type of the image component. - * + * Data structure used to define an image path. The number of image paths + * for input and output will vary by type of the image component. + * * Input (aka Source) : Zero Inputs, one Output, * Splitter : One Input, 2 or more Outputs, * Processing Element : One Input, one output, * Mixer : 2 or more inputs, one output, * Output (aka Sink) : One Input, zero outputs. - * - * The PortDefinition structure is used to define all of the parameters - * necessary for the compliant component to setup an input or an output - * image path. If additional vendor specific data is required, it should - * be transmitted to the component using the CustomCommand function. - * Compliant components will prepopulate this structure with optimal + * + * The PortDefinition structure is used to define all of the parameters + * necessary for the compliant component to setup an input or an output + * image path. If additional vendor specific data is required, it should + * be transmitted to the component using the CustomCommand function. + * Compliant components will prepopulate this structure with optimal * values during the OMX_GetParameter() command. * * STRUCT MEMBERS: * cMIMEType : MIME type of data for the port - * pNativeRender : Platform specific reference for a display if a + * pNativeRender : Platform specific reference for a display if a * sync, otherwise this field is 0 - * nFrameWidth : Width of frame to be used on port if - * uncompressed format is used. Use 0 for + * nFrameWidth : Width of frame to be used on port if + * uncompressed format is used. Use 0 for * unknown, don't care or variable - * nFrameHeight : Height of frame to be used on port if - * uncompressed format is used. Use 0 for + * nFrameHeight : Height of frame to be used on port if + * uncompressed format is used. Use 0 for * unknown, don't care or variable - * nStride : Number of bytes per span of an image (i.e. + * nStride : Number of bytes per span of an image (i.e. * indicates the number of bytes to get from - * span N to span N+1, where negative stride + * span N to span N+1, where negative stride * indicates the image is bottom up * nSliceHeight : Height used when encoding in slices - * bFlagErrorConcealment : Turns on error concealment if it is supported by + * bFlagErrorConcealment : Turns on error concealment if it is supported by * the OMX component - * eCompressionFormat : Compression format used in this instance of - * the component. When OMX_IMAGE_CodingUnused is + * eCompressionFormat : Compression format used in this instance of + * the component. When OMX_IMAGE_CodingUnused is * specified, eColorFormat is valid * eColorFormat : Decompressed format used by this component - * pNativeWindow : Platform specific reference for a window object if a - * display sink , otherwise this field is 0x0. + * pNativeWindow : Platform specific reference for a window object if a + * display sink , otherwise this field is 0x0. */ typedef struct OMX_IMAGE_PORTDEFINITIONTYPE { OMX_STRING cMIMEType; OMX_NATIVE_DEVICETYPE pNativeRender; - OMX_U32 nFrameWidth; + OMX_U32 nFrameWidth; OMX_U32 nFrameHeight; - OMX_S32 nStride; + OMX_S32 nStride; OMX_U32 nSliceHeight; OMX_BOOL bFlagErrorConcealment; OMX_IMAGE_CODINGTYPE eCompressionFormat; @@ -122,18 +139,18 @@ typedef struct OMX_IMAGE_PORTDEFINITIONTYPE { } OMX_IMAGE_PORTDEFINITIONTYPE; -/** - * Port format parameter. This structure is used to enumerate the various +/** + * Port format parameter. This structure is used to enumerate the various * data input/output format supported by the port. - * + * * STRUCT MEMBERS: * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Indicates which port to set - * nIndex : Indicates the enumeration index for the format from + * nIndex : Indicates the enumeration index for the format from * 0x0 to N-1 - * eCompressionFormat : Compression format used in this instance of the - * component. When OMX_IMAGE_CodingUnused is specified, + * eCompressionFormat : Compression format used in this instance of the + * component. When OMX_IMAGE_CodingUnused is specified, * eColorFormat is valid * eColorFormat : Decompressed format used by this component */ @@ -147,8 +164,8 @@ typedef struct OMX_IMAGE_PARAM_PORTFORMATTYPE { } OMX_IMAGE_PARAM_PORTFORMATTYPE; -/** - * Flash control type +/** + * Flash control type * * ENUMS * Torch : Flash forced constantly on @@ -160,14 +177,14 @@ typedef enum OMX_IMAGE_FLASHCONTROLTYPE { OMX_IMAGE_FlashControlRedEyeReduction, OMX_IMAGE_FlashControlFillin, OMX_IMAGE_FlashControlTorch, - OMX_IMAGE_FlashControlKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_IMAGE_FlashControlKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_IMAGE_FlashControlVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_IMAGE_FlashControlMax = 0x7FFFFFFF } OMX_IMAGE_FLASHCONTROLTYPE; -/** - * Flash control configuration +/** + * Flash control configuration * * STRUCT MEMBERS: * nSize : Size of the structure in bytes @@ -183,29 +200,29 @@ typedef struct OMX_IMAGE_PARAM_FLASHCONTROLTYPE { } OMX_IMAGE_PARAM_FLASHCONTROLTYPE; -/** - * Focus control type +/** + * Focus control type */ typedef enum OMX_IMAGE_FOCUSCONTROLTYPE { OMX_IMAGE_FocusControlOn = 0, OMX_IMAGE_FocusControlOff, OMX_IMAGE_FocusControlAuto, OMX_IMAGE_FocusControlAutoLock, - OMX_IMAGE_FocusControlKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_IMAGE_FocusControlKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_IMAGE_FocusControlVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_IMAGE_FocusControlMax = 0x7FFFFFFF } OMX_IMAGE_FOCUSCONTROLTYPE; - -/** - * Focus control configuration + +/** + * Focus control configuration * * STRUCT MEMBERS: * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * eFocusControl : Focus control - * nFocusSteps : Focus can take on values from 0 mm to infinity. + * nFocusSteps : Focus can take on values from 0 mm to infinity. * Interest is only in number of steps over this range. * nFocusStepIndex : Current focus step index */ @@ -219,30 +236,30 @@ typedef struct OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE { } OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE; -/** +/** * Q Factor for JPEG compression, which controls the tradeoff between image * quality and size. Q Factor provides a more simple means of controlling * JPEG compression quality, without directly programming Quantization - * tables for chroma and luma + * tables for chroma and luma * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nQFactor : JPEG Q factor value in the range of 1-100. A factor of 1 - * produces the smallest, worst quality images, and a factor - * of 100 produces the largest, best quality images. A - * typical default is 75 for small good quality images + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to + * nQFactor : JPEG Q factor value in the range of 1-100. A factor of 1 + * produces the smallest, worst quality images, and a factor + * of 100 produces the largest, best quality images. A + * typical default is 75 for small good quality images */ typedef struct OMX_IMAGE_PARAM_QFACTORTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nQFactor; + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U32 nQFactor; } OMX_IMAGE_PARAM_QFACTORTYPE; -/** - * Quantization table type +/** + * Quantization table type */ typedef enum OMX_IMAGE_QUANTIZATIONTABLETYPE { @@ -250,27 +267,27 @@ typedef enum OMX_IMAGE_QUANTIZATIONTABLETYPE { OMX_IMAGE_QuantizationTableChroma, OMX_IMAGE_QuantizationTableChromaCb, OMX_IMAGE_QuantizationTableChromaCr, - OMX_IMAGE_QuantizationTableKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_IMAGE_QuantizationTableKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_IMAGE_QuantizationTableVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_IMAGE_QuantizationTableMax = 0x7FFFFFFF } OMX_IMAGE_QUANTIZATIONTABLETYPE; -/** +/** * JPEG quantization tables are used to determine DCT compression for - * YUV data, as an alternative to specifying Q factor, providing exact - * control of compression + * YUV data, as an alternative to specifying Q factor, providing exact + * control of compression * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * eQuantizationTable : Quantization table type - * nQuantizationMatrix[64] : JPEG quantization table of coefficients stored - * in increasing columns then by rows of data (i.e. - * row 1, ... row 8). Quantization values are in + * nQuantizationMatrix[64] : JPEG quantization table of coefficients stored + * in increasing columns then by rows of data (i.e. + * row 1, ... row 8). Quantization values are in * the range 0-255 and stored in linear order - * (i.e. the component will zig-zag the - * quantization table data if required internally) + * (i.e. the component will zig-zag the + * quantization table data if required internally) */ typedef struct OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE { OMX_U32 nSize; @@ -281,9 +298,9 @@ typedef struct OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE { } OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE; -/** - * Huffman table type, the same Huffman table is applied for chroma and - * luma component +/** + * Huffman table type, the same Huffman table is applied for chroma and + * luma component */ typedef enum OMX_IMAGE_HUFFMANTABLETYPE { OMX_IMAGE_HuffmanTableAC = 0, @@ -292,23 +309,23 @@ typedef enum OMX_IMAGE_HUFFMANTABLETYPE { OMX_IMAGE_HuffmanTableACChroma, OMX_IMAGE_HuffmanTableDCLuma, OMX_IMAGE_HuffmanTableDCChroma, - OMX_IMAGE_HuffmanTableKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_IMAGE_HuffmanTableKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_IMAGE_HuffmanTableVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_IMAGE_HuffmanTableMax = 0x7FFFFFFF } OMX_IMAGE_HUFFMANTABLETYPE; -/** - * JPEG Huffman table +/** + * JPEG Huffman table * * STRUCT MEMBERS: * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * eHuffmanTable : Huffman table type - * nNumberOfHuffmanCodeOfLength[16] : 0-16, number of Huffman codes of each + * nNumberOfHuffmanCodeOfLength[16] : 0-16, number of Huffman codes of each * possible length - * nHuffmanTable[256] : 0-255, the size used for AC and DC - * HuffmanTable are 16 and 162 + * nHuffmanTable[256] : 0-255, the size used for AC and DC + * HuffmanTable are 16 and 162 */ typedef struct OMX_IMAGE_PARAM_HUFFMANTTABLETYPE { OMX_U32 nSize; diff --git a/domx/omx_core/inc/OMX_Index.h b/domx/omx_core/inc/OMX_Index.h index 44d4ea7..bfb8739 100755 --- a/domx/omx_core/inc/OMX_Index.h +++ b/domx/omx_core/inc/OMX_Index.h @@ -1,23 +1,40 @@ +/* ------------------------------------------------------------------ + * Copyright (C) 1998-2009 PacketVideo + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. + * See the License for the specific language governing permissions + * and limitations under the License. + * ------------------------------------------------------------------- + */ /* - * Copyright (c) 2008 The Khronos Group Inc. - * + * Copyright (c) 2008 The Khronos Group Inc. + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: + * to the following conditions: * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * + * in all copies or substantial portions of the Software. + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ @@ -37,22 +54,22 @@ extern "C" { /* Each OMX header must include all required header files to allow the * header to compile without errors. The includes below are required - * for this header file to compile successfully + * for this header file to compile successfully */ #include <OMX_Types.h> /** The OMX_INDEXTYPE enumeration is used to select a structure when either - * getting or setting parameters and/or configuration data. Each entry in - * this enumeration maps to an OMX specified structure. When the + * getting or setting parameters and/or configuration data. Each entry in + * this enumeration maps to an OMX specified structure. When the * OMX_GetParameter, OMX_SetParameter, OMX_GetConfig or OMX_SetConfig methods * are used, the second parameter will always be an entry from this enumeration * and the third entry will be the structure shown in the comments for the entry. - * For example, if the application is initializing a cropping function, the - * OMX_SetConfig command would have OMX_IndexConfigCommonInputCrop as the second parameter - * and would send a pointer to an initialized OMX_RECTTYPE structure as the + * For example, if the application is initializing a cropping function, the + * OMX_SetConfig command would have OMX_IndexConfigCommonInputCrop as the second parameter + * and would send a pointer to an initialized OMX_RECTTYPE structure as the * third parameter. - * + * * The enumeration entries named with the OMX_Config prefix are sent using * the OMX_SetConfig command and the enumeration entries named with the * OMX_PARAM_ prefix are sent using the OMX_SetParameter command. @@ -69,11 +86,11 @@ typedef enum OMX_INDEXTYPE { OMX_IndexParamActiveStream, /**< reference: OMX_PARAM_U32TYPE */ OMX_IndexParamSuspensionPolicy, /**< reference: OMX_PARAM_SUSPENSIONPOLICYTYPE */ OMX_IndexParamComponentSuspended, /**< reference: OMX_PARAM_SUSPENSIONTYPE */ - OMX_IndexConfigCapturing, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - OMX_IndexConfigCaptureMode, /**< reference: OMX_CONFIG_CAPTUREMODETYPE */ - OMX_IndexAutoPauseAfterCapture, /**< reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_IndexConfigCapturing, /**< reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_IndexConfigCaptureMode, /**< reference: OMX_CONFIG_CAPTUREMODETYPE */ + OMX_IndexAutoPauseAfterCapture, /**< reference: OMX_CONFIG_BOOLEANTYPE */ OMX_IndexParamContentURI, /**< reference: OMX_PARAM_CONTENTURITYPE */ - OMX_IndexParamCustomContentPipe, /**< reference: OMX_PARAM_CONTENTPIPETYPE */ + OMX_IndexParamCustomContentPipe, /**< reference: OMX_PARAM_CONTENTPIPETYPE */ OMX_IndexParamDisableResourceConcealment, /**< reference: OMX_RESOURCECONCEALMENTTYPE */ OMX_IndexConfigMetadataItemCount, /**< reference: OMX_CONFIG_METADATAITEMCOUNTTYPE */ OMX_IndexConfigContainerNodeCount, /**< reference: OMX_CONFIG_CONTAINERNODECOUNTTYPE */ @@ -86,7 +103,7 @@ typedef enum OMX_INDEXTYPE { OMX_IndexPortStartUnused = 0x02000000, OMX_IndexParamPortDefinition, /**< reference: OMX_PARAM_PORTDEFINITIONTYPE */ - OMX_IndexParamCompBufferSupplier, /**< reference: OMX_PARAM_BUFFERSUPPLIERTYPE */ + OMX_IndexParamCompBufferSupplier, /**< reference: OMX_PARAM_BUFFERSUPPLIERTYPE */ OMX_IndexReservedStartUnused = 0x03000000, /* Audio parameters and configurations */ @@ -118,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 */ @@ -238,10 +256,10 @@ typedef enum OMX_INDEXTYPE { OMX_IndexConfigTimeSeekMode, /**< reference: OMX_TIME_CONFIG_SEEKMODETYPE */ - OMX_IndexKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_IndexKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ /* Vendor specific area */ OMX_IndexVendorStartUnused = 0x7F000000, - /* Vendor specific structures should be in the range of 0x7F000000 + /* Vendor specific structures should be in the range of 0x7F000000 to 0x7FFFFFFE. This range is not broken out by vendor, so private indexes are not guaranteed unique and therefore should only be sent to the appropriate component. */ diff --git a/domx/omx_core/inc/OMX_Other.h b/domx/omx_core/inc/OMX_Other.h index 2cce9f8..a9b0c4e 100755 --- a/domx/omx_core/inc/OMX_Other.h +++ b/domx/omx_core/inc/OMX_Other.h @@ -1,3 +1,20 @@ +/* ------------------------------------------------------------------ + * Copyright (C) 1998-2009 PacketVideo + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. + * See the License for the specific language governing permissions + * and limitations under the License. + * ------------------------------------------------------------------- + */ /* * Copyright (c) 2008 The Khronos Group Inc. * diff --git a/domx/omx_core/inc/OMX_TI_Common.h b/domx/omx_core/inc/OMX_TI_Common.h index 457adb6..b39163f 100755 --- a/domx/omx_core/inc/OMX_TI_Common.h +++ b/domx/omx_core/inc/OMX_TI_Common.h @@ -208,6 +208,128 @@ typedef struct OMX_TI_PARAM_METADATABUFFERINFO { OMX_U32 nMetaDataSize; } OMX_TI_PARAM_METADATABUFFERINFO; +/*===============================================================*/ +/** OMX_TI_BUFFERTYPE : This enumberation defines the type of + * buffer that is exchanged with the OMX + * component port + * + * OMX_TI_BufferTypeDefault : Default buffer type accessed via a + * single virtual address + * OMX_TI_BufferTypeVirtual2D : Multiple virtual buffers describing a + * 2D buffer + * OMX_TI_BufferTypePlatform1D : Platform specific 1D buffer handle + * OMX_TI_BufferTypePlatform2D : Platform specific buffer handles + * describing a 2D buffer + * OMX_TI_BufferTypePhysicalPageList : List of a given number of physical pages + * OMX_TI_BufferTypeHardwareReserved1D:Harware reserve space only that can + * accomodate a 1D buffer by mapping memory + * to it + */ +/*===============================================================*/ +typedef enum OMX_TI_BUFFERTYPE { + OMX_TI_BufferTypeDefault = 0, + OMX_TI_BufferTypeVirtual2D, + OMX_TI_BufferTypePlatform1D, + OMX_TI_BufferTypePlatform2D, + OMX_TI_BufferTypePhysicalPageList, + OMX_TI_BufferTypeHardwareReserved1D, + OMX_TI_BufferTypeMax = 0x7FFFFFFF +} OMX_TI_BUFFERTYPE; + +/*===============================================================*/ +/** OMX_TI_BUFFERDESCRIPTOR_TYPE : This buffer descriptor structure is used + * to convey additional buffer information + * when OMX_TI_IndexUseBufferDescriptor is + * enabled and it is passed via pBuffer + * in OMX_BUFFERHEADERTYPE + * + * @ param nSize : Size of the structure. + * @ param eBufType : Specifies type of buffer + * @ param nNumOfBuf : Number of component buffers of eBufType + * @ param pBuf : Array of buffers of type eBufType + */ +/*===============================================================*/ +typedef struct OMX_TI_BUFFERDESCRIPTOR_TYPE { + OMX_U32 nSize; + OMX_TI_BUFFERTYPE eBufType; + OMX_U32 nNumOfBuf; + OMX_PTR pBuf[3]; +} OMX_TI_BUFFERDESCRIPTOR_TYPE; + +/*===============================================================*/ +/** OMX_TI_PARAM_USEBUFFERDESCRIPTOR : This parameter is used to enable/disable + * buffer descriptor mode. When enabled, + * the pBuffer in OMX buffer header points + * to a buffer descriptor structure + * OMX_TI_BUFFERDESCRIPTOR_TYPE instead of + * the buffer directly. + * + * @ param nSize : Size of the structure. + * @ param nVersion : Version. + * @ param nPortIndex : Port index on which the parameter will + * be applied. + * @ param bEnabled : Whether buffer descriptor mode is + * enabled or not. Set to FALSE (disabled) + * by default. + */ +/*===============================================================*/ +typedef struct OMX_TI_PARAM_USEBUFFERDESCRIPTOR { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_BOOL bEnabled; + OMX_TI_BUFFERTYPE eBufferType; +} OMX_TI_PARAM_USEBUFFERDESCRIPTOR; + + +/*===============================================================*/ +/** OMX_TI_PARAM_COMPONENTBUFALLOCTYPE :This parameter is used to query/set + * internal buffers used by OMX component + * after allocation by the user of OMX + * component during regular OMX buffer + * allocation/free life cycle + * + * @ param nSize : Size of the structure. + * @ param nVersion : Version. + * @ param nPortIndex : Port index on which the parameter will + * be applied. + * @ param nIndex : Present buffer number whose requirement + * is queried and then set + * @ param eBufType : Present nIndex'ed buffer type + * @ param pBuf : Buffer communication + * @ param nAllocWidth : Size of buffer (Width in case of 2D) + * @ param nAllocLines : Size of buffer (1 in case of 1D) + * @ param nOffset : Offset from which buffer communicated is + * valid + */ +/*===============================================================*/ +typedef struct OMX_TI_PARAM_COMPONENTBUFALLOCTYPE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U32 nIndex; + OMX_TI_BUFFERTYPE eBufType; + OMX_PTR pBuf[3]; + OMX_U32 nAllocWidth; + OMX_U32 nAllocLines; + OMX_U32 nOffset; +} OMX_TI_PARAM_COMPONENTBUFALLOCTYPE; + +/*===============================================================*/ +/** OMX_TI_COMPONENT_HANDLE : This parameter is used to retrieve + * the component handle by the client. + * + * @ param nSize : Size of the structure. + * @ param nVersion : Version. + * @ param pHandle : Component Handle + */ +/*===============================================================*/ +typedef struct OMX_TI_COMPONENT_HANDLE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_HANDLETYPE pHandle; +} OMX_TI_COMPONENT_HANDLE; + /******************************************************************* * PRIVATE DECLARATIONS: defined here, used only here *******************************************************************/ diff --git a/domx/omx_core/inc/OMX_TI_IVCommon.h b/domx/omx_core/inc/OMX_TI_IVCommon.h index cfe228a..c2b5bb8 100755 --- a/domx/omx_core/inc/OMX_TI_IVCommon.h +++ b/domx/omx_core/inc/OMX_TI_IVCommon.h @@ -53,6 +53,7 @@ extern "C" { #include <OMX_IVCommon.h> #include <OMX_Image.h> +#define DCC_PATH "/data/misc/camera/" #define MAX_URI_LENGTH (OMX_MAX_STRINGNAME_SIZE) #define MAX_ALGOAREAS (35) @@ -67,7 +68,8 @@ extern "C" { /* ======================================================================= */ typedef enum OMX_JPEG_COMPRESSEDMODETYPE { OMX_JPEG_ModeChunk = 0, - OMX_JPEG_ModeNonChunk + OMX_JPEG_ModeNonChunk, + OMX_JPEG_CompressedmodeMax = 0x7fffffff }OMX_JPEG_COMPRESSEDMODETYPE ; @@ -85,7 +87,8 @@ typedef enum OMX_JPEG_UNCOMPRESSEDMODETYPE { OMX_JPEG_UncompressedModeFrame = 0, OMX_JPEG_UncompressedModeSlice, OMX_JPEG_UncompressedModeStitch, - OMX_JPEG_UncompressedModeBurst + OMX_JPEG_UncompressedModeBurst, + OMX_JPEG_UncompressedModeMax = 0x7fffffff }OMX_JPEG_UNCOMPRESSEDMODETYPE; @@ -360,7 +363,8 @@ typedef struct OMX_CONFIG_SCALEQUALITYTYPE { typedef enum OMX_SMOOTHZOOMMODE{ OMX_Off=0, /**< default OFF */ OMX_Increase, - OMX_Decrease + OMX_Decrease, + OMX_SmoothZoomModeMax = 0x7fffffff }OMX_SMOOTHZOOMMODE; @@ -406,7 +410,8 @@ typedef enum OMX_EXTIMAGEFILTERTYPE { OMX_TI_ImageFilterWhiteBoard, OMX_TI_ImageFilterBlackBoard, OMX_TI_ImageFilterAqua, - OMX_TI_ImageFilterPosterize + OMX_TI_ImageFilterPosterize, + OMX_ImageFilterTypeMax = 0x7fffffff } OMX_EXTIMAGEFILTERTYPE; @@ -457,6 +462,8 @@ typedef enum OMX_BRACKETMODETYPE { OMX_BracketFlashPower, OMX_BracketAperture, OMX_BracketTemporal, + OMX_BracketExposureGainAbsolute, + OMX_BracketVectorShot, OMX_BrackerTypeKhronosExtensions = 0x6f000000, OMX_BrackerTypeVendorStartUnused = 0x7f000000, OMX_BracketTypeMax = 0x7FFFFFFF @@ -467,8 +474,9 @@ typedef struct OMX_CONFIG_BRACKETINGTYPE { OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_BRACKETMODETYPE eBracketMode; - OMX_U32 nNbrBracketingValues; - OMX_S32 nBracketValues[10]; /**< 10 can be assumed */ + OMX_U32 nNbrBracketingValues; + OMX_S32 nBracketValues[10]; /**< 10 can be assumed */ + OMX_S32 nBracketValues2[10]; /**< 10 can be assumed */ } OMX_CONFIG_BRACKETINGTYPE; @@ -508,7 +516,7 @@ typedef enum OMX_CAMOPERATINGMODETYPE { OMX_CaptureImageProfileOpticalCorr1, OMX_CaptureImageProfileOpticalCorr2, OMX_CaptureImageProfileExtended1, - OMX_CaptureStereoImageCapture, + OMX_CaptureStereoImageCapture, OMX_CaptureImageMemoryInput, OMX_CaptureVideo, OMX_CaptureHighSpeedVideo, @@ -516,8 +524,18 @@ typedef enum OMX_CAMOPERATINGMODETYPE { OMX_TI_CaptureDummy, OMX_TI_CaptureGestureRecognition, OMX_TI_CaptureImageProfileZeroShutterLag, - OMX_CamOperatingModeMax = 0x7fffffff + OMX_TI_SinglePreview, + OMX_TI_StereoGestureRecognition, + OMX_TI_CPCam, + OMX_TI_StereoVideo, + OMX_CaptureHighQualityVideo, + // Put new entries here so OMX_CamOperatingModeMax always points to + // the last one + OMX_TI_CamOperatingModeCount, + OMX_CamOperatingModeMax = OMX_TI_CamOperatingModeCount - 1, + OMX_CamOperatingMode = 0x7fffffff } OMX_CAMOPERATINGMODETYPE; + /** * Capture mode setting: applicable to multi shot capture also including bracketing. * @@ -668,7 +686,11 @@ typedef enum OMX_IMAGE_EXTFOCUSCONTROLTYPE { OMX_IMAGE_FocusControlPortrait, /**< from Xena */ OMX_IMAGE_FocusControlExtended, /**< from Xena */ OMX_IMAGE_FocusControlContinousNormal, /**< from Xena */ - OMX_IMAGE_FocusControlContinousExtended /**< from Xena */ + OMX_IMAGE_FocusControlContinousExtended, /**< from Xena */ + OMX_IMAGE_FocusControlContinousFacePriority, + OMX_IMAGE_FocusControlContinousRegionPriority, + OMX_IMAGE_FocusControlContinousPicture, + OMX_IMAGE_FocusControlTypeMax = 0x7fffffff } OMX_IMAGE_EXTFOCUSCONTROLTYPE; @@ -834,7 +856,8 @@ typedef enum OMX_EXTWHITEBALCONTROLTYPE { OMX_TI_WhiteBalControlSunset, OMX_TI_WhiteBalControlShade, OMX_TI_WhiteBalControlTwilight, - OMX_TI_WhiteBalControlWarmFluorescent + OMX_TI_WhiteBalControlWarmFluorescent, + OMX_TI_WhiteBalControlMax = 0x7fffffff } OMX_EXTWHITEBALCONTROLTYPE; /** @@ -934,7 +957,8 @@ OMX_PROCESSINGTYPE eProc; typedef enum OMX_HISTTYPE{ OMX_HistControlLuminance = 0, /**< Luminance histogram is calculated (Y)*/ OMX_HistControlColorComponents, /**< A histogram per color component (R, G, B) is calculated*/ - OMX_HistControlChrominanceComponents /**< A histogram per chrominance component (Cb, Cr) is calculated.*/ + OMX_HistControlChrominanceComponents, /**< A histogram per chrominance component (Cb, Cr) is calculated.*/ + OMX_HistControl_32BIT_PATCH = 0x7FFFFFFF }OMX_HISTTYPE; /** @@ -971,7 +995,7 @@ typedef struct OMX_CONFIG_HISTOGRAMTYPE { } OMX_CONFIG_HISTOGRAMTYPE; /** - * Enums for HIST component type. + * OMX_HISTCOMPONENTTYPE Enumerated Value */ typedef enum OMX_HISTCOMPONENTTYPE{ OMX_HISTCOMP_Y = 0, /**< Luminance histogram (Y) */ @@ -980,41 +1004,141 @@ typedef enum OMX_HISTCOMPONENTTYPE{ OMX_HISTCOMP_G, /**< Green histogram component (G)*/ OMX_HISTCOMP_B, /**< Blue histogram component (B)*/ OMX_HISTCOMP_Cb, /**< Chroma blue histogram component (Cb)*/ - OMX_HISTCOMP_Cr /**< Chroma red histogram component (Cr) */ + OMX_HISTCOMP_Cr, /**< Chroma red histogram component (Cr) */ + OMX_HISTCOMP_32BIT_PATCH = 0x7FFFFFFF }OMX_HISTCOMPONENTTYPE; - /** +/** * The OMX_TI_CAMERAVIEWTYPE enumeration is used to identify the - * particular camera view that the rest of the data in the structure is - * associated with. - */ -typedef enum OMX_TI_CAMERAVIEWTYPE -{ - OMX_2D, /**< Camera view in 2D sensor configuration */ - OMX_Left, /**< Left camera view in stereo sensor configuration */ - OMX_Right, /**< Right camera view in stereo sensor configuration */ + * particular camera view and frame type that the rest of + * the data in the structure is associated with. + */ +typedef enum OMX_TI_CAMERAVIEWTYPE { + OMX_2D_Prv, /**< Camera view in 2D for preview */ + OMX_2D_Snap, /**< Camera view in 2D for snapshot */ + OMX_2D_Cap, /**< Camera view in 2D for capture */ + OMX_3D_Left_Prv, /**< Left camera view in 3D for preview */ + OMX_3D_Left_Snap, /**< Left camera view in 3D for snapshot */ + OMX_3D_Left_Cap, /**< Left camera view in 3D for capture */ + OMX_3D_Right_Prv, /**< Right camera view in 3D for preview */ + OMX_3D_Right_Snap, /**< Right camera view in 3D for snapshot */ + OMX_3D_Right_Cap, /**< Right camera view in 3D for capture */ OMX_TI_CAMERAVIEWTYPE_32BIT_PATCH = 0x7FFFFFFF } OMX_TI_CAMERAVIEWTYPE; + +#define OMX_OTHER_EXTRADATATYPE_SIZE ((OMX_U32)(((OMX_OTHER_EXTRADATATYPE *)0x0)->data)) /**< Size of OMX_OTHER_EXTRADATATYPE + without Data[1] and without padding */ + /** - * nSize is the size of the structure including the length of data field containing - * the histogram data. - * nBins is the number of bins in the histogram. - * eComponentType specifies the type of the histogram bins according to enum. - * It can be selected to generate multiple component types, then the extradata struct - * is repeated for each component type. - * data[1] first byte of the histogram data + * The extra data having DCC data is described with the following structure. + * This data contains single flags and values + * (not arrays) that have general usage for camera applications. */ -typedef struct OMX_HISTOGRAMTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; +typedef struct OMX_TI_DCCDATATYPE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; OMX_TI_CAMERAVIEWTYPE eCameraView; - OMX_U32 nBins; - OMX_HISTCOMPONENTTYPE eComponentType; - OMX_U8 data[1]; -} OMX_HISTOGRAMTYPE; + OMX_U32 nCameraModuleId; + OMX_U32 nDccDescriptorId; + OMX_U32 nAlgorithmVendorId; + OMX_U32 nUseCaseId; + OMX_U32 nOffset; + OMX_PTR pData; +} OMX_TI_DCCDATATYPE; +/** + * The extra data type to feed the camera re-processing function + */ +typedef struct OMX_TI_CAMREPROCMETATYPE { + OMX_U32 nExpTime; + OMX_U32 nGain; +} OMX_TI_CAMREPROCMETATYPE; + +/** + * The extra data vector shot feedback info + * nConfigId : Same id that cames with + * OMX_TI_CONFIG_ENQUEUESHOTCONFIGS::nShotConfig[x].nConfigId + * for particular shot config. + * nFrameNum : Frame number in vect shot repeat sequence. + * Starts from 1 for every shot config. + * + * nExpMin : The exposure time lower limit,[us] + * nExpMax : The exposure time upper limit,[us] + * nGainMin : The analog gain lower limit,[0,01EV] + * nGainMax : The analog gain upper limit,[0,01EV] + * + * nReqEC : Requested total exposure compensation + * nReqExpTime : Requested exposure time + * nReqGain : Requested gain + * + * nExpTime : Exposure time of this frame. + * nAGain : Analog gain of this frame. + * + * nSenExpTimeErr : Exposure time error in us. + * If the requested exposure time is ExpReq + * and the one produced by the sensor is nExpTime then: + * nExpTimeErr = nExpTime - ExpReq. + * nSenAGainErr: Analog gain error as multiplier (in Q8 format). + * + * nDevEV : The total exposure deviation,[us] + * nDevExpTime : The exposure time deviation after flicker reduction,[us] + * nDevAGain : The analog gain deviation after flicker reduction,[0,01EV] + */ +typedef struct OMX_TI_VECTSHOTINFOTYPE { + OMX_U32 nConfigId; + OMX_U32 nFrameNum; + OMX_U32 nExpMin; + OMX_U32 nExpMax; + OMX_U32 nGainMin; + OMX_U32 nGainMax; + OMX_S32 nReqEC; + OMX_S32 nReqExpTime; + OMX_S32 nReqGain; + OMX_U32 nExpTime; + OMX_U32 nAGain; + OMX_S32 nSenExpTimeErr; + OMX_U32 nSenAGainErr; + OMX_S32 nDevEV; + OMX_S32 nDevExpTime; + OMX_S32 nDevAGain; +} OMX_TI_VECTSHOTINFOTYPE; + +/* + * LSC gain table size + */ +#define OMX_TI_LSC_GAIN_TABLE_SIZE (80 * 1024) + +/** + * Possible LSC table gain formats + */ +typedef enum OMX_TI_LSC_GAIN_FORMAT_TYPE { + OMX_TI_LSC_GAIN_FORMAT_0Q8, + OMX_TI_LSC_GAIN_FORMAT_0Q8_PLUS_1, + OMX_TI_LSC_GAIN_FORMAT_1Q7, + OMX_TI_LSC_GAIN_FORMAT_1Q7_PLUS_1, + OMX_TI_LSC_GAIN_FORMAT_2Q6, + OMX_TI_LSC_GAIN_FORMAT_2Q6_PLUS_1, + OMX_TI_LSC_GAIN_FORMAT_3Q5, + OMX_TI_LSC_GAIN_FORMAT_3Q5_PLUS_1, + OMX_TI_LSC_GAIN_FORMAT = 0x7FFFFFFF +} OMX_TI_LSC_GAIN_FORMAT_TYPE; + +/** + * The extra data for LSC table + * bApplied : If true the table is applied to the frame. + * eGainFormat : Paxel format + * nWidth : LSC table width in paxels + * nHeight : LSC table height in paxels + * pGainTable : LSC gain table + */ +typedef struct OMX_TI_LSCTABLETYPE { + OMX_BOOL bApplied; + OMX_TI_LSC_GAIN_FORMAT_TYPE eGainFormat; + OMX_U32 nWidth; + OMX_U32 nHeight; + OMX_U8 pGainTable[OMX_TI_LSC_GAIN_TABLE_SIZE]; +} OMX_TI_LSCTABLETYPE; -#define OMX_OTHER_EXTRADATATYPE_SIZE ( (OMX_U32)(((OMX_OTHER_EXTRADATATYPE*)0x0)->data) ) /**< Size of OMX_OTHER_EXTRADATATYPE**/ /** * The extra data having ancillary data is described with the following structure. * This data contains single flags and values @@ -1060,6 +1184,11 @@ typedef struct OMX_TI_ANCILLARYDATATYPE { OMX_U8 nDCCStatus; } OMX_TI_ANCILLARYDATATYPE; +/** + * White Balance Results data + * The extra data having white balance results data is + * described with the following structure.. + */ typedef struct OMX_TI_WHITEBALANCERESULTTYPE { OMX_U32 nSize; /**< Size */ OMX_VERSIONTYPE nVersion; /**< Version */ @@ -1087,15 +1216,17 @@ typedef struct OMX_TI_UNSATURATEDREGIONSTYPE { OMX_U32 nPortIndex; /**< Port Index */ OMX_U16 nPaxelsX; /**< The number of paxels in the horizontal direction */ OMX_U16 nPaxelsY; /**< The number of paxels in the vertical direction */ - OMX_U16 data[1]; /**< the first value of an array of values that represent */ + OMX_U16 data[1]; /**< the first value of an array of values that represent + the percentage of unsaturated pixels within the associated paxel */ } OMX_TI_UNSATURATEDREGIONSTYPE; /** * OMX_BARCODETYPE */ -typedef enum OMX_BARCODETYPE{ +typedef enum OMX_BARCODETYPE { OMX_BARCODE1D = 0, /**< 1D barcode */ OMX_BARCODE2D, /**< 2D barcode */ + OMX_BarcodeMax = 0x7fffffff }OMX_BARCODETYPE; /** * Brcode detection data @@ -1111,12 +1242,13 @@ typedef struct OMX_BARCODEDETECTIONTYPE { OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_TI_CAMERAVIEWTYPE eCameraView; - OMX_S32 nLeft; - OMX_S32 nTop; - OMX_U32 nWidth; - OMX_U32 nHeight; - OMX_S32 nOrientation; - OMX_BARCODETYPE eBarcodetype; + OMX_S32 nLeft; /**< The leftmost coordinate of the detected area rectangle */ + OMX_S32 nTop; /**< Topmost coordinate of the detected area rectangle */ + OMX_U32 nWidth; /**< The width of the detected area rectangle in pixels */ + OMX_U32 nHeight; /**< The height of the detected area rectangle in pixels */ + OMX_S32 nOrientation; /**< The orientation of the axis of the detected object. + This refers to the angle between the vertical axis of barcode and the horizontal axis */ + OMX_BARCODETYPE eBarcodetype; /**< An enumeration specifying the barcode type, as listed in the given table */ } OMX_BARCODEDETECTIONTYPE; /** @@ -1131,10 +1263,10 @@ typedef struct OMX_FRONTOBJDETECTIONTYPE { OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_TI_CAMERAVIEWTYPE eCameraView; - OMX_S32 nLeft; - OMX_S32 nTop; - OMX_U32 nWidth; - OMX_U32 nHeight; + OMX_S32 nLeft; /**< The leftmost coordinate of the detected area rectangle */ + OMX_S32 nTop; /**< The topmost coordinate of the detected area rectangle */ + OMX_U32 nWidth; /**< The width of the detected area rectangle in pixels */ + OMX_U32 nHeight; /**< The height of the detected area rectangle in pixels */ } OMX_FRONTOBJDETECTIONTYPE; /** @@ -1147,8 +1279,9 @@ typedef struct OMX_DISTANCEESTIMATIONTYPE { OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_TI_CAMERAVIEWTYPE eCameraView; - OMX_U32 nDistance; - OMX_U32 nLargestDiscrepancy; + OMX_U32 nDistance; /**< Estimated distance to the object in millimeters */ + OMX_U32 nLargestDiscrepancy; /**< the estimated largest discrepancy of the distance to the object in millimeters. + When equal to MAX_INT the discrepancy is unknown */ } OMX_DISTANCEESTIMATIONTYPE; /** @@ -1162,8 +1295,10 @@ typedef struct OMX_MOTIONESTIMATIONTYPE { OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_TI_CAMERAVIEWTYPE eCameraView; - OMX_S32 nPanX; - OMX_S32 nPanY; + OMX_S32 nPanX; /**< The detected translation in horizontal direction. + The value is represented as pixels in Q16-format */ + OMX_S32 nPanY; /**< The detected translation in vertical direction. + The value is represented as pixels in Q16-format */ } OMX_MOTIONESTIMATIONTYPE; @@ -1181,11 +1316,12 @@ typedef struct OMX_FOCUSREGIONTYPE { OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_TI_CAMERAVIEWTYPE eCameraView; - OMX_U32 nRefPortIndex; - OMX_S32 nLeft; - OMX_S32 nTop; - OMX_U32 nWidth; - OMX_U32 nHeight; + OMX_U32 nRefPortIndex; /**< The port the image frame size is defined on. + This image frame size is used as reference for the focus region rectangle */ + OMX_S32 nLeft; /**< The leftmost coordinate of the focus region rectangle */ + OMX_S32 nTop; /**< The topmost coordinate of the focus region rectangle */ + OMX_U32 nWidth; /**< The width of the focus region rectangle in pixels */ + OMX_U32 nHeight; /**< The height of the focus region rectangle in pixels */ } OMX_FOCUSREGIONTYPE; /** @@ -1194,7 +1330,8 @@ typedef struct OMX_FOCUSREGIONTYPE { */ typedef enum OMX_ISOSETTINGTYPE{ OMX_Auto = 0, /**< */ - OMX_IsoManual /**< */ + OMX_IsoManual, /**< */ + OMX_IsoSettingMax = 0x7fffffff }OMX_ISOSETTINGTYPE; /** @@ -1237,6 +1374,38 @@ typedef struct OMX_CONFIG_SENSORTYPE { } OMX_CONFIG_SENSORTYPE; /** +* Sensor Detect +*/ +typedef struct OMX_TI_PARAM_SENSORDETECT { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_BOOL bSensorDetect; +} OMX_TI_PARAM_SENSORDETECT; + +/** + * OMX_BAYERCOMPRESSION + * + */ +typedef enum OMX_BAYERCOMPRESSION { + OMX_BAYER_UNPACKED, + OMX_BAYER_PACKED10, + OMX_BAYER_ALAW, + OMX_BAYER_DPCM, + OMX_BAYER_MAX = 0x7FFFFFFF +} OMX_BAYERCOMPRESSION; + +/** +* Sensor Detect +*/ +typedef struct OMX_TI_PARAM_BAYERCOMPRESSION { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_BAYERCOMPRESSION eBayerCompression; +} OMX_TI_PARAM_BAYERCOMPRESSION; + +/** * Sensor custom data type */ typedef struct OMX_CONFIG_SENSORCUSTOMDATATYPE { @@ -1256,7 +1425,8 @@ typedef enum OMX_OBJDETECTQUALITY{ OMX_Default, /**< The default detection, should be used when no control of the detection quality is given.*/ OMX_BetterDetection, /**< A detection that levels correct detection with speed*/ OMX_BestDtection, /**< A detection that prioritizes correct detection*/ - OMX_AUTODETECTION /**< Automatically decide which object detection quality is best.*/ + OMX_AUTODETECTION, /**< Automatically decide which object detection quality is best.*/ + OMX_ObjDetectQualityMax = 0x7fffffff }OMX_OBJDETECTQUALITY; /** @@ -1299,7 +1469,8 @@ typedef struct OMX_CONFIG_OBJDETECTIONTYPE { */ typedef enum OMX_DISTTYPE{ OMX_DistanceControlFocus = 0, /**< focus objects distance type*/ - OMX_DISTANCECONTROL_RECT /**< Evaluated distance to the object found in the rectangelar area indicated as input region. */ + OMX_DISTANCECONTROL_RECT, /**< Evaluated distance to the object found in the rectangelar area indicated as input region. */ + OMX_DistTypeMax = 0x7fffffff }OMX_DISTTYPE; @@ -1345,12 +1516,25 @@ typedef struct OMX_CONFIG_DISTANCETYPE { * */ typedef struct OMX_FACEATTRIBUTE { - OMX_U32 nARGBEyeColor; - OMX_U32 nARGBSkinColor; - OMX_U32 nARGBHairColor; - OMX_U32 nSmileScore; - OMX_U32 nBlinkScore; - OMX_U32 xIdentity[4]; + OMX_U32 nARGBEyeColor; /**< The indicates a 32-bit eye color of the person, + where bits 0-7 are blue, bits 15-8 are green, bits 24-16 are red, + and bits 31-24 are for alpha. */ + OMX_U32 nARGBSkinColor; /**< The indicates a 32-bit skin color of the person, + where bits 0-7 are blue, bits 15-8 are green, bits 24-16 are red, + and bits 31-24 are for alpha */ + OMX_U32 nARGBHairColor; /**< the indicates a 32-bit hair color of the person, + where bits 0-7 are blue, bits 15-8 are green, bits 24-16 are red, + and bits 31-24 are for alpha */ + OMX_U32 nSmileScore; /**< Smile detection score between 0 and 100, where 0 means not detecting, + 1 means least certain and 100 means most certain a smile is detected */ + OMX_U32 nBlinkScore; /**< Eye-blink detection score between 0 and 100, where 0 means not detecting, + 1 means least certain and 100 means most certain an eye-blink is detected */ + OMX_U32 xIdentity[4]; /**< represents the identity of the face. With identity equal to zero this is not supported. + This can be used by a face recognition application. + The component shall not reuse an identity value unless the same face. + Can be used to track detected faces when it moves between frames. + Specific usage of this field is implementation dependent. + It can be some kind of ID */ } OMX_FACEATTRIBUTE; /** @@ -1376,16 +1560,22 @@ typedef struct OMX_TI_FACERESULT { OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_TI_CAMERAVIEWTYPE eCameraView; - OMX_U32 nScore; - OMX_S32 nLeft; - OMX_S32 nTop; -OMX_U32 nWidth; -OMX_U32 nHeight; + OMX_U32 nScore; /**< Detection score between 0 and 100, where 0 means unknown score, + 1 means least certain and 100 means most certain the detection is correct */ + OMX_S32 nLeft; /**< The leftmost coordinate of the detected area rectangle */ + OMX_S32 nTop; /**< The topmost coordinate of the detected area rectangle */ + OMX_U32 nWidth; /**< The width of the detected area rectangle in pixels */ + OMX_U32 nHeight; /**< The height of the detected area rectangle in pixels */ + // The orientation of the axis of the detected object. + // Here roll angle is defined as the angle between the vertical axis of face and the horizontal axis. + // All angles can have the value of -180 to 180 degree in Q16 format. + // Some face detection algorithm may not be able to fill in the angles, this is denoted by the use of MAX_INT value. OMX_S32 nOrientationRoll; OMX_S32 nOrientationYaw; OMX_S32 nOrientationPitch; -OMX_U32 nPriority; -OMX_FACEATTRIBUTE nFaceAttr; + // + OMX_U32 nPriority; /**< Represents priority of each object when there are multiple objects detected */ + OMX_FACEATTRIBUTE nFaceAttr; /**< Describe the attributes of the detected face object with the following structure */ } OMX_TI_FACERESULT; @@ -1400,7 +1590,7 @@ typedef struct OMX_FACEDETECTIONTYPE { OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_TI_CAMERAVIEWTYPE eCameraView; - OMX_U16 ulFaceCount; + OMX_U16 ulFaceCount; // faces detected OMX_TI_FACERESULT tFacePosition[35];// 35 is max faces supported by FDIF } OMX_FACEDETECTIONTYPE; @@ -1426,25 +1616,24 @@ typedef struct OMX_TI_MTISTYPE { * The OMX_EXTRADATATYPE enumeration is used to define the * possible extra data payload types. */ -typedef enum OMX_EXT_EXTRADATATYPE -{ - OMX_ExifAttributes = 0x7F000001, /**< Reserved region for introducing Vendor Extensions */ +typedef enum OMX_EXT_EXTRADATATYPE { + OMX_ExifAttributes = 0x7F000001, /**< 0x7F000001 Reserved region for introducing Vendor Extensions */ OMX_AncillaryData, /**< 0x7F000002 ancillary data */ OMX_WhiteBalance, /**< 0x7F000003 white balance resultant data */ OMX_UnsaturatedRegions, /**< 0x7F000004 unsaturated regions data */ - OMX_FaceDetection, /**< face detect data */ - OMX_BarcodeDetection, /**< bar-code detct data */ - OMX_FrontObjectDetection, /**< Front object detection data */ - OMX_MotionEstimation, /**< motion Estimation data */ - OMX_TI_MTISType, /**< 0x7F000009 MTIS motion Estimation data */ - OMX_DistanceEstimation, /**< disctance estimation */ - OMX_Histogram, /**< histogram */ - OMX_FocusRegion, /**< focus region data */ + OMX_FaceDetection, /**< 0x7F000005 face detect data */ + OMX_BarcodeDetection, /**< 0x7F000006 bar-code detct data */ + OMX_FrontObjectDetection, /**< 0x7F000007 Front object detection data */ + OMX_MotionEstimation, /**< 0x7F000008 motion Estimation data */ + OMX_MTISType, /**< 0x7F000009 MTIS motion Estimation data */ + OMX_DistanceEstimation, /**< 0x7F00000A disctancedistance estimation */ + OMX_Histogram, /**< 0x7F00000B histogram */ + OMX_FocusRegion, /**< 0x7F00000C focus region data */ OMX_ExtraDataPanAndScan, /**< 0x7F00000D pan and scan data */ - OMX_RawFormat, /**< custom RAW data format */ - OMX_SensorType, /**< vendor & model of the sensor being used */ - OMX_SensorCustomDataLength, /**< vendor specific custom data length */ - OMX_SensorCustomData, /**< vendor specific data */ + OMX_RawFormat, /**< 0x7F00000E custom RAW data format */ + OMX_SensorType, /**< 0x7F00000F vendor & model of the sensor being used */ + OMX_SensorCustomDataLength, /**< 0x7F000010 vendor specific custom data length */ + OMX_SensorCustomData, /**< 0x7F000011 vendor specific data */ OMX_TI_FrameLayout, /**< 0x7F000012 vendor specific data */ OMX_TI_SEIinfo2004Frame1, /**< 0x7F000013 Used for 2004 SEI message to be provided by video decoders */ OMX_TI_SEIinfo2004Frame2, /**< 0x7F000014 Used for 2004 SEI message to be provided by video decoders */ @@ -1453,8 +1642,24 @@ typedef enum OMX_EXT_EXTRADATATYPE OMX_TI_RangeMappingInfo, /**< 0x7F000017 Used for Range mapping info provided by Video Decoders */ OMX_TI_RescalingInfo, /**< 0x7F000018 Used for width/height rescaling info provided by Video Decoders */ OMX_TI_WhiteBalanceOverWrite, /**< 0x7F000019 Used for manual AWB settings */ + OMX_TI_CPCamData, /**< 0x7F00001A Used for cp cam data */ + OMX_TI_H264ESliceDataInfo, /**< 0x7F00001B */ + OMX_TI_DccData, /**< 0x7F00001C Used for dcc data overwrite in the file system */ + OMX_TI_ProfilerData, /**< 0x7F00001D Used for profiling data */ + OMX_TI_VectShotInfo, /**< 0x7F00001E Used for vector shot feedback notification */ + OMX_TI_CamReProcMeta, /**< 0x7F00001F Used for meta data input to camera re-proc function */ + OMX_TI_LSCTable, /**< 0x7F000020 Lens shading table for corresponding frame */ + OMX_TI_CodecExtenderErrorFrame1, /**< 0x7F000021 Used for Codec Extended Error to be provided byvideo decoders */ + OMX_TI_CodecExtenderErrorFrame2, /**< 0x7F000022 Used for Codec Extended Error to be provided byvideo decoders */ + OMX_TI_MBInfoFrame1, /**< 0x7F000023 Used for MBError message to be provided by videodecoders */ + OMX_TI_MBInfoFrame2, /**< 0x7F000024 Used for MBError message to be provided by videodecoders */ + OMX_TI_SEIInfoFrame1, /**< 0x7F000025 Used for SEI message to be provided by video decoders*/ + OMX_TI_SEIInfoFrame2, /**< 0x7F000026 Used for SEI message to be provided by video decoders*/ + OMX_TI_VUIInfoFrame1, /**< 0x7F000027 Used for VUI message to be provided by video decoders */ + OMX_TI_VUIInfoFrame2, /**< 0x7F000028 Used for VUI message to be provided by video decoders */ OMX_TI_ExtraData_Count, OMX_TI_ExtraData_Max = OMX_TI_ExtraData_Count - 1, + OMX_TI_ExtraData_32Bit_Patch = 0x7fffffff } OMX_EXT_EXTRADATATYPE; @@ -1472,11 +1677,12 @@ typedef enum OMX_EXT_EXTRADATATYPE * */ typedef struct OMX_CONFIG_EXTRADATATYPE { - OMX_U32 nSize; + OMX_U32 nSize; /**< The size of the structure including data bytes + and any padding necessary to ensure 32bit alignment + of the next OMX_OTHER_EXTRADATATYPE structure */ OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_EXT_EXTRADATATYPE eExtraDataType; - OMX_TI_CAMERAVIEWTYPE eCameraView; + OMX_U32 nPortIndex; /**< The read-only value containing the index of the port */ + OMX_EXT_EXTRADATATYPE eExtraDataType; /**< Identifies the extra data payload type */ OMX_BOOL bEnable; } OMX_CONFIG_EXTRADATATYPE; @@ -1487,7 +1693,8 @@ typedef struct OMX_CONFIG_EXTRADATATYPE { typedef enum OMX_JPEGHEADERTYPE{ OMX_NoHeader = 0, OMX_JFIF, - OMX_EXIF + OMX_EXIF, + OMX_JpegHeaderTypeMax = 0x7fffffff }OMX_JPEGHEADERTYPE; /** * Re-start marker configuration @@ -1553,7 +1760,8 @@ typedef struct OMX_IMAGE_JPEGMAXSIZE { typedef enum OMX_IMAGESTAMPOPERATION{ OMX_NewImageStamp = 0, - OMX_Continuation + OMX_Continuation, + OMX_ImageStapOperationMax = 0x7fffffff }OMX_IMAGESTAMPOPERATION; @@ -1759,22 +1967,6 @@ typedef struct OMX_TI_PARAM_DCCURIINFO { } OMX_TI_PARAM_DCCURIINFO; /** - * Structure used to configure DCC buffer - * - * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nDCCURIBuffSize : Size of the pDCCURIBuff in bytes - * pDCCURIBuff : Pointer to a buffer - */ -typedef struct OMX_TI_PARAM_DCCURIBUFFER { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nDCCURIBuffSize; - OMX_U8 *pDCCURIBuff; -} OMX_TI_PARAM_DCCURIBUFFER; - -/** * Manual White Balance color temperature * STRUCT MEMBERS: * nSize : Size of the structure in bytes @@ -1794,10 +1986,10 @@ typedef struct OMX_TI_CONFIG_WHITEBALANCECOLORTEMPTYPE { */ typedef enum OMX_TI_CONFIG_FOCUSSPOTMODETYPE { OMX_FocusSpotDefault = 0, /** Makes CommonFocusRegion to be used. */ - OMX_FocusSpotSinglecenter, - OMX_FocusSpotMultiNormal, - OMX_FocusSpotMultiAverage, - OMX_FocusSpotMultiCenter, + OMX_FocusSpotSinglecenter, /** Only central part of the image is used for focus. */ + OMX_FocusSpotMultiNormal, /** Middle part of the image is used with 100% weight, upper and lower parts are with 50%. */ + OMX_FocusSpotMultiAverage, /** All the image is used with 100% weight. */ + OMX_FocusSpotMultiCenter, /** Central part of the image is used with 100% weight, the rest is used with 50%. */ OMX_FocusSpotExtensions = 0x6F000000, /** Reserved region for introducing Khronos Standard Extensions */ OMX_FocusSpotModeStartUnused = 0x7F000000, /** Reserved region for introducing Vendor Extensions */ OMX_FocusSpotModeMax = 0x7FFFFFFF @@ -1823,7 +2015,9 @@ typedef struct OMX_TI_CONFIG_FOCUSSPOTWEIGHTINGTYPE { * Enumeration of possible Exposure control types for OMX_EXPOSURECONTROLTYPE */ typedef enum OMX_TI_EXTEXPOSURECONTROLTYPE { - OMX_TI_ExposureControlVeryLong = OMX_ExposureControlVendorStartUnused + 1 + OMX_TI_ExposureControlVeryLong = OMX_ExposureControlVendorStartUnused + 1, + OMX_TI_ExposureControlFacePriority, + OMX_TI_ExposureControlMax = 0x7fffffff } OMX_TI_EXTEXPOSURECONTROLTYPE; /** @@ -1919,6 +2113,8 @@ typedef enum OMX_TI_STEREOFRAMELAYOUTTYPE { OMX_TI_StereoFrameLayout2D, OMX_TI_StereoFrameLayoutTopBottom, OMX_TI_StereoFrameLayoutLeftRight, + OMX_TI_StereoFrameLayoutTopBottomSubsample, + OMX_TI_StereoFrameLayoutLeftRightSubsample, OMX_TI_StereoFrameLayoutMax = 0x7FFFFFFF } OMX_TI_STEREOFRAMELAYOUTTYPE; @@ -1942,14 +2138,11 @@ typedef struct OMX_TI_FRAMELAYOUTTYPE { * extended color format types. */ typedef enum OMX_TI_COLOR_FORMATTYPE { - OMX_TI_COLOR_FormatYUV420PackedSemiPlanarInterlaced = - (OMX_COLOR_FORMATTYPE) OMX_COLOR_FormatVendorStartUnused + 1, OMX_TI_COLOR_FormatRawBayer10bitStereo = OMX_COLOR_FormatVendorStartUnused + 2, /**< 10 bit raw for stereo */ OMX_TI_COLOR_FormatYUV420PackedSemiPlanar = (OMX_COLOR_FORMATTYPE) OMX_COLOR_FormatVendorStartUnused + 0x100, /* 0x100 is used since it is the corresponding HAL pixel fromat */ - OMX_COLOR_FormatAndroidOpaque = - (OMX_COLOR_FORMATTYPE) OMX_COLOR_FormatVendorStartUnused + 0x789 /**< Platform specified opaque format set to unique value 0x789*/ + OMX_TI_ColorFormatTypeMax = 0x7fffffff } OMX_TI_COLOR_FORMATTYPE; /** @@ -2232,14 +2425,30 @@ typedef struct OMX_TI_CONFIG_EXIF_TAGS { } OMX_TI_CONFIG_EXIF_TAGS; /** + * The OMX_TI_SENFACING_TYPE enumeration is used to define the + * sensor facing. + */ +typedef enum OMX_TI_SENFACING_TYPE { + OMX_TI_SENFACING_FRONT, + OMX_TI_SENFACING_BACK, + OMX_TI_SENFACING_MAX = 0x7FFFFFFF +}OMX_TI_SENFACING_TYPE; + +/** * Structure used to configure current OMX_TI_SENMOUNT_TYPE * * @param nSenId * @param nRotation + * @param bMirror + * @param bFlip + * @param eFacing */ typedef struct OMX_TI_SENMOUNT_TYPE { OMX_U32 nSenId; OMX_U32 nRotation; + OMX_BOOL bMirror; + OMX_BOOL bFlip; + OMX_TI_SENFACING_TYPE eFacing; }OMX_TI_SENMOUNT_TYPE; /** @@ -2282,15 +2491,17 @@ typedef struct OMX_TI_CONFIG_SHAREDBUFFER { * nHeightMin : Number of the smallest height supported * nWidthMax : Number of the biggest width supported * nHeightMax : Number of the biggest height supported + * nMaxResInPixels : Max resolution in pixels. Used for description of 3d resolutions. */ typedef struct OMX_TI_CAPRESTYPE { - OMX_U32 nSize; + OMX_U32 nSize; //- OMX struct header not required as this struct wont be queried on its own? OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_U32 nWidthMin; // smallest width supported OMX_U32 nHeightMin; // smallest height supported OMX_U32 nWidthMax; // biggest width supported OMX_U32 nHeightMax; // biggest height supported + OMX_U32 nMaxResInPixels;// max resolution in pixels } OMX_TI_CAPRESTYPE; /** @@ -2305,6 +2516,7 @@ typedef struct OMX_TI_CAPRESTYPE { * ulImageFormatCount : Number of the supported image pixelformat count * eImageFormats : Array containing the supported image pixelformat count * tPreviewResRange : Supported preview resolution range + * tRotatedPreviewResRange : Supported rotated preview resolution range * tImageResRange : Supported image resolution range * tThumbResRange : Supported thumbnail resolution range * ulWhiteBalanceCount : Supported whitebalance mode count @@ -2340,53 +2552,130 @@ typedef struct OMX_TI_CAPRESTYPE { * ulCapVarFPSModesCount : Number of capture FPS modes * tCapVarFPSModes : Capture FPS modes * tSenMounting : Sensor mount information + * ulAutoConvModesCount : Supported auto convergence modes count + * eAutoConvModes : Array containing the auto convergence modes + * ulBracketingModesCount : Supported bracketing modes count + * eBracketingModes : Array containing the bracketing modes + * bGbceSupported : Flag showing if the Gbce is supported + * bRawJpegSupported : Flag showing if the Raw + Jpeg is supported + * ulImageCodingFormatCount : Supported image coding formats count + * eImageCodingFormat : Array containing the image coding formats + * uSenNativeResWidth : Sensor native resolution width + * uSenNativeResHeight : Sensor native resolution height + * ulAlgoAreasFocusCount : Supported number of AlgoAreas for focus areas + * ulAlgoAreasExposureCount : Supported number of AlgoAreas for exposure areas + * bAELockSupported : Flag showing if the AE Lock is supported + * bAWBLockSupported : Flag showing if the AWB Lock is supported + * bAFLockSupported : Flag showing if the Af Lock is supported + * nFocalLength : Focal length defined in terms of 0.01mm + * ulPrvFrameLayoutCount : supported frame layout count for preview + * ePrvFrameLayout : Array containing the frame layouts for preview + * ulCapFrameLayoutCount : supported frame layout count for capture + * eCapFrameLayout : Array containing the frame layouts for capture + * bVideoNoiseFilterSupported : Flag showing if the video noise filter is supported + * bVideoStabilizationSupported : Flag showing if the video stabilization is supported + * bStillCapDuringVideoSupported : Flag showing if the still capture is supported during video + * bMechanicalMisalignmentSupported : Flag showing if the mechanical misalignment is supported + * bFacePrioritySupported : Flag showing if the face priority is supported + * bRegionPrioritySupported : Flag showing if the region priority is supported + * bGlbceSupported : Flag showing if the GLBCE is supported + * nManualConvMin : Manual convergence min value + * nManualConvMax : Manual convergence max value + * nManualExpMin : Manual exposure time min value + * nManualExpMax : Manual exposure time max value + * nBrightnessMin : Brightness min value + * nBrightnessMax : Brightness max value + * nContrastMin : Contrast min value + * nContrastMax : Contrast max value + * nSharpnessMin : Sharpness min value + * nSharpnessMax : Sharpness max value + * nSaturationMin : Saturation min value + * nSaturationMax : Saturation max value */ typedef struct OMX_TI_CAPTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U16 ulPreviewFormatCount; // supported preview pixelformat count - OMX_COLOR_FORMATTYPE ePreviewFormats[100]; - OMX_U16 ulImageFormatCount; // supported image pixelformat count - OMX_COLOR_FORMATTYPE eImageFormats[100]; - OMX_TI_CAPRESTYPE tPreviewResRange; // supported preview resolution range - OMX_TI_CAPRESTYPE tImageResRange; // supported image resolution range - OMX_TI_CAPRESTYPE tThumbResRange; // supported thumbnail resolution range - OMX_U16 ulWhiteBalanceCount; // supported whitebalance mode count - OMX_WHITEBALCONTROLTYPE eWhiteBalanceModes[100]; - OMX_U16 ulColorEffectCount; // supported effects count - OMX_IMAGEFILTERTYPE eColorEffects[100]; - OMX_S32 xMaxWidthZoom; // Fixed point value stored as Q16 - OMX_S32 xMaxHeightZoom; // Fixed point value stored as Q16 - OMX_U16 ulFlickerCount; // supported anti-flicker mode count - OMX_COMMONFLICKERCANCELTYPE eFlicker[100]; - OMX_U16 ulExposureModeCount; // supported exposure mode count - OMX_EXPOSURECONTROLTYPE eExposureModes[100]; - OMX_BOOL bLensDistortionCorrectionSupported; - OMX_BOOL bISONoiseFilterSupported; - OMX_S32 xEVCompensationMin; // Fixed point value stored as Q16 - OMX_S32 xEVCompensationMax; // Fixed point value stored as Q16 - OMX_U32 nSensitivityMax; // nSensitivityMax = 100 implies maximum supported equal to "ISO 100" - OMX_U16 ulFocusModeCount; // supported focus mode count - OMX_IMAGE_FOCUSCONTROLTYPE eFocusModes[100]; - OMX_U16 ulSceneCount; // supported scene count - OMX_SCENEMODETYPE eSceneModes[100]; - OMX_U16 ulFlashCount; // supported flash modes count - OMX_IMAGE_FLASHCONTROLTYPE eFlashModes[100]; - OMX_U32 xFramerateMin; // Fixed point value stored as Q16 - OMX_U32 xFramerateMax; // Fixed point value stored as Q16 - OMX_BOOL bContrastSupported; - OMX_BOOL bSaturationSupported; - OMX_BOOL bBrightnessSupported; - OMX_BOOL bProcessingLevelSupported; - OMX_BOOL bQFactorSupported; - OMX_U16 ulPrvVarFPSModesCount; // supported variable FPS preview modes count - OMX_TI_VARFPSTYPE tPrvVarFPSModes[10]; - OMX_U16 ulCapVarFPSModesCount; // supported variable FPS capture modes count - OMX_TI_VARFPSTYPE tCapVarFPSModes[10]; - OMX_TI_SENMOUNT_TYPE tSenMounting; - OMX_U16 ulAlgoAreasFocusCount; // supported number of AlgoAreas for focus areas - OMX_U16 ulAlgoAreasExposureCount; // supported number of AlgoAreas for exposure areas + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U16 ulPreviewFormatCount; // supported preview pixelformat count + OMX_COLOR_FORMATTYPE ePreviewFormats[32]; + OMX_U16 ulImageFormatCount; // supported image pixelformat count + OMX_COLOR_FORMATTYPE eImageFormats[32]; + OMX_TI_CAPRESTYPE tPreviewResRange; // supported preview resolution range + OMX_TI_CAPRESTYPE tRotatedPreviewResRange; // supported rotated preview resolution range + OMX_TI_CAPRESTYPE tImageResRange; // supported image resolution range + OMX_TI_CAPRESTYPE tThumbResRange; // supported thumbnail resolution range + OMX_U16 ulWhiteBalanceCount; // supported whitebalance mode count + OMX_WHITEBALCONTROLTYPE eWhiteBalanceModes[32]; + OMX_U16 ulColorEffectCount; // supported effects count + OMX_IMAGEFILTERTYPE eColorEffects[32]; + OMX_S32 xMaxWidthZoom; // Fixed point value stored as Q16 + OMX_S32 xMaxHeightZoom; // Fixed point value stored as Q16 + OMX_U16 ulFlickerCount; // supported anti-flicker mode count + OMX_COMMONFLICKERCANCELTYPE eFlicker[32]; + OMX_U16 ulExposureModeCount; // supported exposure mode count + OMX_EXPOSURECONTROLTYPE eExposureModes[32]; + OMX_BOOL bLensDistortionCorrectionSupported; + OMX_BOOL bISONoiseFilterSupported; + OMX_S32 xEVCompensationMin; // Fixed point value stored as Q16 + OMX_S32 xEVCompensationMax; // Fixed point value stored as Q16 + OMX_U32 nSensitivityMax; // nSensitivityMax = 100 implies maximum supported equal to "ISO 100" + OMX_U16 ulFocusModeCount; // supported focus mode count + OMX_IMAGE_FOCUSCONTROLTYPE eFocusModes[32]; + OMX_U16 ulSceneCount; // supported scene count + OMX_SCENEMODETYPE eSceneModes[64]; + OMX_U16 ulFlashCount; // supported flash modes count + OMX_IMAGE_FLASHCONTROLTYPE eFlashModes[32]; + OMX_U32 xFramerateMin; // Fixed point value stored as Q16 + OMX_U32 xFramerateMax; // Fixed point value stored as Q16 + OMX_BOOL bContrastSupported; + OMX_BOOL bSaturationSupported; + OMX_BOOL bBrightnessSupported; + OMX_BOOL bProcessingLevelSupported; + OMX_BOOL bQFactorSupported; + OMX_U16 ulPrvVarFPSModesCount; // supported variable FPS preview modes count + OMX_TI_VARFPSTYPE tPrvVarFPSModes[10]; + OMX_U16 ulCapVarFPSModesCount; // supported variable FPS capture modes count + OMX_TI_VARFPSTYPE tCapVarFPSModes[10]; + OMX_TI_SENMOUNT_TYPE tSenMounting; + OMX_U16 ulAutoConvModesCount; // supported auto convergence modes count + OMX_TI_AUTOCONVERGENCEMODETYPE eAutoConvModes[32]; + OMX_U16 ulBracketingModesCount; // supported bracketing modes count + OMX_BRACKETMODETYPE eBracketingModes[32]; + OMX_BOOL bGbceSupported; // Flag showing if the Gbce is supported + OMX_BOOL bRawJpegSupported; // Flag showing if the Raw + Jpeg issupported + OMX_U16 ulImageCodingFormatCount; + OMX_IMAGE_CODINGTYPE eImageCodingFormat[32]; + OMX_U16 uSenNativeResWidth; + OMX_U16 uSenNativeResHeight; + OMX_U16 ulAlgoAreasFocusCount; + OMX_U16 ulAlgoAreasExposureCount; + OMX_BOOL bAELockSupported; + OMX_BOOL bAWBLockSupported; + OMX_BOOL bAFLockSupported; + OMX_U16 nFocalLength; + OMX_U16 ulPrvFrameLayoutCount; // supported frame layout count + OMX_TI_STEREOFRAMELAYOUTTYPE ePrvFrameLayout[16]; + OMX_U16 ulCapFrameLayoutCount; // supported frame layout count + OMX_TI_STEREOFRAMELAYOUTTYPE eCapFrameLayout[16]; + OMX_BOOL bVideoNoiseFilterSupported; + OMX_BOOL bVideoStabilizationSupported; + OMX_BOOL bStillCapDuringVideoSupported; + OMX_BOOL bMechanicalMisalignmentSupported; + OMX_BOOL bFacePrioritySupported; + OMX_BOOL bRegionPrioritySupported; + OMX_BOOL bGlbceSupported; + OMX_S16 nManualConvMin; + OMX_S16 nManualConvMax; + OMX_U16 nManualExpMin; + OMX_U16 nManualExpMax; + OMX_S16 nBrightnessMin; + OMX_S16 nBrightnessMax; + OMX_S16 nContrastMin; + OMX_S16 nContrastMax; + OMX_S16 nSharpnessMin; + OMX_S16 nSharpnessMax; + OMX_S16 nSaturationMin; + OMX_S16 nSaturationMax; } OMX_TI_CAPTYPE; @@ -2467,25 +2756,6 @@ typedef struct OMX_TI_CONFIG_FOCUSDISTANCETYPE { OMX_S32 nLensPosition; } OMX_TI_CONFIG_FOCUSDISTANCETYPE; -/* -* STRUCT MEMBERS: -* nSize : Size of the structure in bytes -* nVersion : OMX specification version information -* nPortIndex : Port that this structure applies to -* pAAAskipBuff : Pointer to a buffer -* AAAskipBuffId : Id of the send buffer -* AAAskipBuffSize : Size of the sent buffer -*/ -typedef struct OMX_TI_CONFIG_AAASKIPBUFFERTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_PTR pAAAskipBuff; - OMX_U32 AAAskipBuffId; - OMX_U32 AAAskipBuffSize; -} OMX_TI_CONFIG_AAASKIPBUFFERTYPE; - - /** * The OMX_TI_BRIGHTNESSCONTRASTCRTLTYPE enumeration is used to define the * brightness and contrast mode types. @@ -2532,6 +2802,459 @@ typedef struct OMX_TI_CONFIG_VARFRMRANGETYPE { } OMX_TI_CONFIG_VARFRMRANGETYPE; /** + * Single preview capture modes + */ + typedef enum OMX_TI_SINGLEPREVIEWMODETYPE { + OMX_TI_SinglePreviewMode_PreviewOnly, + OMX_TI_SinglePreviewMode_Video, + OMX_TI_SinglePreviewMode_ImageCapture, + OMX_TI_SinglePreviewMode_ImageCaptureHighSpeed, + OMX_TI_SinglePreviewMode_Reprocess, + OMX_TI_SinglePreviewMode = 0x7FFFFFFF + } OMX_TI_SINGLEPREVIEWMODETYPE; + +/** + * Define configuration structure for + * single preview capture mode + * + * STRUCT MEMBERS: + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * eMode : Select the subusecase mode (Video/HQ/HS) + */ + typedef struct OMX_TI_CONFIG_SINGLEPREVIEWMODETYPE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_TI_SINGLEPREVIEWMODETYPE eMode; + } OMX_TI_CONFIG_SINGLEPREVIEWMODETYPE; + + +/** + * Configuratin structure for freeze AWB parameter modifications. + * + * @param nSize Size of the structure in bytes. + * @param nVersion OMX specification version information. + * @param nPortIndex Port index to which to apply. + * @param nTimeDelay Time for which the AWB parameters to be frozen. + * measured in milliseconds + */ + typedef struct OMX_TI_CONFIG_FREEZE_AWB { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U32 nTimeDelay; + } OMX_TI_CONFIG_FREEZE_AWB; + +/** + * Configuration structure used to set + * minimum time between two sequential WB coefficients modifications. + * + * @param nSize Size of the structure in bytes. + * @param nVersion OMX specification version information. + * @param nPortIndex Port index to which to apply. + * @param nDelayTime The time in milliseconds. + */ + typedef struct OMX_TI_CONFIG_AWB_DELAY { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U32 nDelayTime; + } OMX_TI_CONFIG_AWB_DELAY; + +/** + * Configuration structure used to set + * minimum time delay between + * two sequential AE parameters modifications + * + * @param nSize Size of the structure in bytes. + * @param nVersion OMX specification version information. + * @param nPortIndex Port index to which to apply. + * @param nDelayTime The time in milliseconds. + */ + typedef struct OMX_TI_CONFIG_AE_DELAY { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U32 nDelayTime; + } OMX_TI_CONFIG_AE_DELAY; + + +/** + * Configuration structure used to freeze AE modifications + * for a nTimeDelay milliseconds + * + * @param nSize Size of the structure in bytes. + * @param nVersion OMX specification version information. + * @param nPortIndex Port index to which to apply. + * @param nTimeDelay The time in milliseconds. + */ + typedef struct OMX_TI_CONFIG_FREEZE_AE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U32 nTimeDelay; + } OMX_TI_CONFIG_FREEZE_AE; + +/** + * Configuration structure used to set + * the AE gain threshold + * + * @param nSize Size of the structure in bytes. + * @param nVersion OMX specification version information. + * @param uMinTH Minimum value for AE gain. + * @param uMaxTH Maximum value for AE gain. + */ + typedef struct OMX_TI_CONFIG_AE_THRESHOLD { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U32 uMinTH; + OMX_U32 uMaxTH; + } OMX_TI_CONFIG_AE_THRESHOLD; + +/** + * Enumeration describing the main gestures + */ + typedef enum OMX_TI_GESTURES_TYPE { + OMX_TI_GESTURE_NO_GESTURE = 0x70000001, + OMX_TI_GESTURE_SWIPE_RIGHT, + OMX_TI_GESTURE_SWIPE_LEFT, + OMX_TI_GESTURE_FIST_RIGHT, + OMX_TI_GESTURE_FIST_LEFT, + + OMX_TI_GESTURE_COUNT, + OMX_TI_GESTURE_MAX = 0x7FFFFFFF + } OMX_TI_GESTURES_TYPE; + +/** + * Enumeration describing the main gesture objects + */ + typedef enum OMX_TI_OBJECT_TYPE { + OMX_TI_OBJECT_PALM, + OMX_TI_OBJECT_FIST, + OMX_TI_OBJECT_FACE, + + OMX_TI_OBJECT_MAX = 0x7FFFFFFF + } OMX_TI_OBJECT_TYPE; + +/** + * Data structure carrying information about + * objects located at a certain area of frame buffer. + * + * @param nSize Size of the structure in bytes. + * @param nVersion OMX specification version information. + * @param nPortIndex Port index to which to apply. + * @param eType The object type. + * @param nTop The top coordinate. + * @param nLeft The left coordinate. + * @param nWidth The width of the object. + * @param nHeight The height of the object. + */ + typedef struct OMX_CONFIG_OBJECT_RECT_TYPE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_TI_OBJECT_TYPE eType; + OMX_S32 nTop; + OMX_S32 nLeft; + OMX_U32 nWidth; + OMX_U32 nHeight; + } OMX_CONFIG_OBJECT_RECT_TYPE; + +/** + * Data structure carrying information about + * gestures detected at a certain frame. + * + * @param nSize Size of the structure in bytes. + * @param nVersion OMX specification version information. + * @param nPortIndex Port index to which to apply. + * @param nTimeStamp Frame id. + * @param eType Type of the gesture detected at that frame. + * @param nNumDetectedGestures Number ot the areas of the frame in which this gesture is detected. + * @param nGestureAreas The areas where this gesture is detected. + */ + typedef struct OMX_TI_CONFIG_GESTURES_INFO { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_TICKS nTimeStamp; + OMX_TI_GESTURES_TYPE eType; + OMX_U32 nNumDetectedGestures; + OMX_CONFIG_OBJECT_RECT_TYPE nGestureAreas[35]; + } OMX_TI_CONFIG_GESTURES_INFO; + +/** +* Define the frames queue len for ZSL +* +* STRUCT MEMBERS: +* nSize: Size of the structure in bytes +* nVersion: OMX specification version information +* nHistoryLen: History len in number of frames +*/ + typedef struct OMX_TI_PARAM_ZSLHISTORYLENTYPE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nHistoryLen; + } OMX_TI_PARAM_ZSLHISTORYLENTYPE; + +/** +* Define the frame delay in ms for ZSL +* +* STRUCT MEMBERS: +* nSize: Size of the structure in bytes +* nVersion: OMX specification version information +* nDelay: Capture frame delay in ms +*/ + typedef struct OMX_TI_CONFIG_ZSLDELAYTYPE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_S32 nDelay; + } OMX_TI_CONFIG_ZSLDELAYTYPE; + +/** +* AlogAreas purpose +* This type specifies the purpose of areas specified in OMX_ALGOAREASTYPE. +* */ + typedef enum OMX_ALGOAREAPURPOSE{ + OMX_AlgoAreaFocus = 0, // Multi region focus + OMX_AlgoAreaExposure, + }OMX_ALGOAREAPURPOSE; + + typedef struct OMX_ALGOAREA { + OMX_S32 nLeft; /**< The leftmost coordinate of the area rectangle */ + OMX_S32 nTop; /**< The topmost coordinate of the area rectangle */ + OMX_U32 nWidth; /**< The width of the area rectangle in pixels */ + OMX_U32 nHeight; /**< The height of the area rectangle in pixels */ + OMX_U32 nPriority; /**< Priority - ranges from 1 to 1000 */ + }OMX_ALGOAREA; + +/** +* Algorythm areas type +* This type defines areas for Multi Region Focus, +* or another algorithm region parameters, +* such as Multi Region Auto Exposure. +* +* STRUCT MEMBERS: +* nSize : Size of the structure in bytes +* nVersion : OMX specification version information +* nPortIndex : Port index +* tAreaPosition : Area definition - coordinates and purpose - Multi Region Focus, Auto Exposure, etc. +* nNumAreas : Number of areas defined in the array +* nAlgoAreaPurpose : Algo area purpose - eg. Multi Region Focus is OMX_AlgoAreaFocus +*/ + typedef struct OMX_ALGOAREASTYPE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + + OMX_U32 nNumAreas; + OMX_ALGOAREA tAlgoAreas[MAX_ALGOAREAS]; + OMX_ALGOAREAPURPOSE nAlgoAreaPurpose; + } OMX_ALGOAREASTYPE; + +/*==========================================================================*/ +/*! +@brief OMX_TI_PARAM_ENHANCEDPORTRECONFIG : Suport added to new port reconfig usage +@param bUsePortReconfigForCrop Enables port reconfig for crop. +@param bUsePortReconfigForPadding Enables port reconfig for padding +*/ +/*==========================================================================*/ + +typedef struct OMX_TI_PARAM_ENHANCEDPORTRECONFIG { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_BOOL bUsePortReconfigForCrop; + OMX_BOOL bUsePortReconfigForPadding; +} OMX_TI_PARAM_ENHANCEDPORTRECONFIG; + + +typedef struct { + OMX_U16 nVPos; //!< AEWINSTART WINSV //AFPAXSTART PAXSV + OMX_U8 nVSize; //!< AEWWIN1 WINW //AFPAX1 PAXH + OMX_U16 nHPos; //!< AEWINSTART WINSH //AFPAXSTART PAXSH + OMX_U8 nHSize; //!< AEWWIN1 WINH //AFPAX1 PAXW + OMX_U8 nVCount; //!< AEWWIN1 WINVC //AFPAX2 PAXVC + OMX_U8 nVIncr; //!< AEWSUBWIN AEWINCV //AFPAX2 AFINCV + OMX_U8 nHCount; //!< AEWWIN1 WINHC //AFPAX2 PAXHC + OMX_U8 nHIncr; //!< AEWSUBWIN AEWINCH //AFPAX2 AFINCH +}OMX_TI_H3aPAXELCFG; + +typedef struct { + /** Average value for red pixels in current paxel */ + OMX_U16 red; + /** Average value for green pixels in current paxel */ + OMX_U16 green; + /** Average value for blue pixels in current paxel */ + OMX_U16 blue; + /** Flag indicating whether current paxel is valid 0:invalid, !0:valid */ + OMX_U16 valid; +} OMX_TI_H3AAEWBPAXELDATA; + +typedef struct OMX_TI_H3AAFDATA { + OMX_U32 nSize; /**< The size of the structure + including the length of data field containing the histogram data */ + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_TI_CAMERAVIEWTYPE eCameraView; + OMX_U8 *data; +} OMX_TI_H3AAFDATA; + +/** +* Data structure carrying information about +* VTC slice height. +* +* @param nSize Size of the structure in bytes. +* @param nVersion OMX specification version information. +* @param nSliceHeight Definition of slice height. +* +* +* +* +*/ +typedef struct OMX_TI_PARAM_VTCSLICE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nSliceHeight; + OMX_U32 nInternalBuffers; + OMX_PTR IonBufhdl[2]; +} OMX_TI_PARAM_VTCSLICE; + + +/** + * nSize is the size of the structure including the length of data field containing + * the histogram data. + * nBins is the number of bins in the histogram. + * eComponentType specifies the type of the histogram bins according to enum. + * It can be selected to generate multiple component types, then the extradata struct + * is repeated for each component type. + */ +typedef struct OMX_TI_HISTOGRAMTYPE { + OMX_U32 nSize; /**< The size of the structure + including the length of data field containing the histogram data */ + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_TI_CAMERAVIEWTYPE eCameraView; + OMX_U32 nBins; /**< The number of bins in the histogram */ + OMX_HISTCOMPONENTTYPE eComponentType; /**< Specifies the type of the histogram bins according to enum. + It can be selected to generate multiple component types, + then the extradata struct is repeated for each component type */ + OMX_U8 *data; +} OMX_TI_HISTOGRAMTYPE; + + + +typedef struct OMX_TI_CPCAMDATA { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_TI_CAMERAVIEWTYPE eCameraView; + + /* Face Detect */ + OMX_U16 ulFaceCount; // faces detected + OMX_TI_FACERESULT tFacePosition[35]; // 35 is max faces supported by FDIF + + + /**** Ancillary Data ******/ + OMX_U32 nFrameNumber; + OMX_U16 nInputImageHeight; + OMX_U16 nInputImageWidth; + OMX_U16 nOutputImageHeight; + OMX_U16 nOutputImageWidth; + OMX_U16 nDigitalZoomFactor; + OMX_S16 nCropCenterColumn; + OMX_S16 nCropCenterRow; + OMX_U16 nOpticalZoomValue; + OMX_U8 nAFStatus; + OMX_U8 nAWBStatus; + OMX_U8 nAEStatus; + OMX_U32 nExposureTime; + OMX_U16 nEVCompensation; + OMX_U8 nDigitalGainValue; + OMX_U8 nAnalogGainValue; + OMX_U16 nCurrentISO; + OMX_U16 nReferenceISO; + OMX_U8 nApertureValue; + OMX_U8 nPixelRange; + OMX_U8 nCameraShake; + OMX_U8 nNumFacesDetected; + + /* Not Yet Supported */ + OMX_U16 nFocalDistance; + OMX_U16 nShotNumber; + OMX_U8 nFlashStatus; + + + /*** White Balance gains ****/ + /**< White Balance Color Temperature in Kelvins */ + OMX_U16 nColorTemperature; + + /**< Bayer applied R color channel gain in (U13Q9) */ + OMX_U16 nGainR; + + /**< Bayer applied Gr color channel gain in (U13Q9) */ + OMX_U16 nGainGR; + + /**< Bayer applied Gb color channel gain in (U13Q9) */ + OMX_U16 nGainGB; + + /**< Bayer applied B color channel gain in (U13Q9) */ + OMX_U16 nGainB; + + /* BELOW ARE NOT SUPPORTED , Default set to 0 */ + OMX_S16 nOffsetR; /**< Bayer applied R color channel offset */ + OMX_S16 nOffsetGR; /**< Bayer applied Gr color channel offset */ + OMX_S16 nOffsetGB; /**< Bayer applied Gb color channel offset */ + OMX_S16 nOffsetB; /**< Bayer applied B color channel offset */ + + + /* AEWB,AF,HIST data size */ + OMX_U32 nAewbDataSize; + OMX_U32 nAfDataSize; + OMX_U32 nHistSize; + + + + /*** H3A AF-AEW DATA ***/ + OMX_TI_H3aPAXELCFG tAfPaxelWin; + OMX_TI_H3aPAXELCFG tAewbPaxelWin; + OMX_TI_H3AAEWBPAXELDATA *tpPaxel; + OMX_TI_H3AAFDATA tH3A_Af; + /* Histogram */ + OMX_TI_HISTOGRAMTYPE Histogram; + + +} OMX_TI_CPCAMDATA; + +/** +* Start/Stop mechanical misalignment +* +* STRUCT MEMBERS: +* nSize: Size of the structure in bytes +* nVersion: OMX specification version information +* nDelay: Capture frame delay in ms +*/ + typedef struct OMX_TI_CONFIG_MM { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_BOOL bMM; + } OMX_TI_CONFIG_MM; + +/** +* Start/Stop Affine transformation for Mm/Ac +* +* STRUCT MEMBERS: +* nSize: Size of the structure in bytes +* nVersion: OMX specification version information +* bAffine: Enable / Disable +*/ + typedef struct OMX_TI_PARAM_AFFINE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_BOOL bAffine; + } OMX_TI_PARAM_AFFINE; + +/** * A pointer to this struct is passed to the OMX_SetParameter when the extension * index for the 'OMX.google.android.index.enableAndroidNativeBuffers' extension * is given. @@ -2561,91 +3284,329 @@ typedef struct OMX_TI_PARAMNATIVEBUFFERUSAGE { OMX_U32 nUsage; } OMX_TI_PARAMNATIVEBUFFERUSAGE; -/*==========================================================================*/ -/*! -@brief OMX_TI_PARAM_ENHANCEDPORTRECONFIG : Suport added to new port reconfig usage -@param bUsePortReconfigForCrop Enables port reconfig for crop. -@param bUsePortReconfigForPadding Enables port reconfig for padding -*/ -/*==========================================================================*/ - -typedef struct OMX_TI_PARAM_ENHANCEDPORTRECONFIG { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bUsePortReconfigForCrop; - OMX_BOOL bUsePortReconfigForPadding; -} OMX_TI_PARAM_ENHANCEDPORTRECONFIG; +/** + * OMX_TI_ZSL_PRIORITY_TYPE Enumerated Value + */ +typedef enum OMX_TI_ZSL_PRIORITY_TYPE { + OMX_TI_ZSL_PRIORITY_TIME, + OMX_TI_ZSL_PRIORITY_FOCUS, + OMX_TI_ZSL_PRIORITY = 0x7FFFFFFF +} OMX_TI_ZSL_PRIORITY_TYPE; /** -* Define the frames queue len for ZSL +* Define the priority tha twill be used to select ZSL frame * * STRUCT MEMBERS: * nSize: Size of the structure in bytes * nVersion: OMX specification version information -* nHistoryLen: History len in number of frames +* ePriority: Priority */ -typedef struct OMX_TI_PARAM_ZSLHISTORYLENTYPE { - OMX_U32 nSize; +typedef struct OMX_TI_CONFIG_ZSLFRAMESELECTPRIOTYPE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_TI_ZSL_PRIORITY_TYPE ePriority; +} OMX_TI_CONFIG_ZSLFRAMESELECTPRIOTYPE; + +/** +* MIPI, ECC, and CRC counters +* Mipi counter counts the frames from the MIPI receiver (CSI_RX). +* TCMD application will use this test +* to validate the MIPI channel integrity (TX to RX). +* +* STRUCT MEMBERS: +* nSize : Size of the structure in bytes +* nVersion : OMX specification version information +* nPortIndex : Port that this structure applies to +* bResetMIPICounter : if OMX_SetConfig() is called with value True +* for this parameter, the MIPICounter shall be reset to 0, by ducati. +* nMIPICounter : MIPI frame counter +* nECCCounter : ECC counter +* nCRCCounter : CRC counter +*/ +typedef struct OMX_CONFIG_MIPICOUNTERS { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_BOOL bResetMIPICounter; + OMX_U32 nMIPICounter; + OMX_U32 nECCCounter; + OMX_U32 nCRCCounter; + OMX_U32 nFifoOvfCounter; + OMX_U32 nOCPCounter; + OMX_U32 nEccCorrCounter; + OMX_U32 SoTErrCnt; + OMX_U32 SoTSyncErrCnt; + OMX_U32 ULPMCnt; + OMX_U32 ULPMExitCnt; + OMX_U32 ULPMEnterCnt; + OMX_U32 ControlErrCnt; + OMX_U32 ErrEscapeCnt; + OMX_U32 CSIRxTimeoutCnt; + OMX_U32 bStopStartCntrs; +} OMX_CONFIG_MIPICOUNTERS; + +/** +* CSI Timing Register +* +* STRUCT MEMBERS: +* nSize : Size of the structure in bytes +* nVersion : OMX specification version information +* nPortIndex : Port that this structure applies to +* nReadWrite : if OMX_SetConfig() is called with value True +* for this parameter, the ISS_CAMERARX_CORE1_REG0 register will be +* written with the supplied values below. +* nThsSettle : +* nThsTerm : +* nHsClkCfg : +*/ +typedef struct OMX_CONFIG_CSITIMINGRW { + OMX_U32 nSize; OMX_VERSIONTYPE nVersion; - OMX_U32 nHistoryLen; -} OMX_TI_PARAM_ZSLHISTORYLENTYPE; + OMX_U32 nPortIndex; + OMX_U8 nReadWrite; + OMX_U8 nThsSettle; + OMX_U8 nThsTerm; + OMX_U8 nHsClkCfg; +} OMX_CONFIG_CSITIMINGRW; /** -* Define the frame delay in ms for ZSL +* CSI Complex IO Data * * STRUCT MEMBERS: -* nSize: Size of the structure in bytes -* nVersion: OMX specification version information -* nDelay: Capture frame delay in ms +* nSize : Size of the structure in bytes +* nVersion : OMX specification version information +* nPortIndex : Port that this structure applies to +* nFrameCount : Recieved Frames on the CSI2Rx +* nLaneCount : Number of active lanes +* nCSISpeed : CSI2Rx speed */ -typedef struct OMX_TI_CONFIG_ZSLDELAYTYPE { - OMX_U32 nSize; +typedef struct OMX_CONFIG_CSICMPXIO { + OMX_U32 nSize; OMX_VERSIONTYPE nVersion; - OMX_S32 nDelay; -} OMX_TI_CONFIG_ZSLDELAYTYPE; + OMX_U32 nPortIndex; + OMX_U32 nFrameCount; + OMX_U32 nLaneCount; + OMX_U32 nCSISpeed; +} OMX_CONFIG_CSICMPXIO; /** - * AlogAreas purpose - * This type specifies the purpose of areas specified in OMX_ALGOAREASTYPE. - * */ -typedef enum OMX_ALGOAREAPURPOSE{ - OMX_AlgoAreaFocus = 0, // Multi region focus - OMX_AlgoAreaExposure, -}OMX_ALGOAREAPURPOSE; + * Auto Focus Score + * + * STRUCT MEMBERS: + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to + * nAutoFocusScore : Auto Focus Score + */ +typedef struct OMX_CONFIG_AUTOFOCUSSCORE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U32 nAutoFocusScore; +} OMX_CONFIG_AUTOFOCUSSCORE; + +/** + * Color Bar test pattern + * + * STRUCT MEMBERS: + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to + * bEnableColorBars : Enable Color Bars test pattern + */ +typedef struct OMX_CONFIG_COLORBARS { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U32 bEnableColorBars; +} OMX_CONFIG_COLORBARS; + +/** +* Sensor OTP EEEPROM data +* +* STRUCT MEMBERS: +* nSize : Size of the structure in bytes +* nVersion : OMX specification version information +* nPortIndex : Port that this structure applies to +* pData : pointer to the client's buffer +* nDataSize : size of the EEPROM data in bytes +* nClientDataSize : size of the client's buffer +* SensorIndex : index of the eeprom buffer +*/ +typedef struct OMX_CONFIG_OTPEEPROM { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_PTR pData; + OMX_U32 nDataSize; + OMX_U32 nClientDataSize; + OMX_U8 SensorIndex; +}OMX_CONFIG_OTPEEPROM; -typedef struct OMX_ALGOAREA { - OMX_S32 nLeft; /**< The leftmost coordinate of the area rectangle */ - OMX_S32 nTop; /**< The topmost coordinate of the area rectangle */ - OMX_U32 nWidth; /**< The width of the area rectangle in pixels */ - OMX_U32 nHeight; /**< The height of the area rectangle in pixels */ - OMX_U32 nPriority; /**< Priority - ranges from 1 to 1000 */ -}OMX_ALGOAREA; +/** + * The OMX_ISP_TYPE enumeration is used to define the + * TI ISP & ST ISP types. + */ +typedef enum OMX_ISP_TYPE { + OMX_TIISP = 0, + OMX_STISP= 1, + OMX_ISPUnknown +} OMX_ISP_TYPE; /** - * Algorythm areas type - * This type defines areas for Multi Region Focus, - * or another algorithm region parameters, - * such as Multi Region Auto Exposure. +* ISP Information +* +* STRUCT MEMBERS: +* nSize : Size of the structure in bytes +* nVersion : OMX specification version information +* nPortIndex : Port that this structure applies to +* eIspType : ISP Type (TI ISP/ ST ISP) +* nHardwareVersion : Hardware version of ISP +* nSoftwareVersion : Software version of ISP +*/ +typedef struct OMX_CONFIG_ISPINFO { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_ISP_TYPE eIspType; + OMX_U32 nHardwareVersion; + OMX_U32 nSoftwareVersion; + OMX_S8 cDucatiVersion[32]; +}OMX_CONFIG_ISPINFO; + +typedef enum OMX_TI_PORTTAPPOINTTYPE { + OMX_TI_PortTap_Bayer_SensorOutput, + OMX_TI_PortTap_Bayer_PostLsc, + OMX_TI_PortTap_Bayer_PreBayerToYUVConversion, + OMX_TI_PortTap_YUV_PostBayerToYUVConversion, + OMX_TI_PortTap_YUV_PreJPEGCompression, + OMX_TI_PortTap = 0x7FFFFFFF +} OMX_TI_PORTTAPPOINTTYPE; + +/** + * Define configuration structure for + * tap in/out points for the selected port * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port index - * tAreaPosition : Area definition - coordinates and purpose - Multi Region Focus, Auto Exposure, etc. - * nNumAreas : Number of areas defined in the array - * nAlgoAreaPurpose : Algo area purpose - eg. Multi Region Focus is OMX_AlgoAreaFocus - */ -typedef struct OMX_ALGOAREASTYPE { - OMX_U32 nSize; + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to + * eTapPoint : Select the tap in/out point for the port + */ +typedef struct OMX_TI_CONFIG_PORTTAPPOINTTYPE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_TI_PORTTAPPOINTTYPE eTapPoint; +} OMX_TI_CONFIG_PORTTAPPOINTTYPE; + +/** + * Available methods to apply vect shot exposure and gain + */ +typedef enum OMX_TI_EXPGAINAPPLYMETHODTYPE { + OMX_TI_EXPGAINAPPLYMETHOD_ABSOLUTE, + OMX_TI_EXPGAINAPPLYMETHOD_RELATIVE, + OMX_TI_EXPGAINAPPLYMETHOD_FORCE_RELATIVE, + OMX_TI_EXPGAINAPPLYMETHOD_FORCE_ABSOLUTE, + OMX_TI_EXPGAINAPPLYMETHOD = 0x7FFFFFFF +} OMX_TI_EXPGAINAPPLYMETHODTYPE; + +/** + * Define configuration structure for + * shot configuration for the selected port + * + * STRUCT MEMBERS: + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to + * nConfigId : A unique config identification number that will be + * put in ancillary data for the corresponding output frame + * nFrames : Number of sequential frames that will use this + * configuration + * nEC : Total exposure compensation value + * nExp : Exposure value for this configuration slot + * nGain : Gain value for this configuration slot + * eExpGainApplyMethod : Selects the method which will be used to apply exposure and gain + * bNoSnapshot : Determinates whether a snapshot image will be send + * on the preview port for this shot config + */ +typedef struct OMX_TI_CONFIG_SHOTCONFIG { + OMX_U32 nConfigId; + OMX_U32 nFrames; + OMX_S32 nEC; + OMX_S32 nExp; + OMX_S32 nGain; + OMX_TI_EXPGAINAPPLYMETHODTYPE eExpGainApplyMethod; + OMX_BOOL bNoSnapshot; +} OMX_TI_CONFIG_SHOTCONFIG; + +/** + * Define configuration structure for + * shot configuration vector for the selected port + * + * STRUCT MEMBERS: + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to + * bFlushQueue : If TRUE: Flush queue and abort processing before enqueing + * new shot configurations + * nNumConfigs : Number of valid configurations in the nShotConfig array + * nShotConfig : Array of shot configurations + * nSlotsAvilable : Return value with number of available slots in the queue + */ +typedef struct OMX_TI_CONFIG_ENQUEUESHOTCONFIGS { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_BOOL bFlushQueue; + OMX_U32 nNumConfigs; + OMX_TI_CONFIG_SHOTCONFIG nShotConfig[5]; +} OMX_TI_CONFIG_ENQUEUESHOTCONFIGS; + +/** + * Define configuration structure to + * query available/free shots in shot queue. + * Will be supported only as GetConfig function. + * + * STRUCT MEMBERS: + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to + * nAvailableShots : Number of available shots + */ +typedef struct OMX_TI_CONFIG_QUERYAVAILABLESHOTS { + OMX_U32 nSize; OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; + OMX_U32 nPortIndex; + OMX_U32 nAvailableShots; +} OMX_TI_CONFIG_QUERYAVAILABLESHOTS; - OMX_U32 nNumAreas; - OMX_ALGOAREA tAlgoAreas[MAX_ALGOAREAS]; - OMX_ALGOAREAPURPOSE nAlgoAreaPurpose; -} OMX_ALGOAREASTYPE; +/** + * Available vector shot capture stop methods + */ +typedef enum OMX_TI_VECTSHOTSTOPMETHOD { + OMX_TI_VECTSHOTSTOPMETHOD_GOTO_PREVIEW, + OMX_TI_VECTSHOTSTOPMETHOD_WAIT_IN_CAPTURE, + OMX_TI_VECTSHOTSTOPMETHOD_MAX = 0x7FFFFFFF +} OMX_TI_VECTSHOTSTOPMETHOD; +/** + * Define configuration structure to + * specify the beahvior of vector shot capture + * when the shot queue is empty + * + * STRUCT MEMBERS: + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to + * eStopMethod : Select the stop method + */ +typedef struct OMX_TI_CONFIG_VECTSHOTSTOPMETHODTYPE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_TI_VECTSHOTSTOPMETHOD eStopMethod; +} OMX_TI_CONFIG_VECTSHOTSTOPMETHODTYPE; #ifdef __cplusplus diff --git a/domx/omx_core/inc/OMX_TI_Image.h b/domx/omx_core/inc/OMX_TI_Image.h index 4035218..88f7b26 100755 --- a/domx/omx_core/inc/OMX_TI_Image.h +++ b/domx/omx_core/inc/OMX_TI_Image.h @@ -53,10 +53,11 @@ * The OMX_TI_IMAGE_CODINGTYPE enumeration is used to define the * extended image coding types. */ -typedef enum OMX_TI_IMAGE_CODINGTYPE -{ +typedef enum OMX_TI_IMAGE_CODINGTYPE { OMX_TI_IMAGE_CodingJPS = OMX_IMAGE_CodingVendorStartUnused + 1, /**< JPS format */ - OMX_TI_IMAGE_CodingMPO /**< MPO format */ + OMX_TI_IMAGE_CodingMPO, /**< MPO format */ + OMX_TI_IMAGE_CodingJPEG_SOC, + OMX_TI_IMAGE_CodingJPEG_SOC_SPOOFED } OMX_TI_IMAGE_CODINGTYPE; #endif /* OMX_TI_IMAGE_H */ diff --git a/domx/omx_core/inc/OMX_TI_Index.h b/domx/omx_core/inc/OMX_TI_Index.h index 61b1e27..3a50ff1 100755 --- a/domx/omx_core/inc/OMX_TI_Index.h +++ b/domx/omx_core/inc/OMX_TI_Index.h @@ -57,6 +57,7 @@ extern "C" { ******************************************************************/ #include <OMX_Types.h> + /******************************************************************* * EXTERNAL REFERENCE NOTE: only use if not found in header file *******************************************************************/ @@ -73,160 +74,193 @@ typedef enum OMX_TI_INDEXTYPE { OMX_IndexConfigAutoPauseAfterCapture = OMX_IndexAutoPauseAfterCapture, /* Vendor specific area for storing indices */ + + /*Common Indices*/ OMX_TI_IndexConfigChannelName = ((OMX_INDEXTYPE)OMX_IndexVendorStartUnused + 1), /**< reference: OMX_CONFIG_CHANNELNAME */ - OMX_TI_IndexParamJPEGUncompressedMode, /**< reference: OMX_JPEG_PARAM_UNCOMPRESSEDMODETYPE */ - OMX_TI_IndexParamJPEGCompressedMode, /**< reference: OMX_JPEG_PARAM_COMPRESSEDMODETYPE */ - OMX_TI_IndexParamDecodeSubregion, /**< reference: OMX_IMAGE_PARAM_DECODE_SUBREGION */ + OMX_TI_IndexParamJPEGUncompressedMode, /**< 0x7F000002 reference: OMX_JPEG_PARAM_UNCOMPRESSEDMODETYPE */ + OMX_TI_IndexParamJPEGCompressedMode, /**< 0x7F000003 reference: OMX_JPEG_PARAM_COMPRESSEDMODETYPE */ + OMX_TI_IndexParamDecodeSubregion, /**< 0x7F000004 reference: OMX_IMAGE_PARAM_DECODE_SUBREGION */ /* H264 Encoder Indices*/ - OMX_TI_IndexParamVideoDataSyncMode, //!< Refer to OMX_VIDEO_PARAM_DATASYNCMODETYPE structure - OMX_TI_IndexParamVideoNALUsettings, //!< use OMX_VIDEO_PARAM_AVCNALUCONTROLTYPE to configure the type os NALU to send along with the Different Frame Types - OMX_TI_IndexParamVideoMEBlockSize, //!< use OMX_VIDEO_PARAM_MEBLOCKSIZETYPE to specify the minimum block size used for motion estimation - OMX_TI_IndexParamVideoIntraPredictionSettings, //!< use OMX_VIDEO_PARAM_INTRAPREDTYPE to configure the intra prediction modes used for different block sizes - OMX_TI_IndexParamVideoEncoderPreset, //!< use OMX_VIDEO_PARAM_ENCODER_PRESETTYPE to select the encoding mode & rate control preset - OMX_TI_IndexParamVideoFrameDataContentSettings, //!< use OMX_TI_VIDEO_PARAM_FRAMEDATACONTENTTYPE to configure the data content tpye - OMX_TI_IndexParamVideoTransformBlockSize, //!< use OMX_VIDEO_PARAM_TRANSFORM_BLOCKSIZETYPE to specify the block size used for ttransformation - OMX_TI_IndexParamVideoVUIsettings, //!use OMX_VIDEO_PARAM_VUIINFOTYPE - OMX_TI_IndexParamVideoAdvancedFMO, - OMX_TI_IndexConfigVideoPixelInfo, //!< Use OMX_VIDEO_CONFIG_PIXELINFOTYPE structure to know the pixel aspectratio & pixel range - OMX_TI_IndexConfigVideoMESearchRange, //!< use OMX_VIDEO_CONFIG_MESEARCHRANGETYPE to specify the ME Search settings - OMX_TI_IndexConfigVideoQPSettings, //!< use OMX_TI_VIDEO_CONFIG_QPSETTINGS to specify the ME Search settings - OMX_TI_IndexConfigSliceSettings, //!<use OMX_VIDEO_CONFIG_SLICECODINGTYPE to specify the ME Search settings - OMX_TI_IndexParamAVCInterlaceSettings, //!< use OMX_TI_VIDEO_PARAM_AVCINTERLACECODING to specify the ME Search settings - OMX_TI_IndexParamStereoInfo2004Settings, //!< use OMX_TI_VIDEO_AVCENC_STEREOINFO2004 to specify the 2004 SEI for AVC Encoder - OMX_TI_IndexParamStereoFramePacking2010Settings, //!< use OMX_TI_VIDEO_AVCENC_FRAMEPACKINGINFO2010 to specify 2010 SEI for AVC Encoder - + OMX_TI_IndexParamVideoDataSyncMode, /**< 0x7F000005 Refer to OMX_VIDEO_PARAM_DATASYNCMODETYPE structure */ + OMX_TI_IndexParamVideoNALUsettings, /**< 0x7F000006 use OMX_VIDEO_PARAM_AVCNALUCONTROLTYPE to configure the type os NALU to send along with the Different Frame Types */ + OMX_TI_IndexParamVideoMEBlockSize, /**< 0x7F000007 use OMX_VIDEO_PARAM_MEBLOCKSIZETYPE to specify the minimum block size used for motion estimation */ + OMX_TI_IndexParamVideoIntraPredictionSettings, /**< 0x7F000008 use OMX_VIDEO_PARAM_INTRAPREDTYPE to configure the intra prediction modes used for different block sizes */ + OMX_TI_IndexParamVideoEncoderPreset, /**< 0x7F000009 use OMX_VIDEO_PARAM_ENCODER_PRESETTYPE to select the encoding mode & rate control preset */ + OMX_TI_IndexParamVideoFrameDataContentSettings, /**< 0x7F00000A use OMX_TI_VIDEO_PARAM_FRAMEDATACONTENTTYPE to configure the data content tpye */ + OMX_TI_IndexParamVideoTransformBlockSize, /**< 0x7F00000B use OMX_VIDEO_PARAM_TRANSFORM_BLOCKSIZETYPE to specify the block size used for ttransformation */ + OMX_TI_IndexParamVideoVUIsettings, /**< 0x7F00000C use OMX_VIDEO_PARAM_VUIINFOTYPE */ + OMX_TI_IndexParamVideoAdvancedFMO, /**< 0x7F00000D reference: TODO: */ + OMX_TI_IndexConfigVideoPixelInfo, /**< 0x7F00000E Use OMX_VIDEO_CONFIG_PIXELINFOTYPE structure to know the pixel aspectratio & pixel range */ + OMX_TI_IndexConfigVideoMESearchRange, /**< 0x7F00000F use OMX_VIDEO_CONFIG_MESEARCHRANGETYPE to specify the ME Search settings */ + OMX_TI_IndexConfigVideoQPSettings, /**< 0x7F000010 use OMX_TI_VIDEO_CONFIG_QPSETTINGS to specify the ME Search settings */ + OMX_TI_IndexConfigSliceSettings, /**< 0x7F000011 use OMX_VIDEO_CONFIG_SLICECODINGTYPE to specify the ME Search settings */ + OMX_TI_IndexParamAVCInterlaceSettings, /**< 0x7F000012 use OMX_TI_VIDEO_PARAM_AVCINTERLACECODING to specify the interlace settings for AVC encoder */ + OMX_TI_IndexParamStereoInfo2004Settings, /**< 0x7F000013 use OMX_TI_VIDEO_AVCENC_STEREOINFO2004 to specify the 2004 SEI for AVC Encoder */ + OMX_TI_IndexParamStereoFramePacking2010Settings, /**< 0x7F000014 use OMX_TI_VIDEO_AVCENC_FRAMEPACKINGINFO2010 to specify the 2010 SEI for AVC Encoder */ /* Camera Indices */ - OMX_TI_IndexConfigSensorSelect, /**< reference: OMX_CONFIG_SENSORSELECTTYPE */ - OMX_IndexConfigFlickerCancel, /**< reference: OMX_CONFIG_FLICKERCANCELTYPE */ - OMX_IndexConfigSensorCal, /**< reference: OMX_CONFIG_SENSORCALTYPE */ - OMX_IndexConfigISOSetting, /**< reference: OMX_CONFIG_ISOSETTINGTYPE */ - OMX_TI_IndexConfigSceneMode, /**< reference: OMX_CONFIG_SCENEMODETYPE */ - - OMX_IndexConfigDigitalZoomSpeed, /**< reference: OMX_CONFIG_DIGITALZOOMSPEEDTYPE */ - OMX_IndexConfigDigitalZoomTarget, /**< reference: OMX_CONFIG_DIGITALZOOMTARGETTYPE */ - - OMX_IndexConfigCommonScaleQuality, /**< reference: OMX_CONFIG_SCALEQUALITYTYPE */ - - OMX_IndexConfigCommonDigitalZoomQuality, /**< reference: OMX_CONFIG_SCALEQUALITYTYPE */ - - OMX_IndexConfigOpticalZoomSpeed, /**< reference: OMX_CONFIG_DIGITALZOOMSPEEDTYPE */ - OMX_IndexConfigOpticalZoomTarget, /**< reference: OMX_CONFIG_DIGITALZOOMTARGETTYPE */ - - OMX_IndexConfigSmoothZoom, /**< reference: OMX_CONFIG_SMOOTHZOOMTYPE */ - - OMX_IndexConfigBlemish, /**< reference: OMX_CONFIG_BLEMISHTYPE */ - - OMX_IndexConfigExtCaptureMode, /**< reference: OMX_CONFIG_EXTCAPTUREMODETYPE */ - OMX_IndexConfigExtPrepareCapturing, /**< reference : OMX_CONFIG_BOOLEANTYPE */ - OMX_IndexConfigExtCapturing, /**< reference : OMX_CONFIG_EXTCAPTURING */ - - OMX_IndexCameraOperatingMode, /**< OMX_CONFIG_CAMOPERATINGMODETYPE */ - OMX_IndexConfigDigitalFlash, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - OMX_IndexConfigPrivacyIndicator, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - - OMX_IndexConfigTorchMode, /**< reference: OMX_CONFIG_TORCHMODETYPE */ - - OMX_IndexConfigSlowSync, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - - OMX_IndexConfigExtFocusRegion, /**< reference : OMX_CONFIG_EXTFOCUSREGIONTYPE */ - OMX_IndexConfigFocusAssist, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - - OMX_IndexConfigImageFocusLock, /**< reference: OMX_IMAGE_CONFIG_LOCKTYPE */ - OMX_IndexConfigImageWhiteBalanceLock, /**< reference: OMX_IMAGE_CONFIG_LOCKTYPE */ - OMX_IndexConfigImageExposureLock, /**< reference: OMX_IMAGE_CONFIG_LOCKTYPE */ - OMX_IndexConfigImageAllLock, /**< reference: OMX_IMAGE_CONFIG_LOCKTYPE */ - - OMX_IndexConfigImageDeNoiseLevel, /**< reference: OMX_IMAGE_CONFIG_PROCESSINGLEVELTYPE */ - OMX_IndexConfigSharpeningLevel, /**< reference: OMX_IMAGE_CONFIG_PROCESSINGLEVELTYPE */ - OMX_IndexConfigDeBlurringLevel, /**< reference: OMX_IMAGE_CONFIG_PROCESSINGLEVELTYPE */ - OMX_IndexConfigChromaCorrection, /**< reference: OMX_IMAGE_CONFIG_PROCESSINGLEVELTYPE */ - OMX_IndexConfigDeMosaicingLevel, /**< reference: OMX_IMAGE_CONFIG_PROCESSINGLEVELTYPE */ - - OMX_IndexConfigCommonWhiteBalanceGain, /**< reference: OMX_CONFIG_WHITEBALGAINTYPE */ - - OMX_IndexConfigCommonRGB2RGB, /**< reference: OMX_CONFIG_COLORCONVERSIONTYPE_II */ - OMX_IndexConfigCommonRGB2YUV, /**< reference: OMX_CONFIG_COLORCONVERSIONTYPE_II */ - OMX_IndexConfigCommonYUV2RGB, /**< reference : OMX_CONFIG_EXT_COLORCONVERSIONTYPE */ - - OMX_IndexConfigCommonGammaTable, /**< reference: OMX_CONFIG_GAMMATABLETYPE */ - - OMX_IndexConfigImageFaceDetection, /**< reference: OMX_CONFIG_OBJDETECTIONTYPE */ - OMX_IndexConfigImageBarcodeDetection, /**< reference: OMX_CONFIG_EXTRADATATYPE */ - OMX_IndexConfigImageSmileDetection, /**< reference: OMX_CONFIG_OBJDETECTIONTYPE */ - OMX_IndexConfigImageBlinkDetection, /**< reference: OMX_CONFIG_OBJDETECTIONTYPE */ - OMX_IndexConfigImageFrontObjectDetection, /**< reference: OMX_CONFIG_EXTRADATATYPE */ - OMX_IndexConfigHistogramMeasurement, /**< reference: OMX_CONFIG_HISTOGRAMTYPE */ - OMX_IndexConfigDistanceMeasurement, /**< reference: OMX_CONFIG_EXTRADATATYPE */ - - OMX_IndexConfigSnapshotToPreview, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - - OMX_IndexConfigJpegHeaderType , /**< reference : OMX_CONFIG_JPEGHEEADERTYPE */ - OMX_IndexParamJpegMaxSize, /**< reference: OMX_IMAGE_JPEGMAXSIZE */ - - OMX_IndexConfigRestartMarker, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - - OMX_IndexParamImageStampOverlay, /**< reference: OMX_PARAM_IMAGESTAMPOVERLAYTYPE */ - OMX_IndexParamThumbnail, /**< reference: OMX_PARAM_THUMBNAILTYPE */ - OMX_IndexConfigImageStabilization, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - OMX_IndexConfigMotionTriggeredImageStabilisation, /**< reference : OMX_CONFIG_BOOLEANTYPE */ - OMX_IndexConfigRedEyeRemoval, /**< reference: OMX_CONFIG_REDEYEREMOVALTYPE */ - OMX_IndexParamHighISONoiseFiler, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - OMX_IndexParamLensDistortionCorrection, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - OMX_IndexParamLocalBrightnessAndContrast, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - OMX_IndexConfigChromaticAberrationCorrection, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - OMX_IndexParamVideoCaptureYUVRange, /**< reference: OMX_PARAM_VIDEOYUVRANGETYPE */ - - OMX_IndexConfigFocusRegion, /**< reference: OMX_CONFIG_EXTFOCUSREGIONTYPE */ - OMX_IndexConfigImageMotionEstimation, /**< reference: OMX_CONFIG_OBJDETECTIONTYPE */ - OMX_IndexParamProcessingOrder, /**< reference: OMX_CONFIGPROCESSINGORDERTYPE */ - OMX_IndexParamFrameStabilisation, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - OMX_IndexParamVideoNoiseFilter, /**< reference: OMX_PARAM_VIDEONOISEFILTERTYPE */ - - OMX_IndexConfigOtherExtraDataControl, /**< reference: OMX_CONFIG_EXTRADATATYPE */ - OMX_TI_IndexParamBufferPreAnnouncement, /**< reference: OMX_TI_PARAM_BUFFERPREANNOUNCE */ - OMX_TI_IndexConfigBufferRefCountNotification, /**< reference: OMX_TI_CONFIG_BUFFERREFCOUNTNOTIFYTYPE */ - OMX_TI_IndexParam2DBufferAllocDimension, /**< reference: OMX_CONFIG_RECTTYPE */ - OMX_TI_IndexConfigWhiteBalanceManualColorTemp, /**< reference: OMX_TI_CONFIG_WHITEBALANCECOLORTEMPTPYPE */ - OMX_TI_IndexConfigFocusSpotWeighting, /**< reference: OMX_TI_CONFIG_FOCUSSPOTWEIGHTINGTYPE */ - OMX_TI_IndexParamSensorOverClockMode, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - OMX_TI_IndexParamDccUriInfo, /**< reference: OMX_TI_PARAM_DCCURIINFO */ - OMX_TI_IndexParamDccUriBuffer, /**< reference: OMX_TI_PARAM_DCCURIBUFFER */ + OMX_TI_IndexConfigSensorSelect, /**< 0x7F000015 reference: OMX_CONFIG_SENSORSELECTTYPE */ + OMX_IndexConfigFlickerCancel, /**< 0x7F000016 reference: OMX_CONFIG_FLICKERCANCELTYPE */ + OMX_IndexConfigSensorCal, /**< 0x7F000017 reference: OMX_CONFIG_SENSORCALTYPE */ + OMX_IndexConfigISOSetting, /**< 0x7F000018 reference: OMX_CONFIG_ISOSETTINGTYPE */ + OMX_TI_IndexConfigSceneMode, /**< 0x7F000019 reference: OMX_CONFIG_SCENEMODETYPE */ + OMX_IndexConfigDigitalZoomSpeed, /**< 0x7F00001A reference: OMX_CONFIG_DIGITALZOOMSPEEDTYPE */ + OMX_IndexConfigDigitalZoomTarget, /**< 0x7F00001B reference: OMX_CONFIG_DIGITALZOOMTARGETTYPE */ + OMX_IndexConfigCommonScaleQuality, /**< 0x7F00001C reference: OMX_CONFIG_SCALEQUALITYTYPE */ + OMX_IndexConfigCommonDigitalZoomQuality, /**< 0x7F00001D reference: OMX_CONFIG_SCALEQUALITYTYPE */ + OMX_IndexConfigOpticalZoomSpeed, /**< 0x7F00001E reference: OMX_CONFIG_DIGITALZOOMSPEEDTYPE */ + OMX_IndexConfigOpticalZoomTarget, /**< 0x7F00001F reference: OMX_CONFIG_DIGITALZOOMTARGETTYPE */ + OMX_IndexConfigSmoothZoom, /**< 0x7F000020 reference: OMX_CONFIG_SMOOTHZOOMTYPE */ + OMX_IndexConfigBlemish, /**< 0x7F000021 reference: OMX_CONFIG_BLEMISHTYPE */ + OMX_IndexConfigExtCaptureMode, /**< 0x7F000022 reference: OMX_CONFIG_EXTCAPTUREMODETYPE */ + OMX_IndexConfigExtPrepareCapturing, /**< 0x7F000023 reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_IndexConfigExtCapturing, /**< 0x7F000024 reference: OMX_CONFIG_EXTCAPTURING */ + + OMX_IndexCameraOperatingMode, /**< 0x7F000025 reference: OMX_CONFIG_CAMOPERATINGMODETYPE */ + OMX_IndexParamCameraOperatingMode = OMX_IndexCameraOperatingMode, /**< 0x7F000025 reference: OMX_CONFIG_CAMOPERATINGMODETYPE */ + + OMX_IndexConfigDigitalFlash, /**< 0x7F000026 reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_IndexConfigPrivacyIndicator, /**< 0x7F000027 reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_IndexConfigTorchMode, /**< 0x7F000028 reference: OMX_CONFIG_TORCHMODETYPE */ + OMX_IndexConfigSlowSync, /**< 0x7F000029 reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_IndexConfigExtFocusRegion, /**< 0x7F00002A reference: OMX_CONFIG_EXTFOCUSREGIONTYPE */ + OMX_IndexConfigFocusAssist, /**< 0x7F00002B reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_IndexConfigImageFocusLock, /**< 0x7F00002C reference: OMX_IMAGE_CONFIG_LOCKTYPE */ + OMX_IndexConfigImageWhiteBalanceLock, /**< 0x7F00002D reference: OMX_IMAGE_CONFIG_LOCKTYPE */ + OMX_IndexConfigImageExposureLock, /**< 0x7F00002E reference: OMX_IMAGE_CONFIG_LOCKTYPE */ + OMX_IndexConfigImageAllLock, /**< 0x7F00002F reference: OMX_IMAGE_CONFIG_LOCKTYPE */ + OMX_IndexConfigImageDeNoiseLevel, /**< 0x7F000030 reference: OMX_IMAGE_CONFIG_PROCESSINGLEVELTYPE */ + OMX_IndexConfigSharpeningLevel, /**< 0x7F000031 reference: OMX_IMAGE_CONFIG_PROCESSINGLEVELTYPE */ + OMX_IndexConfigDeBlurringLevel, /**< 0x7F000032 reference: OMX_IMAGE_CONFIG_PROCESSINGLEVELTYPE */ + OMX_IndexConfigChromaCorrection, /**< 0x7F000033 reference: OMX_IMAGE_CONFIG_PROCESSINGLEVELTYPE */ + OMX_IndexConfigDeMosaicingLevel, /**< 0x7F000034 reference: OMX_IMAGE_CONFIG_PROCESSINGLEVELTYPE */ + OMX_IndexConfigCommonWhiteBalanceGain, /**< 0x7F000035 reference: OMX_CONFIG_WHITEBALGAINTYPE */ + OMX_IndexConfigCommonRGB2RGB, /**< 0x7F000036 reference: OMX_CONFIG_COLORCONVERSIONTYPE_II */ + OMX_IndexConfigCommonRGB2YUV, /**< 0x7F000037 reference: OMX_CONFIG_COLORCONVERSIONTYPE_II */ + OMX_IndexConfigCommonYUV2RGB, /**< 0x7F000038 reference: OMX_CONFIG_EXT_COLORCONVERSIONTYPE */ + OMX_IndexConfigCommonGammaTable, /**< 0x7F000039 reference: OMX_CONFIG_GAMMATABLETYPE */ + OMX_IndexConfigImageFaceDetection, /**< 0x7F00003A reference: OMX_CONFIG_OBJDETECTIONTYPE */ + OMX_IndexConfigImageBarcodeDetection, /**< 0x7F00003B reference: OMX_CONFIG_OBJDETECTIONTYPE */ + OMX_IndexConfigImageSmileDetection, /**< 0x7F00003C reference: OMX_CONFIG_OBJDETECTIONTYPE */ + OMX_IndexConfigImageBlinkDetection, /**< 0x7F00003D reference: OMX_CONFIG_OBJDETECTIONTYPE */ + OMX_IndexConfigImageFrontObjectDetection, /**< 0x7F00003E reference: OMX_CONFIG_OBJDETECTIONTYPE */ + OMX_IndexConfigHistogramMeasurement, /**< 0x7F00003F reference: OMX_CONFIG_HISTOGRAMTYPE */ + OMX_IndexConfigDistanceMeasurement, /**< 0x7F000040 reference: OMX_CONFIG_DISTANCETYPE */ + OMX_IndexConfigSnapshotToPreview, /**< 0x7F000041 reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_IndexConfigJpegHeaderType, /**< 0x7F000042 reference: OMX_CONFIG_JPEGHEEADERTYPE */ + OMX_IndexParamJpegMaxSize, /**< 0x7F000043 reference: OMX_IMAGE_JPEGMAXSIZE */ + OMX_IndexConfigRestartMarker, /**< 0x7F000044 reference: OMX_CONFIG_RSTMARKER */ + OMX_IndexParamImageStampOverlay, /**< 0x7F000045 reference: OMX_PARAM_IMAGESTAMPOVERLAYTYPE */ + OMX_IndexParamThumbnail, /**< 0x7F000046 reference: OMX_PARAM_THUMBNAILTYPE */ + OMX_IndexConfigImageStabilization, /**< 0x7F000047 reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_IndexConfigMotionTriggeredImageStabilisation, /**< 0x7F000048 reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_IndexConfigRedEyeRemoval, /**< 0x7F000049 reference: OMX_CONFIG_REDEYEREMOVALTYPE */ + OMX_IndexParamHighISONoiseFiler, /**< 0x7F00004A reference: OMX_PARAM_ISONOISEFILTERTYPE */ + OMX_IndexParamLensDistortionCorrection, /**< 0x7F00004B reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_IndexParamLocalBrightnessAndContrast, /**< 0x7F00004C reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_IndexConfigChromaticAberrationCorrection, /**< 0x7F00004D reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_IndexParamVideoCaptureYUVRange, /**< 0x7F00004E reference: OMX_PARAM_VIDEOYUVRANGETYPE */ + OMX_IndexConfigFocusRegion, /**< 0x7F00004F reference: OMX_CONFIG_EXTFOCUSREGIONTYPE */ + OMX_IndexConfigImageMotionEstimation, /**< 0x7F000050 reference: OMX_CONFIG_OBJDETECTIONTYPE */ + OMX_IndexParamProcessingOrder, /**< 0x7F000051 reference: OMX_CONFIGPROCESSINGORDERTYPE */ + OMX_IndexParamFrameStabilisation, /**< 0x7F000052 reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_IndexParamVideoNoiseFilter, /**< 0x7F000053 reference: OMX_PARAM_VIDEONOISEFILTERTYPE */ + OMX_IndexConfigOtherExtraDataControl, /**< 0x7F000054 reference: OMX_CONFIG_EXTRADATATYPE */ + OMX_TI_IndexParamBufferPreAnnouncement, /**< 0x7F000055 reference: OMX_TI_PARAM_BUFFERPREANNOUNCE */ + OMX_TI_IndexConfigBufferRefCountNotification, /**< 0x7F000056 reference: OMX_TI_CONFIG_BUFFERREFCOUNTNOTIFYTYPE */ + OMX_TI_IndexParam2DBufferAllocDimension, /**< 0x7F000057 reference: OMX_TI_PARAM_2DBUFERALLOCDIMENSION */ + OMX_TI_IndexConfigWhiteBalanceManualColorTemp, /**< 0x7F000058 reference: OMX_CONFIG_WHITEBALANCECOLORTEMPTPYPE */ + OMX_TI_IndexConfigFocusSpotWeighting, /**< 0x7F000059 reference: OMX_CONFIG_FOCUSSPOTWEIGHTINGTYPE */ + OMX_TI_IndexParamSensorOverClockMode, /**< 0x7F00005A reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_TI_IndexParamDccUriInfo, /**< 0x7F00005B reference: OMX_PARAM_DCCURIINFO */ + OMX_TI_IndexParamDccUriBuffer, /**< 0x7F00005C reference: OMX_PARAM_SHAREDBUFFER */ /* MPEG4 and H264 encoder specific Indices */ - OMX_TI_IndexParamVideoIntraRefresh, /**< reference: OMX_TI_VIDEO_PARAM_INTRAREFRESHTYPE */ - - OMX_TI_IndexConfigShutterCallback, /**< reference: OMX_CONFIG_BOOLEANTYPE */ - OMX_TI_IndexParamVarFrameRate, /**< reference: OMX_PARAM_VARFARAMERATETYPE */ - OMX_TI_IndexConfigAutoConvergence, /**< reference: OMX_TI_CONFIG_CONVERGENCETYPE */ - OMX_TI_IndexConfigRightExposureValue, /**< reference: OMX_TI_CONFIG_EXPOSUREVALUERIGHTTYPE */ - OMX_TI_IndexConfigExifTags, /**< reference: OMX_TI_CONFIG_SHAREDBUFFER */ - OMX_TI_IndexParamVideoPayloadHeaderFlag, /**< reference: OMX_TI_PARAM_PAYLOADHEADERFLAG */ - OMX_TI_IndexParamVideoIvfMode, /**< reference: OMX_TI_PARAM_IVFFLAG */ - OMX_TI_IndexConfigCamCapabilities, /**< reference: OMX_TI_CONFIG_SHAREDBUFFER */ - OMX_TI_IndexConfigFacePriority3a, /**< reference: OMX_TI_CONFIG_3A_FACE_PRIORITY */ - OMX_TI_IndexConfigRegionPriority3a, /**< reference: OMX_TI_CONFIG_3A_REGION_PRIORITY */ - OMX_TI_IndexParamAutoConvergence, /**< reference: OMX_TI_PARAM_AUTOCONVERGENCETYPE */ - OMX_TI_IndexConfigAAAskipBuffer, /**< reference: OMX_TI_CONFIG_AAASKIPBUFFERTYPE */ - OMX_TI_IndexParamStereoFrmLayout, /**< reference: OMX_TI_FRAMELAYOUTTYPE */ - OMX_TI_IndexConfigLocalBrightnessContrastEnhance, /**< reference: OMX_TI_CONFIG_LOCAL_AND_GLOBAL_BRIGHTNESSCONTRASTTYPE */ - OMX_TI_IndexConfigGlobalBrightnessContrastEnhance, /**< reference: OMX_TI_CONFIG_LOCAL_AND_GLOBAL_BRIGHTNESSCONTRASTTYPE */ - OMX_TI_IndexConfigVarFrmRange, /**< reference: OMX_TI_CONFIG_VARFRMRANGETYPE */ - OMX_TI_IndexParamAVCHRDBufferSizeSetting, /**< reference: OMX_TI_VIDEO_PARAM_AVCHRDBUFFERSETTING */ - OMX_TI_IndexConfigAVCHRDBufferSizeSetting, /**< reference: OMX_TI_VIDEO_CONFIG_AVCHRDBUFFERSETTING */ - OMX_TI_IndexConfigFocusDistance, /**< reference: OMX_TI_CONFIG_FOCUSDISTANCETYPE */ - OMX_TI_IndexUseNativeBuffers, /**< reference: OMX_TI_ParamUseNativeBuffer */ - OMX_TI_IndexParamUseEnhancedPortReconfig, /**< reference: OMX_TI_IndexParamUseEnhancedPortReconfig */ - OMX_TI_IndexEncoderStoreMetadatInBuffers, - OMX_TI_IndexParamZslHistoryLen, /**< reference: OMX_TI_PARAM_ZSLHISTORYLENTYPE */ - OMX_TI_IndexConfigZslDelay, /**< reference: OMX_TI_CONFIG_ZSLDELAYTYPE */ - OMX_TI_IndexParamMetaDataBufferInfo, /***< reference: OMX_TI_PARAM_METADATABUFFERINFO */ - OMX_TI_IndexConfigZslFrameSelectMethod, /**< reference: OMX_TI_CONFIG_ZSLFRAMESELECTMETHODTYPE */ - OMX_TI_IndexAndroidNativeBufferUsage, /**< reference: OMX_TI_IndexAndroidNativeBufferUsage */ - OMX_TI_IndexConfigAlgoAreas, /**< reference: OMX_PARAM_SHAREDBUFFER (pSharedBuff is OMX_ALGOAREASTYPE) */ - OMX_TI_IndexConfigAutofocusEnable /**< reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_TI_IndexParamVideoIntraRefresh, /**< 0x7F00005D reference: OMX_TI_VIDEO_PARAM_INTRAREFRESHTYPE */ + + /* camera indices continues*/ + OMX_TI_IndexConfigShutterCallback, /**< 0x7F00005E reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_TI_IndexParamVarFrameRate, /**< 0x7F00005F reference: OMX_PARAM_VARFARAMERATETYPE */ + OMX_TI_IndexConfigAutoConvergence, /**< 0x7F000060 reference: OMX_TI_CONFIG_CONVERGENCETYPE */ + OMX_TI_IndexConfigRightExposureValue, /**< 0x7F000061 reference: OMX_TI_CONFIG_EXPOSUREVALUERIGHTTYPE */ + OMX_TI_IndexConfigExifTags, /**< 0x7F000062 reference: OMX_TI_CONFIG_SHAREDBUFFER */ + OMX_TI_IndexParamVideoPayloadHeaderFlag, /**< 0x7F000063 reference: OMX_TI_PARAM_PAYLOADHEADERFLAG */ + OMX_TI_IndexParamVideoIvfMode, /**< 0x7F000064 reference: OMX_TI_PARAM_IVFFLAG */ + OMX_TI_IndexConfigCamCapabilities, /**< 0x7F000065 reference: OMX_TI_CONFIG_SHAREDBUFFER */ + OMX_TI_IndexConfigFacePriority3a, /**< 0x7F000066 reference: OMX_TI_CONFIG_3A_FACE_PRIORITY */ + OMX_TI_IndexConfigRegionPriority3a, /**< 0x7F000067 reference: OMX_TI_CONFIG_3A_REGION_PRIORITY */ + OMX_TI_IndexParamAutoConvergence, /**< 0x7F000068 reference: OMX_TI_PARAM_AUTOCONVERGENCETYPE */ + OMX_TI_IndexConfigAAAskipBuffer, /**< 0x7F000069 reference: OMX_TI_CONFIG_SHAREDBUFFER */ + OMX_TI_IndexParamStereoFrmLayout, /**< 0x7F00006A reference: OMX_TI_FRAMELAYOUTTYPE */ + OMX_TI_IndexConfigLocalBrightnessContrastEnhance, /**< 0x7F00006B reference: OMX_TI_CONFIG_LOCAL_AND_GLOBAL_BRIGHTNESSCONTRASTTYPE */ + OMX_TI_IndexConfigGlobalBrightnessContrastEnhance, /**< 0x7F00006C reference: OMX_TI_CONFIG_LOCAL_AND_GLOBAL_BRIGHTNESSCONTRASTTYPE */ + OMX_TI_IndexConfigVarFrmRange, /**< 0x7F00006D reference: OMX_TI_CONFIG_VARFRMRANGETYPE */ + + /*H264 Encoder specific Indices*/ + OMX_TI_IndexParamAVCHRDBufferSizeSetting, /**< 0x7F00006E reference: OMX_TI_VIDEO_PARAM_AVCHRDBUFFERSETTING */ + OMX_TI_IndexConfigAVCHRDBufferSizeSetting, /**< 0x7F00006F reference: OMX_TI_VIDEO_CONFIG_AVCHRDBUFFERSETTING */ + OMX_TI_IndexConfigFocusDistance, /**< 0x7F000070 reference: OMX_TI_CONFIG_FOCUSDISTANCETYPE */ + OMX_TI_IndexUseNativeBuffers, /**< 0x7F000071 reference: OMX_TI_ParamUseNativeBuffer(used only in proxy) */ + OMX_TI_IndexConfigSinglePreviewMode, /**< 0x7F000072 reference: */ + OMX_TI_IndexConfigFreezeAWB, /**< 0x7F000073 reference: */ + OMX_TI_IndexConfigAWBMinDelayTime, /**< 0x7F000074 reference: */ + OMX_TI_IndexConfigDetectedGesturesInfo, /**< 0x7F000075 reference: */ + OMX_TI_IndexConfigAutoExpMinDelayTime, /**< 0x7F000076 reference: */ + OMX_TI_IndexConfigFreezeAutoExp, /**< 0x7F000077 reference: */ + OMX_TI_IndexConfigAutoExpThreshold, /**< 0x7F000078 reference: */ + OMX_TI_IndexParamZslHistoryLen, /**< 0x7F000079 reference: OMX_TI_PARAM_ZSLHISTORYLENTYPE */ + OMX_TI_IndexConfigZslDelay, /**< 0x7F00007A reference: OMX_TI_CONFIG_ZSLDELAYTYPE */ + OMX_TI_IndexConfigMechanicalMisalignment, /**< 0x7F00007B reference: OMX_TI_CONFIG_MM */ + OMX_TI_IndexParamAffineTransform, /**< 0x7F00007C reference: OMX_TI_CONFIG_AFFINE */ + OMX_TI_IndexParamUseEnhancedPortReconfig, /**< 0x7F00007D reference: OMX_TI_IndexParamUseEnhancedPortReconfig */ + OMX_TI_IndexEncoderStoreMetadatInBuffers, /**< 0x7F00007E reference: */ + OMX_TI_IndexParamMetaDataBufferInfo, /**< 0x7F00007F reference: OMX_TI_PARAM_METADATABUFFERINFO */ + OMX_TI_IndexConfigZslFrameSelectMethod, /**< 0x7F000080 reference: OMX_TI_CONFIG_ZSLFRAMESELECTMETHODTYPE */ + OMX_TI_IndexAndroidNativeBufferUsage, /**< 0x7F000081 reference: OMX_TI_IndexAndroidNativeBufferUsage */ + OMX_TI_IndexConfigAlgoAreas, /**< 0x7F000082 reference: OMX_PARAM_SHAREDBUFFER (pSharedBuff is OMX_ALGOAREASTYPE) */ + + OMX_TI_IndexParamSensorDetect, /**< 0x7F000083 reference: OMX_TI_PARAM_SENSORDETECT */ + OMX_TI_IndexParamVideoSvc, /**< 0x7F000084 reference: OMX_TI_VIDEO_PARAM_SVCTYPE */ + OMX_TI_IndexConfigVideoSvcLayerDetails, /**< 0x7F000085 reference: OMX_TI_VIDEO_CONFIG_SVCLAYERDETAILS */ + OMX_TI_IndexConfigVideoSvcTargetLayer, /**< 0x7F000086 reference: OMX_TI_VIDEO_CONFIG_SVCTARGETLAYER */ + OMX_TI_IndexConfigZslFremeSelectPrio, /**< 0x7F000087 reference: OMX_TI_CONFIG_ZSLFRAMESELECTPRIOTYPE */ + + OMX_TI_IndexUseBufferDescriptor, /**< 0x7F000088 reference: OMX_TI_PARAM_USEBUFFERDESCRIPTOR */ + OMX_TI_IndexParamVtcSlice, /**< 0x7F000089 reference: OMX_TI_PARAM_VTCSLICE */ + + OMX_TI_IndexConfigAutofocusEnable, /**< 0x7F00008A reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_TI_IndexParamAVCEnableLTRMode, /**< 0x7F00008B reference: OMX_TI_VIDEO_PARAM_AVC_LTRP*/ + OMX_TI_IndexConfigAVCEnableNextLTR, /**< 0x7F00008C reference: OMX_TI_VIDEO_CONFIG_AVC_LTRP*/ + OMX_TI_IndexConfigAVCUpdateLTRInterval, /**< 0x7F00008D reference: OMX_TI_VIDEO_CONFIG_AVC_LTRP_INTERVAL*/ + OMX_TI_IndexParamTimeStampInDecodeOrder, /**< 0x7F00008E reference: OMX_TI_PARAM_TIMESTAMP_IN_DECODE_ORDER */ + OMX_TI_IndexParamVideoAutoFrameRateUpdate, /**< 0x7F00008F reference: OMX_TI_VIDEO_PARAM_AUTO_FRAMERATE_UPDATE */ + OMX_TI_IndexParamBayerCompression, /**< 0x7F000090 reference: OMX_TI_PARAM_BAYERCOMPRESSION */ + OMX_TI_IndexParamSkipGreyOutputFrames, /**< 0x7F000091 reference: OMX_TI_PARAM_SKIP_GREY_OUTPUT_FRAMES */ + OMX_TI_IndexConfigMipiCounters, /**< 0x7F000092 reference: OMX_CONFIG_MIPICOUNTERS */ + OMX_TI_IndexConfigCsiTimingRW, /**< 0x7F000093 reference: OMX_CONFIG_CSITIMINGRW */ + OMX_TI_IndexConfigCSIcomplexIO, /**< 0x7F000094 reference: OMX_CONFIG_CSICMPXIO */ + OMX_TI_IndexConfigAFScore, /**< 0x7F000095 reference: OMX_CONFIG_AUTOFOCUSSCORE */ + OMX_TI_IndexConfigColorBars, /**< 0x7F000096 reference: OMX_CONFIG_COLORBARS */ + OMX_TI_IndexConfigOTPEeprom, /**< 0x7F000097 reference: OMX_CONFIG_OTPEEPROM */ + OMX_TI_IndexConfigISPInfo, /**< 0x7F000098 reference: OMX_CONFIG_ISPINFO */ + OMX_TI_IndexConfigPicSizeControlInfo, /**< 0x7F000099 reference: OMX_TI_VIDEO_CONFIG_PICSIZECONTROLINFO */ + OMX_TI_IndexConfigPortTapPoint, /**< 0x7F00009A reference: OMX_TI_CONFIG_PORTTAPPOINTTYPE */ + OMX_TI_IndexConfigDisableNSF2, /**< 0x7F00009B reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_TI_IndexConfigDisableSharpening, /**< 0x7F00009C reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_TI_IndexConfigFixedGamma, /**< 0x7F00009D reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_TI_IndexConfigDisableThreeLinColorMap, /**< 0x7F00009E reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_TI_IndexParamComponentBufferAllocation, /**< 0x7F00009F reference: OMX_TI_PARAM_COMPONENTBUFALLOCTYPE */ + OMX_TI_IndexConfigEnqueueShotConfigs, /**< 0x7F0000A0 reference: OMX_TI_CONFIG_ENQUEUESHOTCONFIGS */ + OMX_TI_IndexConfigQueryAvailableShots, /**< 0x7F0000A1 reference: OMX_TI_CONFIG_QUERYAVAILABLESHOTS */ + OMX_TI_IndexConfigDisableNSF1, /**< 0x7F0000A2 reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_TI_IndexConfigDisableGIC, /**< 0x7F0000A3 reference: OMX_CONFIG_BOOLEANTYPE */ + OMX_TI_IndexConfigVectShotStopMethod, /**< 0x7F0000A4 reference: OMX_TI_CONFIG_VECTSHOTSTOPMETHODTYPE */ + OMX_TI_IndexParamComponentExpectedSuspensionState, /**< 0x7F0000A5 reference: OMX_PARAM_SUSPENSIONTYPE */ + OMX_TI_IndexComponentHandle, /**< 0x7F0000A6 reference: OMX_TI_COMPONENT_HANDLE */ + OMX_TI_IndexParamVideoEnableMetadata, /**< 0x7F0000A7 reference: OMX_TI_PARAM_DECMETADATA */ + OMX_TI_IndexConfigStreamInterlaceFormats = ((OMX_INDEXTYPE)OMX_IndexVendorStartUnused + 0x100) /**< 0x7F000100 reference: OMX_STREAMINTERLACEFORMATTYPE */ } OMX_TI_INDEXTYPE; diff --git a/domx/omx_core/inc/OMX_TI_Video.h b/domx/omx_core/inc/OMX_TI_Video.h index 55000c6..63187e0 100755 --- a/domx/omx_core/inc/OMX_TI_Video.h +++ b/domx/omx_core/inc/OMX_TI_Video.h @@ -44,16 +44,17 @@ *! *! Revision History *! ===================================================================== - *! 24-Dec-2008 Navneet navneet@ti.com Initial Version - *! 14-Jul-2009 Radha Purnima radhapurnima@ti.com - *! 25-Aug-2009 Radha Purnima radhapurnima@ti.com + *! 24-Dec-2008 Navneet navneet@ti.com Initial Version + *! 14-Jul-2009 Radha Purnima radhapurnima@ti.com + *! 25-Aug-2009 Radha Purnima radhapurnima@ti.com + *! 16-May-2009 Shivaraj Shetty shettyshivaraj@ti.com * =========================================================================*/ #ifndef OMX_TI_VIDEO_H #define OMX_TI_VIDEO_H #define H264ENC_MAXNUMSLCGPS 2 - +#define OMXH264E_MAX_SLICE_SUPPORTED 64 #include <OMX_Core.h> /** @@ -543,7 +544,9 @@ typedef enum OMX_TI_VIDEO_CODINGTYPE { OMX_VIDEO_CodingVP6 = (OMX_VIDEO_CODINGTYPE) OMX_VIDEO_CodingVendorStartUnused +1, /* VP6 */ OMX_VIDEO_CodingVP7, /* VP7 */ - OMX_TI_VIDEO_CodingSORENSONSPK /* Sorenson Spark */ + OMX_TI_VIDEO_CodingSORENSONSPK, /* Sorenson spark*/ + OMX_VIDEO_CodingSVC, /**< H.264/SVC */ + OMX_VIDEO_CodingVP8 /* VP8 */ }OMX_TI_VIDEO_CODINGTYPE; @@ -719,5 +722,1867 @@ typedef struct OMX_VIDEO_STOREMETADATAINBUFFERSPARAMS { OMX_BOOL bStoreMetaData; } OMX_VIDEO_STOREMETADATAINBUFFERSPARAMS; + +/** + * Interlaced Video Content format + * + * STRUCT MEMBERS: + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to + * nFormat : bitmapped value indentifying the interlaced formats supported by component + * nTimeStamp : temporal timestamp information for the second field + */ +typedef struct OMX_TI_INTERLACEFORMATTYPE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U32 nFormat; + OMX_TICKS nTimeStamp; +} OMX_TI_INTERLACEFORMATTYPE; + +/** + * Interlace format types + */ +typedef enum OMX_TI_INTERLACETYPE { + OMX_InterlaceFrameProgressive= 0x00, + OMX_InterlaceInterleaveFrameTopFieldFirst= 0x01, + OMX_InterlaceInterleaveFrameBottomFieldFirst= 0x02, + OMX_InterlaceFrameTopFieldFirst= 0x04, + OMX_InterlaceFrameBottomFieldFirst= 0x08, + OMX_InterlaceInterleaveFieldTop= 0x10, + OMX_InterlaceInterleaveFieldBottom= 0x20, + OMX_InterlaceFmtMask= 0x7FFFFFFF +} OMX_TI_INTERLACETYPE; + +/** + * To query if the stream contains interlaced or progressive conten + * + * STRUCT MEMBERS: + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to + * bInterlaceFormat : whether the stream contains interlace or progressive content + * OMX_TRUE indicates interlace and OMX_FALSE indicates progressive + * nInterlaceFormats : bitmapped value identifying the interlace formats detected within the stream + */ +typedef struct OMX_TI_STREAMINTERLACEFORMATTYPE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_BOOL bInterlaceFormat; + OMX_U32 nInterlaceFormats; +} OMX_TI_STREAMINTERLACEFORMAT; + +/* +@brief OMX_TI_VIDEO_CONFIG_PICSIZECONTROLINFO : Structure to provide the configuration to compute min and max picture size +@param minPicSizeRatio : This ratio is used to compute minimum picture size in the following manner, +minPicSize = averagePicSize >> minPicSizeRatio. Allowed values are 1 to 4. Setting this to 0 will enable encoder chosen ratio. +@param maxPicSizeRatio : This ratio is used to compute maximum picture size in the following manner, +maxPicSize = averagePicSize * maxPicSizeRatio. Allowed values are 2 to 30. Setting this to 0 or 1 will enable encoder chosen ratio. +*/ +/* ============================================================================= */ +typedef struct OMX_TI_VIDEO_CONFIG_PICSIZECONTROLINFO { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U16 minPicSizeRatio; + OMX_U16 maxPicSizeRatio; +} OMX_TI_VIDEO_CONFIG_PICSIZECONTROLINFO; + + +/*!====================================================================! + + Currently we only support SVC baseline profile + + * !====================================================================!*/ + typedef enum OMX_TI_VIDEO_SVCPROFILETYPE { + OMX_VIDEO_SVCProfileBaseline = 0x01, /**< Baseline profile */ + OMX_VIDEO_SVCProfileHigh = 0x02, /**< High profile */ + OMX_VIDEO_SVCProfileHighIntra = 0x03, /**< High Intra profile */ + OMX_VIDEO_SVCProfileMax = 0x7FFFFFFF + } OMX_TI_VIDEO_SVCPROFILETYPE; + + +/*!====================================================================! + + Currently we support only SVC baseline profile upto level 4 for SVC encoder. + + * !====================================================================!*/ + typedef enum OMX_TI_VIDEO_SVCLEVELTYPE { + OMX_VIDEO_SVCLevel1 = 0x01, /**< Level 1 */ + OMX_VIDEO_SVCLevel1b = 0x02, /**< Level 1b */ + OMX_VIDEO_SVCLevel11 = 0x04, /**< Level 1.1 */ + OMX_VIDEO_SVCLevel12 = 0x08, /**< Level 1.2 */ + OMX_VIDEO_SVCLevel13 = 0x10, /**< Level 1.3 */ + OMX_VIDEO_SVCLevel2 = 0x20, /**< Level 2 */ + OMX_VIDEO_SVCLevel21 = 0x40, /**< Level 2.1 */ + OMX_VIDEO_SVCLevel22 = 0x80, /**< Level 2.2 */ + OMX_VIDEO_SVCLevel3 = 0x100, /**< Level 3 */ + OMX_VIDEO_SVCLevel31 = 0x200, /**< Level 3.1 */ + OMX_VIDEO_SVCLevel32 = 0x400, /**< Level 3.2 */ + OMX_VIDEO_SVCLevel4 = 0x800, /**< Level 4 */ + OMX_VIDEO_SVCLevel41 = 0x1000, /**< Level 4.1 */ + OMX_VIDEO_SVCLevel42 = 0x2000, /**< Level 4.2 */ + OMX_VIDEO_SVCLevel5 = 0x4000, /**< Level 5 */ + OMX_VIDEO_SVCLevel51 = 0x8000, /**< Level 5.1 */ + OMX_VIDEO_SVCLevelMax = 0x7FFFFFFF + } OMX_TI_VIDEO_SVCLEVELTYPE; + + + typedef struct OMX_VIDEO_SVC_STD_PARAMS { + OMX_U32 nSliceHeaderSpacing; + OMX_U32 nPFrames; + OMX_U32 nBFrames; + OMX_BOOL bUseHadamard; + OMX_U32 nRefFrames; + OMX_U32 nRefIdx10ActiveMinus1; + OMX_U32 nRefIdx11ActiveMinus1; + OMX_BOOL bEnableUEP; + /* Not needed as per SVC encoder requirements + OMX_BOOL bEnableFMO; + OMX_BOOL bEnableASO; + OMX_BOOL bEnableRS; + */ + OMX_VIDEO_AVCLOOPFILTERTYPE eLoopFilterMode; + OMX_U32 nAllowedPictureTypes; + OMX_BOOL bFrameMBsOnly; + OMX_BOOL bMBAFF; + OMX_BOOL bEntropyCodingCABAC; + OMX_BOOL bWeightedPPrediction; + OMX_U32 nWeightedBipredicitonMode; + OMX_BOOL bconstIpred; + OMX_BOOL bDirect8x8Inference; + OMX_BOOL bDirectSpatialTemporal; + OMX_U32 nCabacInitIdc; + } OMX_VIDEO_SVC_STD_PARAMS; + + + typedef struct OMX_VIDEO_SVC_RECTTYPE { + OMX_S32 nLeft; + OMX_S32 nTop; + OMX_U32 nWidth; + OMX_U32 nHeight; + } OMX_VIDEO_SVC_RECTTYPE; + + + typedef struct OMX_VIDEO_SVC_BITRATETYPE { + OMX_VIDEO_CONTROLRATETYPE eControlRate; + OMX_U32 nTargetBitrate; + } OMX_VIDEO_SVC_BITRATETYPE; + + + typedef struct OMX_VIDEO_SVC_MOTIONVECTORTYPE { + OMX_VIDEO_MOTIONVECTORTYPE eAccuracy; + OMX_BOOL bUnrestrictedMVs; + OMX_BOOL bFourMV; + OMX_S32 sXSearchRange; + OMX_S32 sYSearchRange; + } OMX_VIDEO_SVC_MOTIONVECTORTYPE; + + + typedef struct OMX_VIDEO_SVC_QUANTIZATIONTYPE { + OMX_U32 nQpI; + OMX_U32 nQpP; + OMX_U32 nQpB; + } OMX_VIDEO_SVC_QUANTIZATIONTYPE; + + + typedef struct OMX_VIDEO_SVC_INTRAREFRESHTYPE { + OMX_VIDEO_INTRAREFRESHTYPE eRefreshMode; + OMX_U32 nAirMBs; + OMX_U32 nAirRef; + OMX_U32 nCirMBs; + } OMX_VIDEO_SVC_INTRAREFRESHTYPE; + + + typedef struct OMX_VIDEO_SVC_VBSMCTYPE { + OMX_BOOL b16x16; + OMX_BOOL b16x8; + OMX_BOOL b8x16; + OMX_BOOL b8x8; + OMX_BOOL b8x4; + OMX_BOOL b4x8; + OMX_BOOL b4x4; + } OMX_VIDEO_SVC_VBSMCTYPE; + + + typedef struct OMX_VIDEO_SVC_NALUCONTROLTYPE { + OMX_U32 nStartofSequence; + OMX_U32 nEndofSequence; + OMX_U32 nIDR; + OMX_U32 nIntraPicture; + OMX_U32 nNonIntraPicture; + }OMX_VIDEO_SVC_NALUCONTROLTYPE; + + + typedef struct OMX_VIDEO_SVC_MEBLOCKSIZETYPE { + OMX_VIDEO_BLOCKSIZETYPE eMinBlockSizeP; + OMX_VIDEO_BLOCKSIZETYPE eMinBlockSizeB; + }OMX_VIDEO_SVC_MEBLOCKSIZETYPE; + + + typedef struct OMX_VIDEO_SVC_INTRAPREDTYPE { + OMX_U32 nLumaIntra4x4Enable; + OMX_U32 nLumaIntra8x8Enable; + OMX_U32 nLumaIntra16x16Enable; + OMX_U32 nChromaIntra8x8Enable; + OMX_VIDEO_CHROMACOMPONENTTYPE eChromaComponentEnable; + }OMX_VIDEO_SVC_INTRAPREDTYPE; + + + typedef struct OMX_VIDEO_SVC_ENCODER_PRESETTYPE { + OMX_VIDEO_ENCODING_MODE_PRESETTYPE eEncodingModePreset; + OMX_VIDEO_RATECONTROL_PRESETTYPE eRateControlPreset; + }OMX_VIDEO_SVC_ENCODER_PRESETTYPE; + + + typedef struct OMX_VIDEO_SVC_VUIINFOTYPE { + OMX_BOOL bAspectRatioPresent; + OMX_VIDEO_ASPECTRATIOTYPE ePixelAspectRatio; + OMX_BOOL bFullRange; + }OMX_VIDEO_SVC_VUIINFOTYPE; + + + typedef struct OMX_VIDEO_SVC_HRDBUFFERSETTING { + OMX_U32 nInitialBufferLevel; + OMX_U32 nHRDBufferSize; + OMX_U32 nTargetBitrate; + }OMX_VIDEO_SVC_HRDBUFFERSETTING; + + + typedef struct OMX_VIDEO_SVC_INTRAPERIOD { + OMX_U32 nIDRPeriod; + OMX_U32 nPFrames; + } OMX_VIDEO_SVC_INTRAPERIOD; + + + typedef struct OMX_VIDEO_SVC_PIXELINFOTYPE { + OMX_U32 nWidth; + OMX_U32 nHeight; + } OMX_VIDEO_SVC_PIXELINFOTYPE; + + + typedef struct OMX_VIDEO_SVC_MESEARCHRANGETYPE { + OMX_VIDEO_MOTIONVECTORTYPE eMVAccuracy; + OMX_U32 nHorSearchRangeP; + OMX_U32 nVerSearchRangeP; + OMX_U32 nHorSearchRangeB; + OMX_U32 nVerSearchRangeB; + }OMX_VIDEO_SVC_MESEARCHRANGETYPE; + + + typedef struct OMX_VIDEO_SVC_QPSETTINGSTYPE { + OMX_U32 nQpI; + OMX_U32 nQpMaxI; + OMX_U32 nQpMinI; + OMX_U32 nQpP; + OMX_U32 nQpMaxP; + OMX_U32 nQpMinP; + OMX_U32 nQpOffsetB; + OMX_U32 nQpMaxB; + OMX_U32 nQpMinB; + }OMX_VIDEO_SVC_QPSETTINGSTYPE; + + + typedef struct OMX_VIDEO_SVC_SLICECODINGTYPE { + OMX_VIDEO_AVCSLICEMODETYPE eSliceMode; + OMX_U32 nSlicesize; + }OMX_VIDEO_SVC_SLICECODINGTYPE; + + + typedef struct OMX_VIDEO_EXEC_SVC_HRDBUFFERSETTING { + OMX_U32 nHRDBufferSize; + OMX_U32 nEncodeBitrate; + }OMX_VIDEO_EXEC_SVC_HRDBUFFERSETTING; + +/** + * SVC params + * + * STRUCT MEMBERS: + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to + * nSliceHeaderSpacing : Number of macroblocks between slice header, put + * zero if not used + * nPFrames : Number of P frames between each I frame + * nBFrames : Number of B frames between each I frame + * bUseHadamard : Enable/disable Hadamard transform + * nRefFrames : Max number of reference frames to use for inter + * motion search (1-16) + * nRefIdxTrailing : Pic param set ref frame index (index into ref + * frame buffer of trailing frames list), B frame + * support + * nRefIdxForward : Pic param set ref frame index (index into ref + * frame buffer of forward frames list), B frame + * support + * bEnableUEP : Enable/disable unequal error protection. This + * is only valid of data partitioning is enabled. + * bEnableFMO : Enable/disable flexible macroblock ordering + * bEnableASO : Enable/disable arbitrary slice ordering + * bEnableRS : Enable/disable sending of redundant slices + * eProfile : AVC profile(s) to use + * eLevel : AVC level(s) to use + * nAllowedPictureTypes : Specifies the picture types allowed in the + * bitstream + * bFrameMBsOnly : specifies that every coded picture of the + * coded video sequence is a coded frame + * containing only frame macroblocks + * bMBAFF : Enable/disable switching between frame and + * field macroblocks within a picture + * bEntropyCodingCABAC : Entropy decoding method to be applied for the + * syntax elements for which two descriptors appear + * in the syntax tables + * bWeightedPPrediction : Enable/disable weighted prediction shall not + * be applied to P and SP slices + * nWeightedBipredicitonMode : Default weighted prediction is applied to B + * slices + * bconstIpred : Enable/disable intra prediction + * bDirect8x8Inference : Specifies the method used in the derivation + * process for luma motion vectors for B_Skip, + * B_Direct_16x16 and B_Direct_8x8 as specified + * in subclause 8.4.1.2 of the AVC spec + * bDirectSpatialTemporal : Flag indicating spatial or temporal direct + * mode used in B slice coding (related to + * bDirect8x8Inference) . Spatial direct mode is + * more common and should be the default. + * nCabacInitIdx : Index used to init CABAC contexts + * eLoopFilterMode : Enable/disable loop filter + */ + typedef struct OMX_TI_VIDEO_PARAM_SVCTYPE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + + OMX_U32 nActualFrameWidth; + OMX_U32 nActualFrameHeight; + OMX_S32 nStride; + OMX_U32 xFramerate; + OMX_COLOR_FORMATTYPE eColorFormat; + OMX_VIDEO_SVC_RECTTYPE sRecType; + + OMX_VIDEO_SVC_STD_PARAMS sBasicParams; + + OMX_U32 nRefFrames; + OMX_TI_VIDEO_SVCPROFILETYPE eProfile; + OMX_TI_VIDEO_SVCLEVELTYPE eLevel; + + OMX_U32 xEncodeFramerate; + OMX_VIDEO_SVC_BITRATETYPE sBitRateParams; + + OMX_VIDEO_SVC_MOTIONVECTORTYPE sMotionVectorParams; + OMX_VIDEO_SVC_QUANTIZATIONTYPE sQuantizationParams; + OMX_VIDEO_SVC_INTRAREFRESHTYPE sIntraRefreshParams; + OMX_VIDEO_SVC_VBSMCTYPE sVBSMCParams; + + //OMX_NALUFORMATSTYPE eNaluFormat; + OMX_VIDEO_SVC_NALUCONTROLTYPE sNalUnitParams; + + OMX_VIDEO_SVC_MEBLOCKSIZETYPE sMEBlockSizeParams; + OMX_VIDEO_SVC_INTRAPREDTYPE sIntraPredParams; + OMX_VIDEO_SVC_ENCODER_PRESETTYPE sEncPresetParams; + OMX_VIDEO_TRANSFORMBLOCKSIZETYPE eTransformBlocksize; + OMX_VIDEO_SVC_VUIINFOTYPE sVUIInfoParams; + OMX_VIDEO_SVC_HRDBUFFERSETTING sHRDBufferParams; + + OMX_U32 nNumTemporalLayers; + OMX_S32 nDependencyID; + OMX_S32 nQualityID; + //OMX_VIDEO_SVC_ENCODE_MODE eModeOfEncode; + + OMX_U32 nErrorConcealmentMode; + OMX_U32 nDeblockFilterMode; + } OMX_TI_VIDEO_PARAM_SVCTYPE; + + typedef struct OMX_TI_VIDEO_CONFIG_SVCLAYERDETAILS { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + + OMX_U32 nNumLayers; + OMX_U32 nLayerId; + OMX_U8 nPriorityId; + OMX_U8 nDependencyId; + OMX_U8 nQualityId; + OMX_U8 nTemporalId; + OMX_U8 nBitrateInfoPresentFlag; + OMX_U8 nFramerateInfoPresentFlag; + OMX_U8 nFramesizeInfoPresentFlag; + OMX_U16 nAvgBitrate; + OMX_U16 nMaxBitrate; + OMX_U16 nAvgFramerate; + OMX_U32 nFrameWidth; + OMX_U32 nFrameHeight; + + OMX_U32 nLayerIndex; /* Used to query for individual layer details */ + +} OMX_TI_VIDEO_CONFIG_SVCLAYERDETAILS; + +typedef struct OMX_TI_VIDEO_CONFIG_SVCTARGETLAYER { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + + OMX_U32 nSvcTargetLayerDID; + OMX_U32 nSvcTargetLayerTID; + OMX_U32 nSvcTargetLayerQID; + +} OMX_TI_VIDEO_CONFIG_SVCTARGETLAYER; +/* ========================================================================== */ +/*! +@brief OMX_TI_VIDEO_SLICEDATAINFO : to configure the Slice Settings +@param nNumofSlices number of validfields to be read +@param nSliceSizeConfigured variable that indicates the MaxSlice configured + & (n*nSliceSizeConfigured) gives the buff offset + for nth slice in the o/p buffer +@param nSliceSize gives the SliceSize +*/ +/* ==========================================================================*/ +typedef struct OMX_TI_VIDEO_SLICEDATAINFO { + OMX_U32 nNumofSlices; + OMX_U32 nSliceSizeConfigured; + OMX_U32 nSliceSize[OMXH264E_MAX_SLICE_SUPPORTED]; +} OMX_TI_VIDEO_SLICEDATAINFO; +/** +* @brief mode selection for the data that is given to the Codec + */ + +typedef enum _OMX_VIDEO_AVCLTRMODE { + OMX_H264ENC_LTRP_NONE = 0, + /**< No longterm refernce frame in the sequnce + */ + OMX_H264ENC_LTRP_REFERTOIDR = 1, + /**< Mark all the I frames as long term-reference frames and + * based on the frame control IH264ENC_Control, refere to + * a long-term reference frame (I frame). + */ + OMX_H264ENC_LTRP_REFERTOP_PROACTIVE =2, + /**< Two long term frames are supported in this schme and + * long-term index marking and refernce frame update is done based + * the IH264ENC_Control values + */ + OMX_H264ENC_LTRP_REFERTOP_REACTIVE = 3 + /**< This is not supported in the current version of encoder + */ +} OMX_VIDEO_AVCLTRMODE; + + +/* ============================================================================= */ +/* +@brief OMX_TI_VIDEO_PARAM_AVC_LTRP : Structure to enable the configuration of Long Term reference Picture feature in H264 Encoder for the session +Enabling this parameter will instruct encoder to keep its recent I/IDR frame in its reference buffer list. +So it increases the DDR foot print by one frame buffer +@param eLTRMode : enables the LongTerm Reference Picture, possible modes: 0, 1, 2 +@param nLTRInterval : interval of the write indicating to codec interms of the frame number +*/ +/* ============================================================================= */ +typedef struct OMX_TI_VIDEO_PARAM_AVC_LTRP{ + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_VIDEO_AVCLTRMODE eLTRMode; + OMX_U32 nLTRInterval; +} OMX_TI_VIDEO_PARAM_AVC_LTRP; + +/* +@brief OMX_TI_VIDEO_CONFIG_AVC_LTRP : Structure to provide the configuration to acknowledge successful decode of previous LTR +@param eLTRFrameDecoded : tells the decoder that the LTR has been decoded successfully when set to TRUE +*/ +/* ============================================================================= */ +typedef struct OMX_TI_VIDEO_CONFIG_AVC_LTRP{ + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_BOOL bEnableNextLTR; +} OMX_TI_VIDEO_CONFIG_AVC_LTRP; + +/* ============================================================================= */ +/* +@brief OMX_TI_VIDEO_CONFIG_AVC_LTRP_INTERVAL : Structure to enable the update of the LTRP +Interval during runtime +@param nLTRInterval : interval of the write indicating to codec interms of the frame number +*/ +/* ============================================================================= */ +typedef struct OMX_TI_VIDEO_CONFIG_AVC_LTRP_INTERVAL{ + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U32 nLTRInterval; +} OMX_TI_VIDEO_CONFIG_AVC_LTRP_INTERVAL; + +/* ============================================================================= */ +/* +@brief OMX_TI_VIDEO_CONFIG_AVC_LTRP_INTERVAL : Structure to enable timestamps in decode order + at i/p of decoders. +*/ +/* ============================================================================= */ +typedef struct OMX_TI_PARAM_TIMESTAMP_IN_DECODE_ORDER{ + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_BOOL bEnabled; +} OMX_TI_PARAM_TIMESTAMP_IN_DECODE_ORDER; + +/* ============================================================================= */ +/* +@brief OMX_TI_VIDEO_PARAM_AUTO_FRAMERATE_UPDATE : Structure to enable dynamic update of frame rate +*/ +/* ============================================================================= */ +typedef struct OMX_TI_VIDEO_PARAM_AUTO_FRAMERATE_UPDATE { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_BOOL bEnableAutoVFRUpdate; + OMX_U32 nDiffThresholdtoUpdate; + OMX_U32 nMaxSessionFrameRate; +} OMX_TI_VIDEO_PARAM_AUTO_FRAMERATE_UPDATE; + +/* ============================================================================= */ +/* +@brief OMX_TI_PARAM_SKIP_GREY_OUTPUT_FRAMES : Structure to enable feature to skip grey output + frames which doesn't have proper reference. +*/ +/* ============================================================================= */ +typedef struct OMX_TI_PARAM_SKIP_GREY_OUTPUT_FRAMES { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_BOOL bEnabled; +} OMX_TI_PARAM_SKIP_GREY_OUTPUT_FRAMES; + +/* ============================================================================= */ +/* +@brief OMX_TI_PARAM_DECMETADATA : Structure to enable different codec metadata + for video decoders. +*/ +/* ============================================================================= */ +typedef struct OMX_TI_PARAM_DECMETADATA { + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_BOOL bEnableMBInfo; + OMX_BOOL bEnableTranscodeMode; + OMX_BOOL bEnableSEIInfo; + OMX_BOOL bEnableVUIInfo; +} OMX_TI_PARAM_DECMETADATA; + +/** + ****************************************************************************** + * @enum OMX_TI_VIDEO_MBERRSTATUS + * @brief This enum indicates if a MB was in error or not + * + ****************************************************************************** +*/ +typedef enum { + OMX_TI_VIDEO_MB_NOERROR = 0, + /** + * MB was non-erroneous + */ + OMX_TI_VIDEO_MB_ERROR = 1 + /** + * MB was erroneous + */ +} OMX_TI_VIDEO_MBERRSTATUS; + + +/** + * Macro definitions required for SEI support: HRD sequence parameter set + */ +#define OMX_TI_VIDEO_H264VDEC_MAXCPBCNT 32 + +/** + * Macro definitions required for SEI support: HRD sequence parameter set + */ +#define OMX_TI_VIDEO_H264VDEC_MAXUSERDATA_PAYLOAD 300 + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_HrdParams + * + * @brief This structure contains the HRD parameter elements. + * + * @param cpb_cnt_minus1 : Number of alternative CPB specifications in the + * bit-stream + * @param bit_rate_scale : Together with bit_rate_value[i], it specifies the + * maximum input bit-rate for the ith CPB. + * @param cpb_size_scale : Together with cpb_size_value[i], specifies the + * maximum CPB size for the ith CPB. + * @param bit_rate_value_minus1[OMX_TI_VIDEO_H264VDEC_MAXCPBCNT] :Maximum input bitrate + * for the ith CPB + * @param cpb_size_value_minus1[OMX_TI_VIDEO_H264VDEC_MAXCPBCNT] :Maximum CPB size for the + * ith CPB + * @param vbr_cbr_flag[OMX_TI_VIDEO_H264VDEC_MAXCPBCNT] :Specifies the ith CPB is operated + * in Constant Bit-rate mode or variable bit-rate mode + * @param initial_cpb_removal_delay_length_minus1 :Length in bits of + * initial_cpb_removal_length syntax element + * @param cpb_removal_delay_length_minus1 :Length in bits of + * cpb_removal_delay_length syntax element + * @param dpb_output_delay_length_minus1 :Length in bits of + * dpb_output_delay_length syntax element + * @param time_offset_length : Length in bits of time_offset syntax element + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_HrdParams { + OMX_U32 cpb_cnt_minus1; + OMX_U8 bit_rate_scale; + OMX_U8 cpb_size_scale; + OMX_U32 bit_rate_value_minus1[OMX_TI_VIDEO_H264VDEC_MAXCPBCNT]; + OMX_U32 cpb_size_value_minus1[OMX_TI_VIDEO_H264VDEC_MAXCPBCNT]; + OMX_U8 vbr_cbr_flag[OMX_TI_VIDEO_H264VDEC_MAXCPBCNT]; + OMX_U8 initial_cpb_removal_delay_length_minus1; + OMX_U8 cpb_removal_delay_length_minus1; + OMX_U8 dpb_output_delay_length_minus1; + OMX_U8 time_offset_length; +} OMX_TI_VIDEO_H264VDEC_HrdParams; + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_SVCVuiParams + * + * @brief This structure contains VUI message syntax elements for scalable + * video stream + * + * @param parsed_flag :1 - Indicates that in the current process call, c + * contents of the structure is updated + * 0 - Indicates contents of the structure is not updated + * + * @param svc_vui_ext_num_entries_minus1:(svc_vui_ext_num_entries_minus1 + 1) + * specifies the number of information + * entries that are present in the SVC + * VUI parameters extension syntax + * structure + * @param svc_vui_ext_dependency_id:indicate the max value of DId for the + * i-th subset of coded video sequences + * @param svc_vui_ext_quality_id:indicate the max value of QId for the + * i-th subset of coded video sequences + * @param svc_vui_ext_temporal_id: indicate the max value of TId for the + * i-th subset of coded video sequences + * @param svc_vui_ext_timing_info_present_flag: Flag to tells that + * svc_vui_ext_num_units_in_tick, + * svc_vui_ext_time_scale, + * svc_vui_ext_fixed_frame_rate_flag + * are present for current coded + * sequence or not. + * @param svc_vui_ext_num_units_in_tick: specifies the value of num_units_in_tick + * @param svc_vui_ext_time_scale: specifies the value of time_scale + * @param svc_vui_ext_fixed_frame_rate_flag: specifies the value of + * fixed_frame_rate_flag + * @param svc_vui_ext_nal_hrd_parameters_present_flag:specifies the + * value of nal_hrd_parameters_present_flag + * @param svc_vui_ext_vcl_hrd_parameters_present_flag: ] specifies the + * value of vcl_hrd_parameters_present_flag + * @param svc_vui_ext_low_delay_hrd_flag: specifies the value + * of low_delay_hrd_flag + * @param svc_vui_ext_pic_struct_present_flag: specifies the value + * of pic_struct_present_flag + * + ****************************************************************************** +*/ + +typedef struct sOMX_TI_VIDEO_H264VDEC_SVCVuiParams { + OMX_U32 parsed_flag; + OMX_U16 svc_vui_ext_num_entries_minus1; + OMX_U16 svc_vui_ext_dependency_id; + OMX_U16 svc_vui_ext_quality_id; + OMX_U16 svc_vui_ext_temporal_id; + OMX_U16 svc_vui_ext_timing_info_present_flag; + OMX_U32 svc_vui_ext_num_units_in_tick; + OMX_U32 svc_vui_ext_time_scale; + OMX_U16 svc_vui_ext_fixed_frame_rate_flag; + OMX_U16 svc_vui_ext_nal_hrd_parameters_present_flag; + OMX_U16 svc_vui_ext_vcl_hrd_parameters_present_flag; + OMX_U16 svc_vui_ext_low_delay_hrd_flag; + OMX_U16 svc_vui_ext_pic_struct_present_flag; +} OMX_TI_VIDEO_H264VDEC_SVCVuiParams; + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_VuiParams + * + * @brief This structure contains the VUI Sequence Parameter elements. + * + * @param parsed_flag :1 - Indicates that in the current process call, c + * contents of the structure is updated + * 0 - Indicates contents of the structure is not updated + * @param aspect_ratio_info_present_flag :Indicates whether aspect ratio idc + * is present or not. + * @param aspect_ratio_idc : Aspect ratio of Luma samples + * @param sar_width : Horizontal size of sample aspect ratio + * @param sar_height : Vertical size of sample aspect ratio + * @param overscan_info_present_flag : Cropped decoded pictures are suitable + * for display or not. + * @param overscan_appropriate_flag : Overscan_appropriate_flag + * @param video_signal_type_present_flag : Flag indicates whether + * video_format, video_full_range_flag and colour_description_present_ + * flag are present or not + * @param video_format :Video format indexed by a table. For example,PAL/NTSC + * @param video_full_range_flag : Black level, luma and chroma ranges. It + * should be used for BT.601 compliance + * @param colour_description_present_flag:Indicates whether colour_primaries, + * transfer_characteristics and matrix_coefficients are present. + * @param colour_primaries :Chromaticity co-ordinates of source primaries + * @param transfer_characteristics :Opto-electronic transfer characteristics + * of the source picture + * @param matrix_coefficients :Matrix coefficients for deriving Luma and + * chroma data from RGB components. + * @param chroma_location_info_present_flag : Flag indicates whether + * chroma_sample_loc_type_top field and chroma_sample_loctype + * bottom_field are present. + * @param chroma_sample_loc_type_top_field : Location of chroma_sample top + * field + * @param chroma_sample_loc_type_bottom_field :Location of chroma_sample + * bottom field + * @param timing_info_present_flag :Indicates whether num_units_in_tick, + * time_scale, and fixed_frame_rate_flag are present. + * @param num_units_in_tick :Number of units of a clock that corresponds to 1 + * increment of a clock tick counter + * @param time_scale :Indicates actual increase in time for 1 increment of a + * clock tick counter + * @param fixed_frame_rate_flag :Indicates how the temporal distance between + * HRD output times of any two output pictures is constrained + * @param nal_hrd_parameters_present_flag :Indicates whether + * nal_hrd_parameters are present + * @param nal_hrd_pars : NAL HRD Parameters + * @param vcl_hrd_parameters_present_flag :Indicates whether + * vcl_hrd_parameters are present + * @param vcl_hrd_pars : VCL HRD Parameters + * @param low_delay_hrd_flag :HRD operational mode as in Annex C of the + * standard + * @param pic_struct_present_flag :Indicates whether picture timing SEI + * messages are present + * @param bitstream_restriction_flag :Indicates if the bit-stream restriction + * parameters are present + * @param motion_vectors_over_pic_boundaries_flag :Specifies whether motion + * vectors can point to regions outside the picture boundaries + * @param max_bytes_per_pic_denom :Maximum number of bytes not exceeded by + * the sum of sizes of all VCL NAL units of a single coded picture + * @param max_bits_per_mb_denom :Maximum number of bits taken by any coded MB + * @param log2_max_mv_length_vertical :Maximum value of any motion vector\u2019s + * vertical component + * @param log2_max_mv_length_horizontal :Maximum value of any motion vector\u2019s + * horizontal component + * @param max_dec_frame_reordering : + * @param num_reorder_frames :Maximum number of frames that need to be + * re-ordered + * @param max_dec_frame_buffering :Size of HRD decoded buffer (DPB) in terms + * of frame buffers + * @param svcVuiParams : struct instance of vui parameters for svc + * + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_VuiParams { + OMX_U32 parsed_flag; + OMX_U8 aspect_ratio_info_present_flag; + OMX_U32 aspect_ratio_idc; + OMX_U32 sar_width; + OMX_U32 sar_height; + OMX_U8 overscan_info_present_flag; + OMX_U8 overscan_appropriate_flag; + OMX_U8 video_signal_type_present_flag; + OMX_U8 video_format; + OMX_U8 video_full_range_flag; + OMX_U8 colour_description_present_flag; + OMX_U8 colour_primaries; + OMX_U8 transfer_characteristics; + OMX_U8 matrix_coefficients; + OMX_U8 chroma_location_info_present_flag; + OMX_U32 chroma_sample_loc_type_top_field; + OMX_U32 chroma_sample_loc_type_bottom_field; + OMX_U8 timing_info_present_flag; + OMX_U32 num_units_in_tick; + OMX_U32 time_scale; + OMX_U8 fixed_frame_rate_flag; + OMX_U8 nal_hrd_parameters_present_flag; + OMX_TI_VIDEO_H264VDEC_HrdParams nal_hrd_pars; + OMX_U8 vcl_hrd_parameters_present_flag; + OMX_TI_VIDEO_H264VDEC_HrdParams vcl_hrd_pars; + OMX_U8 low_delay_hrd_flag; + OMX_U8 pic_struct_present_flag; + OMX_U8 bitstream_restriction_flag; + OMX_U8 motion_vectors_over_pic_boundaries_flag; + OMX_U32 max_bytes_per_pic_denom; + OMX_U32 max_bits_per_mb_denom; + OMX_U32 log2_max_mv_length_vertical; + OMX_U32 log2_max_mv_length_horizontal; + OMX_U32 max_dec_frame_reordering; + OMX_U32 num_reorder_frames; + OMX_U32 max_dec_frame_buffering; + OMX_TI_VIDEO_H264VDEC_SVCVuiParams svcVuiParams; +} OMX_TI_VIDEO_H264VDEC_VuiParams; + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_SeiUserDataRegITUT + * + * @brief This structure contains the user data SEI msg elements + * + * @param parsed_flag :1 - Indicates that in the current process call, + * contents of the structure is updated + * 0 - Indicates contents of the structure is not updated + * @param num_payload_bytes :Specifies the size of the payload + * @param itu_t_t35_country_code : A byte having a value specified as a + * country code by ITU-T Recommendation T.35 Annex A + * @param itu_t_t35_country_code_extension_byte :A byte having a value + * specified as a country code by ITU-T Recommendation T.35 Annex B + * @param itu_t_t35_payload_byte[] : A byte containing data registered as + * specified by ITU-T Recommendation T.35. + * @param dataOverflowFlag: This indicates if pay load data is more than the + * array size i.e., OMX_TI_VIDEO_H264VDEC_MAXUSERDATA_PAYLOAD. + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_SeiUserDataRegITUT { + OMX_U32 parsed_flag; + OMX_U32 num_payload_bytes; + OMX_U8 itu_t_t35_country_code; + OMX_U8 itu_t_t35_country_code_extension_byte; + OMX_U8 itu_t_t35_payload_byte[OMX_TI_VIDEO_H264VDEC_MAXUSERDATA_PAYLOAD]; + OMX_U8 dataOverflowFlag; +} OMX_TI_VIDEO_H264VDEC_SeiUserDataRegITUT; + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_SeiUserDataUnReg + * + * @brief This structure contains the user data SEI msg elements + * + * @param parsed_flag :1 - Indicates that in the current process call, + * contents of the structure is updated + * 0 - Indicates contents of the structure is not updated + * @param num_payload_bytes :Specifies the size of the payload + * @param uuid_iso_iec_11578 :Value specified as a UUID according to the + * procedures of ISO/IEC 11578:1996 Annex A. + * @param user_data_payload_byte :Byte containing data having syntax and + * semantics as specified by the UUID generator. + * @param dataOverflowFlag: This indicates if pay load data is more than the + * array size i.e., OMX_TI_VIDEO_H264VDEC_MAXUSERDATA_PAYLOAD. + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_SeiUserDataUnReg { + OMX_U32 parsed_flag; + OMX_U32 num_payload_bytes; + OMX_U8 uuid_iso_iec_11578[16]; + OMX_U8 user_data_payload_byte[OMX_TI_VIDEO_H264VDEC_MAXUSERDATA_PAYLOAD]; + OMX_U8 dataOverflowFlag; +} OMX_TI_VIDEO_H264VDEC_SeiUserDataUnReg; + + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_SeiBufferingPeriod + * + * @brief This structure contains the buffering period SEI msg elements + * + * @param parsed_flag :1 - Indicates that in the current process call, + * contents of the structure is updated + * 0 - Indicates contents of the structure is not updated + * @param seq_parameter_set_id :Specifies the sequence parameter set that + * contains the sequence HRD attributes + * @param nal_cpb_removal_delay :Specifies the delay for the indexed NAL CPB + * between the time of arrival in the CPB of the first bit of the + * coded data associated with the access unit associated with the + * buffering period SEI message and the time of removal from the CPB + * of the coded data associated with the same access unit, for the + * first buffering period after HRD initialization. + * @param nal_cpb_removal_delay_offset :Used for the indexed NAL CPB in + * combination with the cpb_removal_delay to specify the initial + * delivery time of coded access units to the CPB + * @param vcl_cpb_removal_delay :Specifies the delay for the indexed VCL CPB + * between the time of arrival in the CPB of the first bit of the + * coded data associated with the access unit associated with the + * buffering period SEI message and the time of removal from the CPB + * of the coded data associated with the same access unit, for the + * first buffering period after HRD initialization. + * @param vcl_cpb_removal_delay_offset :Used for the indexed VCL CPB in + * combination with the cpb_removal_delay to specify the initial + * delivery time of coded access units to the CPB + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_SeiBufferingPeriod { + OMX_U32 parsed_flag; + OMX_U32 seq_parameter_set_id; + OMX_U32 nal_cpb_removal_delay[OMX_TI_VIDEO_H264VDEC_MAXCPBCNT]; + OMX_U32 nal_cpb_removal_delay_offset[OMX_TI_VIDEO_H264VDEC_MAXCPBCNT]; + OMX_U32 vcl_cpb_removal_delay[OMX_TI_VIDEO_H264VDEC_MAXCPBCNT]; + OMX_U32 vcl_cpb_removal_delay_offset[OMX_TI_VIDEO_H264VDEC_MAXCPBCNT]; +}OMX_TI_VIDEO_H264VDEC_SeiBufferingPeriod; +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_SeiPanScanRect + * + * @brief This structure contains the pan scan rectangle SEI msg elements + * + * @param parsed_flag :1 - Indicates that in the current process call, + * contents of the structure is updated + * 0 - Indicates contents of the structure is not updated + * @param pan_scan_rect_id :Specifies an identifying number that may be used + * to identify the purpose of the pan-scan rectangle + * @param pan_scan_rect_cancel_flag :Equal to 1 indicates that the SEI + * message cancels the persistence of any previous pan-scan + * rectangle SEI message in output order. + * pan_scan_rect_cancel_flag equal to 0 indicates that + * pan-scan rectangle information follows. + * @param pan_scan_cnt_minus1 :Specifies the number of pan-scan rectangles + * that are present in the SEI message + * @param pan_scan_rect_left_offset :Specifies as signed integer quantities + * in units of one-sixteenth sample spacing relative to the luma + * sampling grid, the location of the pan-scan rectangle + * @param pan_scan_rect_right_offset :Specifies as signed integer quantities + * in units of one-sixteenth sample spacing relative to the luma + * sampling grid, the location of the pan-scan rectangle + * @param pan_scan_rect_top_offset : Top offset + * @param pan_scan_rect_bottom_offset : Bottom offset + * @param pan_scan_rect_repetition_period :Specifies the persistence of the + * pan-scan rectangle SEI message and may specify a picture order + * count interval within which another pan-scan rectangle SEI message + * with the same value of pan_scan_rect_id or the end of the coded + * video sequence shall be present in the bit-stream + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_SeiPanScanRect { + OMX_U32 parsed_flag; + OMX_U32 pan_scan_rect_id; + OMX_U32 pan_scan_rect_cancel_flag; + OMX_U32 pan_scan_cnt_minus1; + OMX_S32 pan_scan_rect_left_offset[3]; + OMX_S32 pan_scan_rect_right_offset[3]; + OMX_S32 pan_scan_rect_top_offset[3]; + OMX_S32 pan_scan_rect_bottom_offset[3]; + OMX_U32 pan_scan_rect_repetition_period; +} OMX_TI_VIDEO_H264VDEC_SeiPanScanRect; + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_SeiProgRefineStart + * + * @brief This structure contains the progressive refinement start SEI msg + * elements + * + * @param parsed_flag :1 - Indicates that in the current process call, + * contents of the structure is updated + * 0 - Indicates contents of the structure is not updated + * @param progressive_refinement_id :Specifies an identification number for + * the progressive refinement operation. + * @param num_refinement_steps_minus1 :Specifies the number of reference + * frames in the tagged set of consecutive coded pictures + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_SeiProgRefineStart { + OMX_U32 parsed_flag; + OMX_U32 progressive_refinement_id; + OMX_U32 num_refinement_steps_minus1; +} OMX_TI_VIDEO_H264VDEC_SeiProgRefineStart; +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_SeiProgRefineEnd + * + * @brief TThis structure contains the progressive refinement end SEI msg + * elements + * + * @param parsed_flag :1 - Indicates that in the current process call, + * contents of the structure is updated + * 0 - Indicates contents of the structure is not updated + * @param progressive_refinement_id :Specifies an identification number for + * the progressive refinement operation. + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_SeiProgRefineEnd { + OMX_U32 parsed_flag; + OMX_U32 progressive_refinement_id; +} OMX_TI_VIDEO_H264VDEC_SeiProgRefineEnd; +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_SeiRecoveryPointInfo + * + * @brief This structure contains the sRecovery Point Info SEI msg elements + * + * @param parsed_flag :1 - Indicates that in the current process call, + * contents of the structure is updated + * 0 - Indicates contents of the structure is not updated + * @param exact_match_flag :Indicates whether decoded pictures at and + * subsequent to the specified recovery point in output order derived + * by starting the decoding process at the access unit associated with + * the recovery point SEI message, will be an exact match to the + * pictures that would be produced by starting the decoding process + * at the location of a previous IDR access unit in the NAL unit stream. + * @param recovery_frame_cnt :Specifies the recovery point of output pictures + * in output order + * @param broken_link_flag :Indicates the presence or absence of a broken + * link in the NAL unit stream + * @param changing_slice_group_idc :Indicates whether decoded pictures are + * correct or approximately correct in content at and subsequent to + * the recovery point in output order when all macro-blocks of the + * primary coded pictures are decoded within the changing slice group + * period. + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_SeiRecoveryPointInfo { + OMX_U32 parsed_flag; + OMX_U32 recovery_frame_cnt; + OMX_U32 exact_match_flag; + OMX_U32 broken_link_flag; + OMX_U32 changing_slice_group_idc; +} OMX_TI_VIDEO_H264VDEC_SeiRecoveryPointInfo; + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_SeiPictureTiming + * + * @brief This structure contains the picture timing SEI msg elements + * + * @param parsed_flag :1 - Indicates that in the current process call, + * contents of the structure is updated + * 0 - Indicates contents of the structure is not updated + * @param NumClockTs : + * @param cpb_removal_delay :Specifies how many clock ticks to wait after + * removal from the CPB of the access unit associated with the + * most recent buffering period SEI message before removing from + * the buffer the access unit data associated with the picture + * timing SEI message. + * @param dpb_output_delay : Used to compute the DPB output time of the + * picture. + * @param pic_struct : Indicates whether a picture should be displayed as + * a frame or field + * @param clock_time_stamp_flag[4]:1 - Indicates number of clock timestamp + * syntax elements present and follow immediately + * 0 \u2013 Indicates associated clock timestamp syntax + * elements not present + * @param ct_type[4] : Indicates the scan type(interlaced or progressive) + * of the source material + * @param nuit_field_based_flag[4] : Used to calculate the clockTimestamp + * @param counting_type[4] : Specifies the method of dropping values of + * n_frames + * @param full_timestamp_flag[4] : 1 - Specifies that the n_frames syntax + * element is followed by seconds_value, + * minutes_value, and hours_value. + * 0 - Specifies that the n_frames syntax + * element is followed by seconds_flag + * @param discontinuity_flag[4] : Indicates whether the difference between + * the current value of clockTimestamp and the value of + * clockTimestamp computed from the previous clockTimestamp in + * output order can be interpreted as the time difference between + * the times of origin or capture of the associated frames or + * fields. + * @param cnt_dropped_flag[4] : Specifies the skipping of one or more + * values of n_frames using the counting method + * @param n_frames[4] : Specifies the value of nFrames used to compute + * clockTimestamp. + * @param seconds_flag[4] : equal to 1 specifies that seconds_value and + * minutes_flag are present when + * full_timestamp_flag is equal to 0. + * @param minutes_flag[4] : equal to 1 specifies that minutes_value and + * hours_flag are present when full_timestamp_flag + * is equal to 0 and seconds_flag is equal to 1. + * @param hours_flag[4] : equal to 1 specifies that hours_value is + * present when full_timestamp_flag is equal to 0 + * and seconds_flag is equal to 1 and minutes_flag + * is equal to 1. + * @param seconds_value[4] : Specifies the value of sS used to compute + * clockTimestamp. + * @param minutes_value[4] : Specifies the value of mM used to compute + * clockTimestamp. + * @param hours_value[4] : Specifies the value of tOffset used to compute + * clockTimestamp + * @param time_offset[4] : Specifies the value of tOffset used to compute + * clockTimestamp + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_SeiPictureTiming { + OMX_U32 parsed_flag; + OMX_U32 NumClockTs; + OMX_U32 cpb_removal_delay; + OMX_U32 dpb_output_delay; + OMX_U32 pic_struct; + OMX_U32 clock_time_stamp_flag[4]; + OMX_U32 ct_type[4]; + OMX_U32 nuit_field_based_flag[4]; + OMX_U32 counting_type[4]; + OMX_U32 full_timestamp_flag[4]; + OMX_U32 discontinuity_flag[4]; + OMX_U32 cnt_dropped_flag[4]; + OMX_U32 n_frames[4]; + OMX_U32 seconds_flag[4]; + OMX_U32 minutes_flag[4]; + OMX_U32 hours_flag[4]; + OMX_U32 seconds_value[4]; + OMX_U32 minutes_value[4]; + OMX_U32 hours_value[4]; + OMX_S32 time_offset[4]; +}OMX_TI_VIDEO_H264VDEC_SeiPictureTiming; +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_SeiFullFrameFreezeRep + * + * @brief This structure contains the full frmae freeze repetition SEI msg + * elements + * + * @param parsed_flag :1 - Indicates that in the current process call, + * contents of the structure is updated + * 0 - Indicates contents of the structure is not updated + * @param full_frame_freeze_repetition_period :Specifies the persistence of + * the full-frame freeze SEI message + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_SeiFullFrameFreezeRep { + OMX_U32 parsed_flag; + OMX_U32 full_frame_freeze_repetition_period; +} OMX_TI_VIDEO_H264VDEC_SeiFullFrameFreezeRep; + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_SeiFullFrameFreezeRel + * + * @brief This structure contains frame freeze release SEI msg elements + * + * @param parsed_flag :1 - Indicates that in the current process call, + * contents of the structure is updated + * 0 - Indicates contents of the structure is not updated + * @param payloadSize : Size of the frame_freeze_release payload + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_SeiFullFrameFreezeRel { + OMX_U32 parsed_flag; + OMX_U32 payloadSize; +} OMX_TI_VIDEO_H264VDEC_SeiFullFrameFreezeRel; + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_SeiStereoVideoInfo + * + * @brief This structure contains stereo video information SEI msg elements + * + * @param parsed_flag :1 - Indicates that in the current process call, + * contents of the structure is updated + * 0 - Indicates contents of the structure is not updated + * @param field_views_flag : 1 - indicates that all pictures in the current + * coded video sequence are fields + * 0 - indicates that all pictures in the current + * coded video sequence are frames. + * @param top_field_is_left_view_flag : + * 1 - top field is a left view. + * 0 - topfield is right view. + * @param current_frame_is_left_view_flag : + * 1 - current frame is left view. + * 0 - current frame is right view. + * @param next_frame_is_second_view_flag : + * 1 - current picture and a next picture in + * output order form a stereo video pair. + * 0 - current picture and a previous picture in + * output order form a stereo video pair. + * @param left_view_self_contained_flag : + * 1 - it will not use right view as a reference + * picture for inter prediction + * 0 - it may use right view as a reference + * picture for inter prediction. + * @param right_view_self_contained_flag : + * 1 - it will not use left view as a reference + * picture for inter prediction + * 0 - it may use left view as a reference + * picture for inter prediction. + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_SeiStereoVideoInfo { + OMX_U32 parsed_flag; + OMX_U32 field_views_flag; + OMX_U32 top_field_is_left_view_flag; + OMX_U32 current_frame_is_left_view_flag; + OMX_U32 next_frame_is_second_view_flag; + OMX_U32 left_view_self_contained_flag; + OMX_U32 right_view_self_contained_flag; +} OMX_TI_VIDEO_H264VDEC_SeiStereoVideoInfo; + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_SeiFramePacking + * + * @brief This structure contains frame packing arrangement SEI msg elements + * + * @param frame_packing_arrangement_id : + * contains an identifying number that may be used to identify + * the usage of the frame packing arrangement SEI message. + * @param frame_packing_arrangement_cancel_flag : + * 1 - equal to 1 indicates that the frame packing arrangement + * SEI message cancels the persistence of any previous frame + * packing arrangement SEI message in output order. + * 0 - indicates that frame packing arrangement info follows + * @param frame_packing_arrangement_type : + * indicates the type of packing arrangement of the frames + * @param quincunx_sampling_flag : + * 1 - indicates that each color component plane of each + * constituent frame is quincunx sampled + * 0 - indicates that each color component plane of each + * constituent frame is not quincunx sampled + * @param content_interpretation_type : + * 1 - frame 0 being associated with the left view and frame 1 + * being associated with the right view + * 2 - frame 0 being associated with the right view and frame 1 + * being associated with the left view + * @param spatial_flipping_flag : + * 1 - spatial flipping is enabled for any one of the frame + * constituent, if frame_packing_arrangement_type is 3 or 4. + * 0 - spatial flipping is disabled for any one of the frame + * constituent, if frame_packing_arrangement_type is 3 or 4. + * @param frame0_flipped_flag : + * 1 - frame 0 is spatially flipped + * 0 - frame 1 is spatially flipped + * @param field_views_flag : + * 1 - indicates that all pictures in the current coded video + * sequence are coded as complementary field pairs. + * 0 - indicates that all pictures in the current coded video + * sequence are coded as frame. + * @param current_frame_is_frame0_flag : + * 1 - indicates that the current decoded frame is constituent + * frame 0 and the next decoded frame in output order + * is constituent frame 1. + * 0 - indicates that the current decoded frame is constituent + * frame 1 and the next decoded frame in output order + * is constituent frame 0. + * @param frame0_self_contained_flag : + * 1 - indicates that the constituent frame 0 is dependent on + * constituent frame 1 in decoding process + * 0 - indicates that the constituent frame 0 may dependent on + * constituent frame 1 in decoding process + * @param frame1_self_contained_flag : + * 1 - indicates that the constituent frame 1 is dependent on + * constituent frame 0 in decoding process + * 0 - indicates that the constituent frame 1 may dependent on + * constituent frame 0 in decoding process + * @param frame0_grid_position_x : + * specifies the horizontal location of the upper left + * sample of constituent frame 0 in the units of one + * sixteenth of the luma samples + * @param frame0_grid_position_y : + * specifies the vertical location of the upper left + * sample of constituent frame 0 in the units of one + * sixteenth of the luma samples + * @param frame1_grid_position_x : + * specifies the horizontal location of the upper left + * sample of constituent frame 1 in the units of one + * sixteenth of the luma samples + * @param frame1_grid_position_y : + * specifies the vertical location of the upper left + * sample of constituent frame 1 in the units of one + * sixteenth of the luma samples + * @param frame_packing_arrangement_reserved_byte : + * reserved for the future use. + * @param frame_packing_arrangement_repetition_period : + * specifies the persistence of the frame packing arrangement + * SEI message and may specify a frame order count interval + * within which another frame packing arrangement SEI message + * with the same value of frame_packing_arrangement_id or the + * end of the coded video sequence shall be present in the + * bitstream. + * @param frame_packing_arrangement_extension_flag : + * 0 - indicates that no additional data follows within the + * frame packing arrangement SEI message. + * 1 - Reserved for the future use. + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_SeiFramePacking { + OMX_U32 parsed_flag; + OMX_U32 frame_packing_arrangement_id; + OMX_U32 frame_packing_arrangement_repetition_period; + OMX_U8 frame_packing_arrangement_cancel_flag; + OMX_U8 frame_packing_arrangement_type; + OMX_U8 quincunx_sampling_flag; + OMX_U8 content_interpretation_type; + OMX_U8 spatial_flipping_flag; + OMX_U8 frame0_flipped_flag; + OMX_U8 field_views_flag; + OMX_U8 current_frame_is_frame0_flag; + OMX_U8 frame0_self_contained_flag; + OMX_U8 frame1_self_contained_flag; + OMX_U8 frame0_grid_position_x; + OMX_U8 frame0_grid_position_y; + OMX_U8 frame1_grid_position_x; + OMX_U8 frame1_grid_position_y; + OMX_U8 frame_packing_arrangement_reserved_byte; + OMX_U8 frame_packing_arrangement_extension_flag; +} OMX_TI_VIDEO_H264VDEC_SeiFramePacking; + + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_SeiMessages + * + * @brief This structure contains all the supported SEI msg objects + * + * @param parsed_flag :1 - Indicates that in the current process call, + * contents of the structure is updated + * 0 - Indicates contents of the structure is not updated + * @param full_frame_freeze : Full-frame freeze SEI message + * @param full_frame_freeze_release :Cancels the effect of any full-frame + * freeze SEI message sent with pictures that precede the current + * picture in the output order. + * @param prog_refine_start :Specifies the beginning of a set of consecutive + * coded pictures that is labeled as the current picture followed + * by a sequence of one or more pictures of refinement of the + * quality of the current picture, rather than as a representation + * of a continually moving scene. + * @param prog_refine_end : Specifies end of progressive refinement. + * @param user_data_registered :Message contains user data registered as + * specified by ITU-T Recommendation T.35 + * @param user_data_unregistered :Message contains unregistered user data + * identified by a UUID + * @param buffering_period_info :Message specifies the buffering period + * @param pan_scan_rect :Message specifies the coordinates of a rectangle + * relative to the cropping rectangle of the sequence parameter set + * @param recovery_pt_info :The recovery point SEI message assists a decoder + * in determining when the decoding process will produce acceptable + * pictures for display after the decoder initiates random access or + * after the encoder indicates a broken link in the sequence. + * @param pic_timing :Specifies timing information regarding cpb delays, dpb +* output delay, and so on. + * @param stereo_video_info :stereo video information SEI message consist of + * pair of picture forming stereo view content. + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_SeiMessages { + OMX_U32 parsed_flag; + OMX_TI_VIDEO_H264VDEC_SeiFullFrameFreezeRep full_frame_freeze; + OMX_TI_VIDEO_H264VDEC_SeiFullFrameFreezeRel full_frame_freeze_release; + OMX_TI_VIDEO_H264VDEC_SeiProgRefineStart prog_refine_start; + OMX_TI_VIDEO_H264VDEC_SeiProgRefineEnd prog_refine_end; + OMX_TI_VIDEO_H264VDEC_SeiUserDataRegITUT user_data_registered; + OMX_TI_VIDEO_H264VDEC_SeiUserDataUnReg user_data_unregistered; + OMX_TI_VIDEO_H264VDEC_SeiBufferingPeriod buffering_period_info; + OMX_TI_VIDEO_H264VDEC_SeiPanScanRect pan_scan_rect; + OMX_TI_VIDEO_H264VDEC_SeiRecoveryPointInfo recovery_pt_info; + OMX_TI_VIDEO_H264VDEC_SeiPictureTiming pic_timing; + OMX_TI_VIDEO_H264VDEC_SeiStereoVideoInfo stereo_video_info; + OMX_TI_VIDEO_H264VDEC_SeiFramePacking frame_packing; +} OMX_TI_VIDEO_H264VDEC_SeiMessages; + + +/** + ****************************************************************************** + * @struct _sErrConcealStr + * @brief This str holds up the required Info for implementing the SCV EC, + * this will get updated by H.264 decoder while decoding the SVC + * Base/Target Layers + * + * @param CurrMbInfoBufPointer :Base Address of the current decoded frame + * MB Info buffer + * + * @param CurrMbStatusBufPointer: Base Address of the current decoded frame + * MB staus buffer pointer + * + * @param currFrameY : Base Address of the current decoded Luma + * frame buffer pointer (physical pointer) + * + * @param currFrameUV : Base Address of the current decoded Chroma + * frame buffer pointer (physical pointer) + * + * @param refConclY : Base Address of the ref decoded Luma + * frame buffer pointer (virtual pointer) + * + * @param refConclUV : Base Address of the ref decoded Chroma + * frame buffer pointer (virtual pointer) + * + * @param TilerBaseAddress : TBA vaule for the VDMA + * + * @param pSliceInfoFlags : Flag to enable slice info + * + * @param ref_width : Resultant Horizontal LUMA picture size + * after Pad size addition on both Left + * & Right sides. This gets used as + * stride during vDMA programming. + * In case of TILER,the stride is fixed, + * independant of Picture width, and + * only changes with TILER mode. + * + * @param ref_width_c : Resultant Horizontal CHROMA picture size + * after Pad size addition on both Left & + * Right sides. + * + * + * @param ref_frame_height : In case of Interlaced streams,the picure + * store is different i.e., store each field + * by applying PAD on top & bottom lines. + * Hence the picture height will be Height + * plus four times the Pad size. This + * variable holds this resultant value. + * + * @param mb_width : Picture width in terms of Macroblocks + * + * @param mb_height : Picture height in terms of Macroblocks. + * + * @param image_width : Image width of the decoded frame + * + * @param image_width : Image height of the decoded frame + * + * @param frameType : Frame type of the current frame. + * + * @param picaff_frame : Flag to indicate whether current picture + * is of Frame type & referring to Field + * picture as reference. + * + * @param mb_aff_frame_flag : Flag to indicate whether the current + * decoding picture is MBAFF type. + * + * @param field_pic_flag : Flag to indicate whether the current + * decoding picture is field type. + * + * @param bottom_field_flag : This parameter equal to 1 specifies that + * the slice is part of a coded bottom field. + * bottom_field_flag equalto 0 specifies + * that the picture is a coded top field. + * + * @param nonPairedFieldPic : Flag to indicate Non paired field picture. + * + * @param prev_pic_bottom_field : this variable Indicates if the previous + * picture was a bottom field or not (a Flag) + ****************************************************************************** +*/ + +typedef struct OMX_TI_VIDEO_H264VDEC_ErrConcealStr { + OMX_S32 ErrConcealmentEnable; + OMX_S32 CurrMbInfoBufPointer; + OMX_S32 CurrMbStatusBufPointer; + OMX_S32 CurrMbInfoIresBufPointer; + OMX_S32 currFrameY; + OMX_S32 currFrameUV; + OMX_S32 refConclY; + OMX_S32 refConclUV; + OMX_U32 TilerBaseAddress; + OMX_U16 ref_width; + OMX_U16 ref_width_c; + OMX_U16 ref_frame_height; + OMX_U16 mb_width; + OMX_U16 mb_height; + OMX_U16 image_width; + OMX_U16 image_height; + OMX_U8 frameType; + OMX_U8 picaff_frame; + OMX_U8 mb_aff_frame_flag; + OMX_U8 field_pic_flag; + OMX_U8 bottom_field_flag; + OMX_U8 nonPairedFieldPic; + OMX_U8 prev_pic_bottom_field; +}OMX_TI_VIDEO_H264VDEC_ErrConcealStr; + +/** + * Size of sliceinfo flags - We have two slice info flag arrays in SL2, one + * for ECD3 and the other for MC3. ECD3 flag is one bit per MB. Since Maximum + * supported number of MBs in a frame is 128 x 128 = 16384, we need 16384/8 = + * 2048 bytes for the slice info flag array for ECD3. But for the MC3 array, + * we always make the next bit also as 1 to enable loading into ping and pong + * memories of MCBUF. So we need an extra bit for the MC3 array, to avoid + * buffer overflow when the last MB is a new slice. To keep the next SL2 buffer + * in 16-byte aligned position (some buffers need it) we round the size to next + * multiple of 16, i.e., 2064. +*/ +#define OMX_TI_VIDEO_SLICEINFO_FLAGSIZE 2064 + +/** + ****************************************************************************** + * @struct _sErrConcealLayerStr + * @brief This str holds up the required Info for implementing the SCV EC, + * this will get updated by H.264 decoder while decoding the SVC + * Base/Target Layers + * + * @param svcEcStr : structure instance of sSVCErrConcealStr + * + * @param pSliceInfoFlags : Array to store the sliceInfo flag + * + * + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_ErrConcealLayerStr { + OMX_TI_VIDEO_H264VDEC_ErrConcealStr sECStr; + OMX_U8 pSliceInfoFlags[OMX_TI_VIDEO_SLICEINFO_FLAGSIZE]; +}OMX_TI_VIDEO_H264VDEC_ErrConcealLayerStr; + + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_CommonInfo + * + * @brief + * + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_CommonInfo { + OMX_U32 codec_type : 8; + OMX_U32 fmt_type : 8; + OMX_U32 mb_ll_avail : 1; + OMX_U32 mb_ul_avail : 1; + OMX_U32 mb_uu_avail : 1; + OMX_U32 mb_ur_avail : 1; + OMX_U32 pic_bound_l : 1; + OMX_U32 pic_bound_u : 1; + OMX_U32 pic_bound_r : 1; + OMX_U32 pic_bound_b : 1; + OMX_U32 first_mb_flag : 1; + OMX_U32 error_flag : 1; + OMX_U32 zero : 6; + OMX_U32 zeroes : 16; + OMX_U32 mb_addr : 16; + +} OMX_TI_VIDEO_H264VDEC_CommonInfo; + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_MotionVector + * + * @brief + * + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_MotionVector { + OMX_S16 x; + OMX_S16 y; +} OMX_TI_VIDEO_H264VDEC_MotionVector; + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_CabacContext + * + * @brief + * + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_CabacContext { + OMX_TI_VIDEO_H264VDEC_MotionVector mvd_l0[4]; + OMX_TI_VIDEO_H264VDEC_MotionVector mvd_l1[4]; + +} OMX_TI_VIDEO_H264VDEC_CabacContext; + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_TotalCoefLuma + * + * @brief + * + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_TotalCoefLuma { + OMX_U8 right[3]; + OMX_U8 bottom_right; + OMX_U8 bottom[3]; + OMX_U8 zero; +} OMX_TI_VIDEO_H264VDEC_TotalCoefLuma; + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_TotalCoefChroma + * + * @brief + * + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_TotalCoefChroma { + OMX_U8 right_cb; + OMX_U8 bottom_right_cb; + OMX_U8 bottom_cb; + OMX_U8 zero; + OMX_U8 right_cr; + OMX_U8 bottom_right_cr; + OMX_U8 bottom_cr; + OMX_U8 zero1; +} OMX_TI_VIDEO_H264VDEC_TotalCoefChroma; + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_CavlcContext + * + * @brief + * + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_CavlcContext { + unsigned long long zeroes[2]; + OMX_TI_VIDEO_H264VDEC_TotalCoefLuma total_coef_luma; + OMX_TI_VIDEO_H264VDEC_TotalCoefChroma total_coef_chroma; + +} OMX_TI_VIDEO_H264VDEC_CavlcContext; + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_IntraPredMode + * + * @brief + * + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_IntraPredMode { + OMX_U32 ipred_mode0 : 4; + OMX_U32 ipred_mode1 : 4; + OMX_U32 ipred_mode2 : 4; + OMX_U32 ipred_mode3 : 4; + OMX_U32 ipred_mode4 : 4; + OMX_U32 ipred_mode5 : 4; + OMX_U32 ipred_mode6 : 4; + OMX_U32 ipred_mode7 : 4; + OMX_U32 ipred_mode8 : 4; + OMX_U32 ipred_mode9 : 4; + OMX_U32 ipred_mode10 : 4; + OMX_U32 ipred_mode11 : 4; + OMX_U32 ipred_mode12 : 4; + OMX_U32 ipred_mode13 : 4; + OMX_U32 ipred_mode14 : 4; + OMX_U32 ipred_mode15 : 4; + +} OMX_TI_VIDEO_H264VDEC_IntraPredMode; + + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_MbPredType + * + * @brief + * + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_MbPredType { + OMX_U32 mbskip : 1; + OMX_U32 tr8x8 : 1; + OMX_U32 mb_field : 1; + OMX_U32 cond_mbskip : 1; + OMX_U32 c_ipred_mode : 2; + OMX_U32 zero : 1; + OMX_U32 end_of_slice : 1; + OMX_U32 mb_y_mod2 : 1; + OMX_U32 zero1 : 7; + OMX_U32 refidx_equal_flag_l0 : 1; + OMX_U32 refidx_equal_flag_l1 : 1; + OMX_U32 mv_equal_flag_l0 : 1; + OMX_U32 mv_equal_flag_l1 : 1; + OMX_U32 zeroes : 4; + OMX_U32 mb_type : 8; + OMX_U8 sub_mb_type[4]; + +} OMX_TI_VIDEO_H264VDEC_MbPredType; + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_QpCbp + * + * @brief + * + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_QpCbp { + OMX_U32 cbp; + OMX_U8 qp_y; + OMX_U8 qp_cb; + OMX_U8 qp_cr; + OMX_U8 zero; +} OMX_TI_VIDEO_H264VDEC_QpCbp; + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_RefPicControl + * + * @brief + * + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_RefPicControl { + OMX_U8 refidx[4]; + OMX_U8 refpicid[4]; + +} OMX_TI_VIDEO_H264VDEC_RefPicControl; + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_MvBidirectional16 + * + * @brief + * + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_MvBidirectional16 { + OMX_TI_VIDEO_H264VDEC_MotionVector mv_forward[16]; + OMX_TI_VIDEO_H264VDEC_MotionVector mv_backward[16]; +} OMX_TI_VIDEO_H264VDEC_MvBidirectional16; + + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_MvBidirectional4 + * + * @brief + * + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_MvBidirectional4 { + OMX_TI_VIDEO_H264VDEC_MotionVector mv_forward[4]; + OMX_TI_VIDEO_H264VDEC_MotionVector mv_backward[4]; + +} OMX_TI_VIDEO_H264VDEC_MvBidirectional4; + +/** + ****************************************************************************** + * @struct OMX_TI_VIDEO_H264VDEC_MbInfo + * + * @brief This structure details the data format for MB information shared to + * application. This helps application to understand all fields + * the way codec uses MB info internally. This structure is of size + * 208 Bytes. + * + * @param info : This elements gives details about the MB placement in the + * frame. + * + * @param cabac: This field holds the context data for a CABAC coded MB + * + * @param cavlc: This field holds the context data for a CAVLC coded MB + * + * @param ipred_mode: This field holds information of intra prediction modes + * at 4x4 level, for intra coded MB. + * + * @param mb_pred_type: This indicates prediction specific details for inter + * coded MB + * + * @param qp_cbp: This gives coded & QP informations for both LUMA & CHROMA + * components of a Macro Block. + * + * @param l0_ref_pic_control: Informs all details about reference indices + * at 8x8 block level in L0 direction + * + * @param l1_ref_pic_control: Informs all details about reference indices + * at 8x8 block level in L1 direction + * + * @param mv_forward: Lists all Motion vectors at 4x4 level in L0 direction + * + * @param bidirectional16: Lists all Motion vectors at 4x4 level in both + * directions + * + * @param bidirectional4: Lists all Motion vectors at 8x8 level in both + * directions + * + ****************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_H264VDEC_MbInfo { + OMX_TI_VIDEO_H264VDEC_CommonInfo info; + + union { + OMX_TI_VIDEO_H264VDEC_CabacContext cabac; + OMX_TI_VIDEO_H264VDEC_CavlcContext cavlc; + } OMX_TI_VIDEO_H264VDEC_context; + + OMX_TI_VIDEO_H264VDEC_IntraPredMode ipred_mode; + OMX_TI_VIDEO_H264VDEC_MbPredType mb_pred_type; + OMX_TI_VIDEO_H264VDEC_QpCbp qp_cbp; + OMX_TI_VIDEO_H264VDEC_RefPicControl l0_ref_pic_control; + OMX_TI_VIDEO_H264VDEC_RefPicControl l1_ref_pic_control; + + union { + OMX_TI_VIDEO_H264VDEC_MotionVector mv_forward[16]; + OMX_TI_VIDEO_H264VDEC_MvBidirectional16 bidirectional16; + OMX_TI_VIDEO_H264VDEC_MvBidirectional4 bidirectional4; + } OMX_TI_VIDEO_H264VDEC_motion_vecs; + +} OMX_TI_VIDEO_H264VDEC_MbInfo; + + + +/** +******************************************************************************** +* @struct OMX_TI_VIDEO_VC1VDEC_MbInfo +* +* @brief MB information structure that is written out by the IVA-HD hardware. +* +* @note None: +* +******************************************************************************** +*/ +typedef struct OMX_TI_VIDEO_VC1VDEC_MbInfo { + /* MB address */ + OMX_U8 mb_addr; + /* Error flag */ + OMX_U8 error_flag; + /* First MB flag */ + OMX_U8 first_mb_flag; + /* Picture bound */ + OMX_U8 pic_bound_b; + /* Upper picture bound */ + OMX_U8 pic_bound_u; + /* Right picture bound */ + OMX_U8 pic_bound_r; + /* Left picture bound */ + OMX_U8 pic_bound_l; + /* Availability of upper right MB */ + OMX_U8 mb_ur_avail; + /* Availability of upper MB */ + OMX_U8 mb_uu_avail; + /* Availability of upper left MB */ + OMX_U8 mb_ul_avail; + /* Availability of left MB */ + OMX_U8 mb_ll_avail; + /* Macroblock header format type */ + OMX_U8 fmt_type; + /* Codec type */ + OMX_U8 codec_type; + /* Indicates DC values of each Y block in current MB */ + OMX_U8 dc_coef_q_y[4]; + /* Indicates DC values of Cr block in current MB */ + OMX_U8 dc_coef_q_cr; + /* Indicates DC values of Cb block in current MB */ + OMX_U8 dc_coef_q_cb; + /* Block type of cr block */ + OMX_U8 block_type_cr; + /* Block type of cb block */ + OMX_U8 block_type_cb; + /* Block types of luma */ + OMX_U8 block_type_y[4]; + /* In decoding, if the current macroblock is the last macroblock in a slice,*/ + /* ECD sets 1 to this field during executing the macroblock. Otherwise, ECD */ + /* sets 0 to this field */ + OMX_U8 end_of_slice; + /* 1 : allow skipping current MB if CBP = 0 */ + OMX_U8 cond_skip_flag; + /* Skipped / non skipped MB */ + OMX_U8 skip; + /* 1 indicates that overlap filtering is in use for the macroblock. */ + OMX_U8 overlap; + /* 1 indicates that AC prediction is in use for the macroblock */ + OMX_U8 acpred; + /* Denotes inter-prediction direction for the macroblock in B-picture */ + OMX_U8 b_picture_direction; + /* Denotes the number of motion vectors. */ + OMX_U8 mv_mode; + /* 1 indicates that the field transform is in use for the macroblock. */ + OMX_U8 fieldtx; + /* 1 indicates that field inter-prediction is in use */ + OMX_U8 mv_type; + /* Equals the reference frame distance */ + OMX_U8 refdist; + /* 1 indicates that macroblock quantizer-scale (MQUANT) overflows */ + OMX_U8 mquant_overflow; + /* Equals the quantizer-scale for the macroblock */ + OMX_U8 quant; + /* 1 indicates that 0.5 shall be added to PQUANT in calculation of */ + /* quantizer-scale. This field is valid for decoding only. */ + OMX_U8 halfqp; + /* Equals the DC coefficient step size which is derived from MQUANT in the */ + /* bit-stream */ + OMX_U8 dc_step_size; + /* Denotes the coded sub-block pattern for cr block */ + OMX_U8 cbp_cr; + /* Denotes the coded sub-block pattern for cb block */ + OMX_U8 cbp_cb; + /* Denotes the coded sub-block pattern for luma blocks */ + OMX_U8 cbp_y[3]; + /* Denotes the backward reference field picture */ + OMX_U8 mv_bw_ref_y[4]; + /* Denotes the forward reference field picture */ + OMX_U8 mv_fw_ref_y[3]; + /* Unclipped forward motion vector for luma */ + OMX_U8 mv_fw_y[4][4]; + /* Unclipped backward motion vector for luma */ + OMX_U8 mv_bw_y[1][1]; + /* Unclipped backward motion vector for chroma */ + OMX_U8 mv_bw_c[2]; + /* Unclipped forward motion vector for chroma */ + OMX_U8 mv_fw_c[2]; + /* Clipped forward motion vector for luma */ + OMX_U8 cmv_fw_y[4][4]; + /* Clipped backward motion vector for luma */ + OMX_U8 cmv_bw_y[4][4]; + /* Clipped forward motion vector for chroma */ + OMX_U8 cmv_fw_c[4][4]; + /* Clipped backward motion vector for chroma */ + OMX_U8 cmv_bw_c[4][4]; + +}OMX_TI_VIDEO_VC1VDEC_MbInfo; + #endif /* OMX_TI_VIDEO_H */ diff --git a/domx/omx_core/inc/OMX_Types.h b/domx/omx_core/inc/OMX_Types.h index 31be916..2fda817 100755 --- a/domx/omx_core/inc/OMX_Types.h +++ b/domx/omx_core/inc/OMX_Types.h @@ -1,30 +1,47 @@ +/* ------------------------------------------------------------------ + * Copyright (C) 1998-2009 PacketVideo + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. + * See the License for the specific language governing permissions + * and limitations under the License. + * ------------------------------------------------------------------- + */ /* - * Copyright (c) 2008 The Khronos Group Inc. - * + * Copyright (c) 2008 The Khronos Group Inc. + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: + * to the following conditions: * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * + * in all copies or substantial portions of the Software. + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ /** OMX_Types.h - OpenMax IL version 1.1.2 - * The OMX_Types header file contains the primitive type definitions used by + * The OMX_Types header file contains the primitive type definitions used by * the core, the application and the component. This file may need to be - * modified to be used on systems that do not have "char" set to 8 bits, + * modified to be used on systems that do not have "char" set to 8 bits, * "short" set to 16 bits and "long" set to 32 bits. */ @@ -38,12 +55,12 @@ extern "C" { /** The OMX_API and OMX_APIENTRY are platform specific definitions used * to declare OMX function prototypes. They are modified to meet the * requirements for a particular platform */ -#ifdef __SYMBIAN32__ +#ifdef __SYMBIAN32__ # ifdef __OMX_EXPORTS # define OMX_API __declspec(dllexport) # else # ifdef _WIN32 -# define OMX_API __declspec(dllexport) +# define OMX_API __declspec(dllexport) # else # define OMX_API __declspec(dllimport) # endif @@ -65,18 +82,18 @@ extern "C" { #endif #ifndef OMX_APIENTRY -#define OMX_APIENTRY -#endif +#define OMX_APIENTRY +#endif -/** OMX_IN is used to identify inputs to an OMX function. This designation - will also be used in the case of a pointer that points to a parameter +/** OMX_IN is used to identify inputs to an OMX function. This designation + will also be used in the case of a pointer that points to a parameter that is used as an output. */ #ifndef OMX_IN #define OMX_IN #endif -/** OMX_OUT is used to identify outputs from an OMX function. This - designation will also be used in the case of a pointer that points +/** OMX_OUT is used to identify outputs from an OMX function. This + designation will also be used in the case of a pointer that points to a parameter that is used as an input. */ #ifndef OMX_OUT #define OMX_OUT @@ -84,8 +101,8 @@ extern "C" { /** OMX_INOUT is used to identify parameters that may be either inputs or - outputs from an OMX function at the same time. This designation will - also be used in the case of a pointer that points to a parameter that + outputs from an OMX function at the same time. This designation will + also be used in the case of a pointer that points to a parameter that is used both as an input and an output. */ #ifndef OMX_INOUT #define OMX_INOUT @@ -103,31 +120,31 @@ extern "C" { /** @defgroup core OpenMAX IL core * Functions and structure related to the OMX IL core */ - + /** @defgroup comp OpenMAX IL component * Functions and structure related to the OMX IL component */ - -/** @defgroup rpm Resource and Policy Management + +/** @defgroup rpm Resource and Policy Management * Structures for resource and policy management of components */ /** @defgroup buf Buffer Management * Buffer handling functions and structures */ - + /** @defgroup tun Tunneling * @ingroup core comp * Structures and functions to manage tunnels among component ports */ - + /** @defgroup cp Content Pipes * @ingroup core */ - + /** @defgroup metadata Metadata handling - * - */ + * + */ /** OMX_U8 is an 8 bit unsigned quantity that is byte aligned */ typedef unsigned char OMX_U8; @@ -149,7 +166,7 @@ typedef signed long OMX_S32; /* Users with compilers that cannot accept the "long long" designation should - define the OMX_SKIP64BIT macro. It should be noted that this may cause + define the OMX_SKIP64BIT macro. It should be noted that this may cause some components to fail to compile if the component was written to require 64 bit integral types. However, these components would NOT compile anyway since the compiler does not support the way the component was written. @@ -164,7 +181,7 @@ typedef signed long long OMX_S64; #elif defined(WIN32) -/** OMX_U64 is a 64 bit unsigned quantity that is 64 bit word aligned */ +/** OMX_U64 is a 64 bit unsigned quantity that is 64 bit word aligned */ typedef unsigned __int64 OMX_U64; /** OMX_S64 is a 64 bit signed quantity that is 64 bit word aligned */ @@ -182,7 +199,7 @@ typedef signed long long OMX_S64; #endif -/** The OMX_BOOL type is intended to be used to represent a true or a false +/** The OMX_BOOL type is intended to be used to represent a true or a false value when passing parameters to and from the OMX core and components. The OMX_BOOL is a 32 bit quantity and is aligned on a 32 bit word boundary. */ @@ -190,8 +207,8 @@ typedef enum OMX_BOOL { OMX_FALSE = 0, OMX_TRUE = !OMX_FALSE, OMX_BOOL_MAX = 0x7FFFFFFF -} OMX_BOOL; - +} OMX_BOOL; + /** The OMX_PTR type is intended to be used to pass pointers between the OMX applications and the OMX Core and components. This is a 32 bit pointer and is aligned on a 32 bit boundary. @@ -199,14 +216,14 @@ typedef enum OMX_BOOL { typedef void* OMX_PTR; /** The OMX_STRING type is intended to be used to pass "C" type strings between - the application and the core and component. The OMX_STRING type is a 32 - bit pointer to a zero terminated string. The pointer is word aligned and - the string is byte aligned. + the application and the core and component. The OMX_STRING type is a 32 + bit pointer to a zero terminated string. The pointer is word aligned and + the string is byte aligned. */ typedef char* OMX_STRING; /** The OMX_BYTE type is intended to be used to pass arrays of bytes such as - buffers between the application and the component and core. The OMX_BYTE + buffers between the application and the component and core. The OMX_BYTE type is a 32 bit pointer to a zero terminated string. The pointer is word aligned and the string is byte aligned. */ @@ -219,7 +236,7 @@ typedef unsigned char* OMX_BYTE; typedef unsigned char OMX_UUIDTYPE[128]; /** The OMX_DIRTYPE enumeration is used to indicate if a port is an input or - an output port. This enumeration is common across all component types. + an output port. This enumeration is common across all component types. */ typedef enum OMX_DIRTYPE { @@ -228,8 +245,8 @@ typedef enum OMX_DIRTYPE OMX_DirMax = 0x7FFFFFFF } OMX_DIRTYPE; -/** The OMX_ENDIANTYPE enumeration is used to indicate the bit ordering - for numerical data (i.e. big endian, or little endian). +/** The OMX_ENDIANTYPE enumeration is used to indicate the bit ordering + for numerical data (i.e. big endian, or little endian). */ typedef enum OMX_ENDIANTYPE { @@ -239,7 +256,7 @@ typedef enum OMX_ENDIANTYPE } OMX_ENDIANTYPE; -/** The OMX_NUMERICALDATATYPE enumeration is used to indicate if data +/** The OMX_NUMERICALDATATYPE enumeration is used to indicate if data is signed or unsigned */ typedef enum OMX_NUMERICALDATATYPE @@ -267,16 +284,16 @@ typedef struct OMX_BS32 { /** Structure representing some time or duration in microseconds. This structure - * must be interpreted as a signed 64 bit value. The quantity is signed to accommodate - * negative deltas and preroll scenarios. The quantity is represented in microseconds + * must be interpreted as a signed 64 bit value. The quantity is signed to accommodate + * negative deltas and preroll scenarios. The quantity is represented in microseconds * to accomodate high resolution timestamps (e.g. DVD presentation timestamps based - * on a 90kHz clock) and to allow more accurate and synchronized delivery (e.g. - * individual audio samples delivered at 192 kHz). The quantity is 64 bit to + * on a 90kHz clock) and to allow more accurate and synchronized delivery (e.g. + * individual audio samples delivered at 192 kHz). The quantity is 64 bit to * accommodate a large dynamic range (signed 32 bit values would allow only for plus * or minus 35 minutes). * - * Implementations with limited precision may convert the signed 64 bit value to - * a signed 32 bit value internally but risk loss of precision. + * Implementations with limited precision may convert the signed 64 bit value to + * a signed 32 bit value internally but risk loss of precision. */ #ifndef OMX_SKIP64BIT typedef OMX_S64 OMX_TICKS; @@ -296,17 +313,17 @@ typedef void* OMX_HANDLETYPE; typedef struct OMX_MARKTYPE { - OMX_HANDLETYPE hMarkTargetComponent; /**< The component that will - generate a mark event upon + OMX_HANDLETYPE hMarkTargetComponent; /**< The component that will + generate a mark event upon processing the mark. */ - OMX_PTR pMarkData; /**< Application specific data associated with - the mark sent on a mark event to disambiguate + OMX_PTR pMarkData; /**< Application specific data associated with + the mark sent on a mark event to disambiguate this mark from others. */ } OMX_MARKTYPE; /** OMX_NATIVE_DEVICETYPE is used to map a OMX video port to the - * platform & operating specific object used to reference the display + * platform & operating specific object used to reference the display * or can be used by a audio port for native audio rendering */ typedef void* OMX_NATIVE_DEVICETYPE; @@ -317,7 +334,7 @@ typedef void* OMX_NATIVE_WINDOWTYPE; /** The OMX_VERSIONTYPE union is used to specify the version for a structure or component. For a component, the version is entirely specified by the component vendor. Components doing the same function - from different vendors may or may not have the same version. For + from different vendors may or may not have the same version. For structures, the version shall be set by the entity that allocates the structure. For structures specified in the OMX 1.1 specification, the value of the version shall be set to 1.1.0.0 in all cases. Access to the diff --git a/domx/omx_core/inc/OMX_Video.h b/domx/omx_core/inc/OMX_Video.h index 163e450..c44a5fe 100755 --- a/domx/omx_core/inc/OMX_Video.h +++ b/domx/omx_core/inc/OMX_Video.h @@ -1,29 +1,46 @@ +/* ------------------------------------------------------------------ + * Copyright (C) 1998-2009 PacketVideo + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. + * See the License for the specific language governing permissions + * and limitations under the License. + * ------------------------------------------------------------------- + */ /** - * Copyright (c) 2008 The Khronos Group Inc. - * + * Copyright (c) 2008 The Khronos Group Inc. + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: + * to the following conditions: * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * + * in all copies or substantial portions of the Software. + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -/** +/** * @file OMX_Video.h - OpenMax IL version 1.1.2 - * The structures is needed by Video components to exchange parameters + * The structures is needed by Video components to exchange parameters * and configuration data with OMX components. */ #ifndef OMX_Video_h @@ -43,19 +60,19 @@ extern "C" { /** * Each OMX header must include all required header files to allow the * header to compile without errors. The includes below are required - * for this header file to compile successfully + * for this header file to compile successfully */ #include <OMX_IVCommon.h> /** - * Enumeration used to define the possible video compression codings. - * NOTE: This essentially refers to file extensions. If the coding is - * being used to specify the ENCODE type, then additional work - * must be done to configure the exact flavor of the compression - * to be used. For decode cases where the user application can - * not differentiate between MPEG-4 and H.264 bit streams, it is + * Enumeration used to define the possible video compression codings. + * NOTE: This essentially refers to file extensions. If the coding is + * being used to specify the ENCODE type, then additional work + * must be done to configure the exact flavor of the compression + * to be used. For decode cases where the user application can + * not differentiate between MPEG-4 and H.264 bit streams, it is * up to the codec to handle this. */ typedef enum OMX_VIDEO_CODINGTYPE { @@ -68,58 +85,59 @@ typedef enum OMX_VIDEO_CODINGTYPE { OMX_VIDEO_CodingRV, /**< all versions of Real Video */ OMX_VIDEO_CodingAVC, /**< H.264/AVC */ OMX_VIDEO_CodingMJPEG, /**< Motion JPEG */ - OMX_VIDEO_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_CodingVPX, /**< Google VPX, formerly known as On2 VP8 */ + OMX_VIDEO_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_CodingVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_VIDEO_CodingMax = 0x7FFFFFFF } OMX_VIDEO_CODINGTYPE; /** - * Data structure used to define a video path. The number of Video paths for - * input and output will vary by type of the Video component. - * + * Data structure used to define a video path. The number of Video paths for + * input and output will vary by type of the Video component. + * * Input (aka Source) : zero Inputs, one Output, * Splitter : one Input, 2 or more Outputs, * Processing Element : one Input, one output, * Mixer : 2 or more inputs, one output, * Output (aka Sink) : one Input, zero outputs. - * - * The PortDefinition structure is used to define all of the parameters - * necessary for the compliant component to setup an input or an output video - * path. If additional vendor specific data is required, it should be - * transmitted to the component using the CustomCommand function. Compliant - * components will prepopulate this structure with optimal values during the + * + * The PortDefinition structure is used to define all of the parameters + * necessary for the compliant component to setup an input or an output video + * path. If additional vendor specific data is required, it should be + * transmitted to the component using the CustomCommand function. Compliant + * components will prepopulate this structure with optimal values during the * GetDefaultInitParams command. * * STRUCT MEMBERS: * cMIMEType : MIME type of data for the port - * pNativeRender : Platform specific reference for a display if a + * pNativeRender : Platform specific reference for a display if a * sync, otherwise this field is 0 - * nFrameWidth : Width of frame to be used on channel if + * nFrameWidth : Width of frame to be used on channel if * uncompressed format is used. Use 0 for unknown, * don't care or variable - * nFrameHeight : Height of frame to be used on channel if + * nFrameHeight : Height of frame to be used on channel if * uncompressed format is used. Use 0 for unknown, * don't care or variable - * nStride : Number of bytes per span of an image + * nStride : Number of bytes per span of an image * (i.e. indicates the number of bytes to get * from span N to span N+1, where negative stride * indicates the image is bottom up * nSliceHeight : Height used when encoding in slices - * nBitrate : Bit rate of frame to be used on channel if - * compressed format is used. Use 0 for unknown, + * nBitrate : Bit rate of frame to be used on channel if + * compressed format is used. Use 0 for unknown, * don't care or variable - * xFramerate : Frame rate to be used on channel if uncompressed - * format is used. Use 0 for unknown, don't care or + * xFramerate : Frame rate to be used on channel if uncompressed + * format is used. Use 0 for unknown, don't care or * variable. Units are Q16 frames per second. - * bFlagErrorConcealment : Turns on error concealment if it is supported by + * bFlagErrorConcealment : Turns on error concealment if it is supported by * the OMX component - * eCompressionFormat : Compression format used in this instance of the - * component. When OMX_VIDEO_CodingUnused is + * eCompressionFormat : Compression format used in this instance of the + * component. When OMX_VIDEO_CodingUnused is * specified, eColorFormat is used * eColorFormat : Decompressed format used by this component - * pNativeWindow : Platform specific reference for a window object if a - * display sink , otherwise this field is 0x0. + * pNativeWindow : Platform specific reference for a window object if a + * display sink , otherwise this field is 0x0. */ typedef struct OMX_VIDEO_PORTDEFINITIONTYPE { OMX_STRING cMIMEType; @@ -136,19 +154,19 @@ typedef struct OMX_VIDEO_PORTDEFINITIONTYPE { OMX_NATIVE_WINDOWTYPE pNativeWindow; } OMX_VIDEO_PORTDEFINITIONTYPE; -/** - * Port format parameter. This structure is used to enumerate the various +/** + * Port format parameter. This structure is used to enumerate the various * data input/output format supported by the port. - * + * * STRUCT MEMBERS: * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Indicates which port to set - * nIndex : Indicates the enumeration index for the format from + * nIndex : Indicates the enumeration index for the format from * 0x0 to N-1 - * eCompressionFormat : Compression format used in this instance of the - * component. When OMX_VIDEO_CodingUnused is specified, - * eColorFormat is used + * eCompressionFormat : Compression format used in this instance of the + * component. When OMX_VIDEO_CodingUnused is specified, + * eColorFormat is used * eColorFormat : Decompressed format used by this component * xFrameRate : Indicates the video frame rate in Q16 format */ @@ -157,14 +175,14 @@ typedef struct OMX_VIDEO_PARAM_PORTFORMATTYPE { OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_U32 nIndex; - OMX_VIDEO_CODINGTYPE eCompressionFormat; + OMX_VIDEO_CODINGTYPE eCompressionFormat; OMX_COLOR_FORMATTYPE eColorFormat; OMX_U32 xFramerate; } OMX_VIDEO_PARAM_PORTFORMATTYPE; /** - * This is a structure for configuring video compression quantization + * This is a structure for configuring video compression quantization * parameter values. Codecs may support different QP values for different * frame types. * @@ -174,10 +192,10 @@ typedef struct OMX_VIDEO_PARAM_PORTFORMATTYPE { * nPortIndex : Port that this structure applies to * nQpI : QP value to use for index frames * nQpP : QP value to use for P frames - * nQpB : QP values to use for bidirectional frames + * nQpB : QP values to use for bidirectional frames */ typedef struct OMX_VIDEO_PARAM_QUANTIZATIONTYPE { - OMX_U32 nSize; + OMX_U32 nSize; OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_U32 nQpI; @@ -186,32 +204,32 @@ typedef struct OMX_VIDEO_PARAM_QUANTIZATIONTYPE { } OMX_VIDEO_PARAM_QUANTIZATIONTYPE; -/** - * Structure for configuration of video fast update parameters. - * +/** + * Structure for configuration of video fast update parameters. + * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version info + * nVersion : OMX specification version info * nPortIndex : Port that this structure applies to * bEnableVFU : Enable/Disable video fast update * nFirstGOB : Specifies the number of the first macroblock row * nFirstMB : specifies the first MB relative to the specified first GOB - * nNumMBs : Specifies the number of MBs to be refreshed from nFirstGOB + * nNumMBs : Specifies the number of MBs to be refreshed from nFirstGOB * and nFirstMB */ typedef struct OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bEnableVFU; - OMX_U32 nFirstGOB; - OMX_U32 nFirstMB; - OMX_U32 nNumMBs; + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_BOOL bEnableVFU; + OMX_U32 nFirstGOB; + OMX_U32 nFirstMB; + OMX_U32 nNumMBs; } OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE; -/** - * Enumeration of possible bitrate control types +/** + * Enumeration of possible bitrate control types */ typedef enum OMX_VIDEO_CONTROLRATETYPE { OMX_Video_ControlRateDisable, @@ -219,14 +237,14 @@ typedef enum OMX_VIDEO_CONTROLRATETYPE { OMX_Video_ControlRateConstant, OMX_Video_ControlRateVariableSkipFrames, OMX_Video_ControlRateConstantSkipFrames, - OMX_Video_ControlRateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_Video_ControlRateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_Video_ControlRateVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_Video_ControlRateMax = 0x7FFFFFFF } OMX_VIDEO_CONTROLRATETYPE; -/** - * Structure for configuring bitrate mode of a codec. +/** + * Structure for configuring bitrate mode of a codec. * * STRUCT MEMBERS: * nSize : Size of the struct in bytes @@ -236,23 +254,23 @@ typedef enum OMX_VIDEO_CONTROLRATETYPE { * nTargetBitrate : Target bitrate to encode with */ typedef struct OMX_VIDEO_PARAM_BITRATETYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_VIDEO_CONTROLRATETYPE eControlRate; - OMX_U32 nTargetBitrate; + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_VIDEO_CONTROLRATETYPE eControlRate; + OMX_U32 nTargetBitrate; } OMX_VIDEO_PARAM_BITRATETYPE; -/** - * Enumeration of possible motion vector (MV) types +/** + * Enumeration of possible motion vector (MV) types */ typedef enum OMX_VIDEO_MOTIONVECTORTYPE { OMX_Video_MotionVectorPixel, OMX_Video_MotionVectorHalfPel, OMX_Video_MotionVectorQuarterPel, OMX_Video_MotionVectorEighthPel, - OMX_Video_MotionVectorKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_Video_MotionVectorKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_Video_MotionVectorVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_Video_MotionVectorMax = 0x7FFFFFFF } OMX_VIDEO_MOTIONVECTORTYPE; @@ -261,7 +279,7 @@ typedef enum OMX_VIDEO_MOTIONVECTORTYPE { /** * Structure for configuring the number of motion vectors used as well * as their accuracy. - * + * * STRUCT MEMBERS: * nSize : Size of the struct in bytes * nVersion : OMX spec version info @@ -284,32 +302,32 @@ typedef struct OMX_VIDEO_PARAM_MOTIONVECTORTYPE { } OMX_VIDEO_PARAM_MOTIONVECTORTYPE; -/** - * Enumeration of possible methods to use for Intra Refresh +/** + * Enumeration of possible methods to use for Intra Refresh */ typedef enum OMX_VIDEO_INTRAREFRESHTYPE { OMX_VIDEO_IntraRefreshCyclic, OMX_VIDEO_IntraRefreshAdaptive, OMX_VIDEO_IntraRefreshBoth, - OMX_VIDEO_IntraRefreshKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_IntraRefreshKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_IntraRefreshVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_VIDEO_IntraRefreshMax = 0x7FFFFFFF } OMX_VIDEO_INTRAREFRESHTYPE; /** - * Structure for configuring intra refresh mode - * + * Structure for configuring intra refresh mode + * * STRUCT MEMBERS: * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * eRefreshMode : Cyclic, Adaptive, or Both - * nAirMBs : Number of intra macroblocks to refresh in a frame when + * nAirMBs : Number of intra macroblocks to refresh in a frame when * AIR is enabled - * nAirRef : Number of times a motion marked macroblock has to be + * nAirRef : Number of times a motion marked macroblock has to be * intra coded - * nCirMBs : Number of consecutive macroblocks to be coded as "intra" + * nCirMBs : Number of consecutive macroblocks to be coded as "intra" * when CIR is enabled */ typedef struct OMX_VIDEO_PARAM_INTRAREFRESHTYPE { @@ -324,19 +342,19 @@ typedef struct OMX_VIDEO_PARAM_INTRAREFRESHTYPE { /** - * Structure for enabling various error correction methods for video + * Structure for enabling various error correction methods for video * compression. * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to * bEnableHEC : Enable/disable header extension codes (HEC) * bEnableResync : Enable/disable resynchronization markers - * nResynchMarkerSpacing : Resynch markers interval (in bits) to be - * applied in the stream - * bEnableDataPartitioning : Enable/disable data partitioning - * bEnableRVLC : Enable/disable reversible variable length + * nResynchMarkerSpacing : Resynch markers interval (in bits) to be + * applied in the stream + * bEnableDataPartitioning : Enable/disable data partitioning + * bEnableRVLC : Enable/disable reversible variable length * coding */ typedef struct OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE { @@ -351,12 +369,12 @@ typedef struct OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE { } OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE; -/** - * Configuration of variable block-size motion compensation (VBSMC) - * +/** + * Configuration of variable block-size motion compensation (VBSMC) + * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * b16x16 : Enable inter block search 16x16 * b16x8 : Enable inter block search 16x8 @@ -367,11 +385,11 @@ typedef struct OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE { * b4x4 : Enable inter block search 4x4 */ typedef struct OMX_VIDEO_PARAM_VBSMCTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL b16x16; - OMX_BOOL b16x8; + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_BOOL b16x16; + OMX_BOOL b16x8; OMX_BOOL b8x16; OMX_BOOL b8x8; OMX_BOOL b8x4; @@ -380,67 +398,67 @@ typedef struct OMX_VIDEO_PARAM_VBSMCTYPE { } OMX_VIDEO_PARAM_VBSMCTYPE; -/** - * H.263 profile types, each profile indicates support for various +/** + * H.263 profile types, each profile indicates support for various * performance bounds and different annexes. * * ENUMS: - * Baseline : Baseline Profile: H.263 (V1), no optional modes - * H320 Coding : H.320 Coding Efficiency Backward Compatibility + * Baseline : Baseline Profile: H.263 (V1), no optional modes + * H320 Coding : H.320 Coding Efficiency Backward Compatibility * Profile: H.263+ (V2), includes annexes I, J, L.4 * and T - * BackwardCompatible : Backward Compatibility Profile: H.263 (V1), - * includes annex F - * ISWV2 : Interactive Streaming Wireless Profile: H.263+ - * (V2), includes annexes I, J, K and T - * ISWV3 : Interactive Streaming Wireless Profile: H.263++ - * (V3), includes profile 3 and annexes V and W.6.3.8 - * HighCompression : Conversational High Compression Profile: H.263++ - * (V3), includes profiles 1 & 2 and annexes D and U - * Internet : Conversational Internet Profile: H.263++ (V3), - * includes profile 5 and annex K - * Interlace : Conversational Interlace Profile: H.263++ (V3), - * includes profile 5 and annex W.6.3.11 - * HighLatency : High Latency Profile: H.263++ (V3), includes - * profile 6 and annexes O.1 and P.5 + * BackwardCompatible : Backward Compatibility Profile: H.263 (V1), + * includes annex F + * ISWV2 : Interactive Streaming Wireless Profile: H.263+ + * (V2), includes annexes I, J, K and T + * ISWV3 : Interactive Streaming Wireless Profile: H.263++ + * (V3), includes profile 3 and annexes V and W.6.3.8 + * HighCompression : Conversational High Compression Profile: H.263++ + * (V3), includes profiles 1 & 2 and annexes D and U + * Internet : Conversational Internet Profile: H.263++ (V3), + * includes profile 5 and annex K + * Interlace : Conversational Interlace Profile: H.263++ (V3), + * includes profile 5 and annex W.6.3.11 + * HighLatency : High Latency Profile: H.263++ (V3), includes + * profile 6 and annexes O.1 and P.5 */ typedef enum OMX_VIDEO_H263PROFILETYPE { - OMX_VIDEO_H263ProfileBaseline = 0x01, - OMX_VIDEO_H263ProfileH320Coding = 0x02, - OMX_VIDEO_H263ProfileBackwardCompatible = 0x04, - OMX_VIDEO_H263ProfileISWV2 = 0x08, - OMX_VIDEO_H263ProfileISWV3 = 0x10, - OMX_VIDEO_H263ProfileHighCompression = 0x20, - OMX_VIDEO_H263ProfileInternet = 0x40, - OMX_VIDEO_H263ProfileInterlace = 0x80, - OMX_VIDEO_H263ProfileHighLatency = 0x100, - OMX_VIDEO_H263ProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_H263ProfileBaseline = 0x01, + OMX_VIDEO_H263ProfileH320Coding = 0x02, + OMX_VIDEO_H263ProfileBackwardCompatible = 0x04, + OMX_VIDEO_H263ProfileISWV2 = 0x08, + OMX_VIDEO_H263ProfileISWV3 = 0x10, + OMX_VIDEO_H263ProfileHighCompression = 0x20, + OMX_VIDEO_H263ProfileInternet = 0x40, + OMX_VIDEO_H263ProfileInterlace = 0x80, + OMX_VIDEO_H263ProfileHighLatency = 0x100, + OMX_VIDEO_H263ProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_H263ProfileVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_VIDEO_H263ProfileMax = 0x7FFFFFFF + OMX_VIDEO_H263ProfileMax = 0x7FFFFFFF } OMX_VIDEO_H263PROFILETYPE; -/** - * H.263 level types, each level indicates support for various frame sizes, +/** + * H.263 level types, each level indicates support for various frame sizes, * bit rates, decoder frame rates. */ typedef enum OMX_VIDEO_H263LEVELTYPE { - OMX_VIDEO_H263Level10 = 0x01, - OMX_VIDEO_H263Level20 = 0x02, - OMX_VIDEO_H263Level30 = 0x04, - OMX_VIDEO_H263Level40 = 0x08, - OMX_VIDEO_H263Level45 = 0x10, - OMX_VIDEO_H263Level50 = 0x20, - OMX_VIDEO_H263Level60 = 0x40, - OMX_VIDEO_H263Level70 = 0x80, - OMX_VIDEO_H263LevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_H263Level10 = 0x01, + OMX_VIDEO_H263Level20 = 0x02, + OMX_VIDEO_H263Level30 = 0x04, + OMX_VIDEO_H263Level40 = 0x08, + OMX_VIDEO_H263Level45 = 0x10, + OMX_VIDEO_H263Level50 = 0x20, + OMX_VIDEO_H263Level60 = 0x40, + OMX_VIDEO_H263Level70 = 0x80, + OMX_VIDEO_H263LevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_H263LevelVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_VIDEO_H263LevelMax = 0x7FFFFFFF + OMX_VIDEO_H263LevelMax = 0x7FFFFFFF } OMX_VIDEO_H263LEVELTYPE; -/** - * Specifies the picture type. These values should be OR'd to signal all +/** + * Specifies the picture type. These values should be OR'd to signal all * pictures types which are allowed. * * ENUMS: @@ -458,36 +476,36 @@ typedef enum OMX_VIDEO_PICTURETYPE { OMX_VIDEO_PictureTypeEI = 0x11, OMX_VIDEO_PictureTypeEP = 0x12, OMX_VIDEO_PictureTypeS = 0x14, - OMX_VIDEO_PictureTypeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_PictureTypeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_PictureTypeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_VIDEO_PictureTypeMax = 0x7FFFFFFF } OMX_VIDEO_PICTURETYPE; -/** - * H.263 Params +/** + * H.263 Params * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * nPFrames : Number of P frames between each I frame * nBFrames : Number of B frames between each I frame * eProfile : H.263 profile(s) to use * eLevel : H.263 level(s) to use - * bPLUSPTYPEAllowed : Indicating that it is allowed to use PLUSPTYPE - * (specified in the 1998 version of H.263) to - * indicate custom picture sizes or clock - * frequencies - * nAllowedPictureTypes : Specifies the picture types allowed in the + * bPLUSPTYPEAllowed : Indicating that it is allowed to use PLUSPTYPE + * (specified in the 1998 version of H.263) to + * indicate custom picture sizes or clock + * frequencies + * nAllowedPictureTypes : Specifies the picture types allowed in the * bitstream - * bForceRoundingTypeToZero : value of the RTYPE bit (bit 6 of MPPTYPE) is - * not constrained. It is recommended to change - * the value of the RTYPE bit for each reference + * bForceRoundingTypeToZero : value of the RTYPE bit (bit 6 of MPPTYPE) is + * not constrained. It is recommended to change + * the value of the RTYPE bit for each reference * picture in error-free communication - * nPictureHeaderRepetition : Specifies the frequency of picture header + * nPictureHeaderRepetition : Specifies the frequency of picture header * repetition - * nGOBHeaderInterval : Specifies the interval of non-empty GOB + * nGOBHeaderInterval : Specifies the interval of non-empty GOB * headers in units of GOBs */ typedef struct OMX_VIDEO_PARAM_H263TYPE { @@ -506,8 +524,8 @@ typedef struct OMX_VIDEO_PARAM_H263TYPE { } OMX_VIDEO_PARAM_H263TYPE; -/** - * MPEG-2 profile types, each profile indicates support for various +/** + * MPEG-2 profile types, each profile indicates support for various * performance bounds and different annexes. */ typedef enum OMX_VIDEO_MPEG2PROFILETYPE { @@ -517,29 +535,29 @@ typedef enum OMX_VIDEO_MPEG2PROFILETYPE { OMX_VIDEO_MPEG2ProfileSNR, /**< SNR Profile */ OMX_VIDEO_MPEG2ProfileSpatial, /**< Spatial Profile */ OMX_VIDEO_MPEG2ProfileHigh, /**< High Profile */ - OMX_VIDEO_MPEG2ProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_MPEG2ProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_MPEG2ProfileVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_VIDEO_MPEG2ProfileMax = 0x7FFFFFFF + OMX_VIDEO_MPEG2ProfileMax = 0x7FFFFFFF } OMX_VIDEO_MPEG2PROFILETYPE; -/** - * MPEG-2 level types, each level indicates support for various frame - * sizes, bit rates, decoder frame rates. No need +/** + * MPEG-2 level types, each level indicates support for various frame + * sizes, bit rates, decoder frame rates. No need */ typedef enum OMX_VIDEO_MPEG2LEVELTYPE { - OMX_VIDEO_MPEG2LevelLL = 0, /**< Low Level */ - OMX_VIDEO_MPEG2LevelML, /**< Main Level */ - OMX_VIDEO_MPEG2LevelH14, /**< High 1440 */ - OMX_VIDEO_MPEG2LevelHL, /**< High Level */ - OMX_VIDEO_MPEG2LevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_MPEG2LevelLL = 0, /**< Low Level */ + OMX_VIDEO_MPEG2LevelML, /**< Main Level */ + OMX_VIDEO_MPEG2LevelH14, /**< High 1440 */ + OMX_VIDEO_MPEG2LevelHL, /**< High Level */ + OMX_VIDEO_MPEG2LevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_MPEG2LevelVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_VIDEO_MPEG2LevelMax = 0x7FFFFFFF + OMX_VIDEO_MPEG2LevelMax = 0x7FFFFFFF } OMX_VIDEO_MPEG2LEVELTYPE; -/** - * MPEG-2 params +/** + * MPEG-2 params * * STRUCT MEMBERS: * nSize : Size of the structure in bytes @@ -551,20 +569,20 @@ typedef enum OMX_VIDEO_MPEG2LEVELTYPE { * eLevel : MPEG-2 levels(s) to use */ typedef struct OMX_VIDEO_PARAM_MPEG2TYPE { - OMX_U32 nSize; + OMX_U32 nSize; OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nPFrames; - OMX_U32 nBFrames; + OMX_U32 nPortIndex; + OMX_U32 nPFrames; + OMX_U32 nBFrames; OMX_VIDEO_MPEG2PROFILETYPE eProfile; - OMX_VIDEO_MPEG2LEVELTYPE eLevel; + OMX_VIDEO_MPEG2LEVELTYPE eLevel; } OMX_VIDEO_PARAM_MPEG2TYPE; -/** - * MPEG-4 profile types, each profile indicates support for various +/** + * MPEG-4 profile types, each profile indicates support for various * performance bounds and different annexes. - * + * * ENUMS: * - Simple Profile, Levels 1-3 * - Simple Scalable Profile, Levels 1-2 @@ -583,48 +601,48 @@ typedef struct OMX_VIDEO_PARAM_MPEG2TYPE { * - Advanced Scalable Texture, Levels 2-3 */ typedef enum OMX_VIDEO_MPEG4PROFILETYPE { - OMX_VIDEO_MPEG4ProfileSimple = 0x01, - OMX_VIDEO_MPEG4ProfileSimpleScalable = 0x02, - OMX_VIDEO_MPEG4ProfileCore = 0x04, - OMX_VIDEO_MPEG4ProfileMain = 0x08, - OMX_VIDEO_MPEG4ProfileNbit = 0x10, - OMX_VIDEO_MPEG4ProfileScalableTexture = 0x20, - OMX_VIDEO_MPEG4ProfileSimpleFace = 0x40, - OMX_VIDEO_MPEG4ProfileSimpleFBA = 0x80, - OMX_VIDEO_MPEG4ProfileBasicAnimated = 0x100, - OMX_VIDEO_MPEG4ProfileHybrid = 0x200, - OMX_VIDEO_MPEG4ProfileAdvancedRealTime = 0x400, - OMX_VIDEO_MPEG4ProfileCoreScalable = 0x800, - OMX_VIDEO_MPEG4ProfileAdvancedCoding = 0x1000, - OMX_VIDEO_MPEG4ProfileAdvancedCore = 0x2000, + OMX_VIDEO_MPEG4ProfileSimple = 0x01, + OMX_VIDEO_MPEG4ProfileSimpleScalable = 0x02, + OMX_VIDEO_MPEG4ProfileCore = 0x04, + OMX_VIDEO_MPEG4ProfileMain = 0x08, + OMX_VIDEO_MPEG4ProfileNbit = 0x10, + OMX_VIDEO_MPEG4ProfileScalableTexture = 0x20, + OMX_VIDEO_MPEG4ProfileSimpleFace = 0x40, + OMX_VIDEO_MPEG4ProfileSimpleFBA = 0x80, + OMX_VIDEO_MPEG4ProfileBasicAnimated = 0x100, + OMX_VIDEO_MPEG4ProfileHybrid = 0x200, + OMX_VIDEO_MPEG4ProfileAdvancedRealTime = 0x400, + OMX_VIDEO_MPEG4ProfileCoreScalable = 0x800, + OMX_VIDEO_MPEG4ProfileAdvancedCoding = 0x1000, + OMX_VIDEO_MPEG4ProfileAdvancedCore = 0x2000, OMX_VIDEO_MPEG4ProfileAdvancedScalable = 0x4000, OMX_VIDEO_MPEG4ProfileAdvancedSimple = 0x8000, - OMX_VIDEO_MPEG4ProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_MPEG4ProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_MPEG4ProfileVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_VIDEO_MPEG4ProfileMax = 0x7FFFFFFF + OMX_VIDEO_MPEG4ProfileMax = 0x7FFFFFFF } OMX_VIDEO_MPEG4PROFILETYPE; -/** - * MPEG-4 level types, each level indicates support for various frame - * sizes, bit rates, decoder frame rates. No need +/** + * MPEG-4 level types, each level indicates support for various frame + * sizes, bit rates, decoder frame rates. No need */ typedef enum OMX_VIDEO_MPEG4LEVELTYPE { - OMX_VIDEO_MPEG4Level0 = 0x01, /**< Level 0 */ - OMX_VIDEO_MPEG4Level0b = 0x02, /**< Level 0b */ - OMX_VIDEO_MPEG4Level1 = 0x04, /**< Level 1 */ - OMX_VIDEO_MPEG4Level2 = 0x08, /**< Level 2 */ - OMX_VIDEO_MPEG4Level3 = 0x10, /**< Level 3 */ - OMX_VIDEO_MPEG4Level4 = 0x20, /**< Level 4 */ - OMX_VIDEO_MPEG4Level4a = 0x40, /**< Level 4a */ - OMX_VIDEO_MPEG4Level5 = 0x80, /**< Level 5 */ - OMX_VIDEO_MPEG4LevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_MPEG4Level0 = 0x01, /**< Level 0 */ + OMX_VIDEO_MPEG4Level0b = 0x02, /**< Level 0b */ + OMX_VIDEO_MPEG4Level1 = 0x04, /**< Level 1 */ + OMX_VIDEO_MPEG4Level2 = 0x08, /**< Level 2 */ + OMX_VIDEO_MPEG4Level3 = 0x10, /**< Level 3 */ + OMX_VIDEO_MPEG4Level4 = 0x20, /**< Level 4 */ + OMX_VIDEO_MPEG4Level4a = 0x40, /**< Level 4a */ + OMX_VIDEO_MPEG4Level5 = 0x80, /**< Level 5 */ + OMX_VIDEO_MPEG4LevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_MPEG4LevelVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_VIDEO_MPEG4LevelMax = 0x7FFFFFFF + OMX_VIDEO_MPEG4LevelMax = 0x7FFFFFFF } OMX_VIDEO_MPEG4LEVELTYPE; -/** +/** * MPEG-4 configuration. This structure handles configuration options * which are specific to MPEG4 algorithms * @@ -632,24 +650,24 @@ typedef enum OMX_VIDEO_MPEG4LEVELTYPE { * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to - * nSliceHeaderSpacing : Number of macroblocks between slice header (H263+ + * nSliceHeaderSpacing : Number of macroblocks between slice header (H263+ * Annex K). Put zero if not used * bSVH : Enable Short Video Header mode * bGov : Flag to enable GOV - * nPFrames : Number of P frames between each I frame (also called + * nPFrames : Number of P frames between each I frame (also called * GOV period) * nBFrames : Number of B frames between each I frame * nIDCVLCThreshold : Value of intra DC VLC threshold * bACPred : Flag to use ac prediction * nMaxPacketSize : Maximum size of packet in bytes. - * nTimeIncRes : Used to pass VOP time increment resolution for MPEG4. + * nTimeIncRes : Used to pass VOP time increment resolution for MPEG4. * Interpreted as described in MPEG4 standard. * eProfile : MPEG-4 profile(s) to use. * eLevel : MPEG-4 level(s) to use. * nAllowedPictureTypes : Specifies the picture types allowed in the bitstream * nHeaderExtension : Specifies the number of consecutive video packet * headers within a VOP - * bReversibleVLC : Specifies whether reversible variable length coding + * bReversibleVLC : Specifies whether reversible variable length coding * is in use */ typedef struct OMX_VIDEO_PARAM_MPEG4TYPE { @@ -673,22 +691,22 @@ typedef struct OMX_VIDEO_PARAM_MPEG4TYPE { } OMX_VIDEO_PARAM_MPEG4TYPE; -/** - * WMV Versions +/** + * WMV Versions */ typedef enum OMX_VIDEO_WMVFORMATTYPE { OMX_VIDEO_WMVFormatUnused = 0x01, /**< Format unused or unknown */ OMX_VIDEO_WMVFormat7 = 0x02, /**< Windows Media Video format 7 */ OMX_VIDEO_WMVFormat8 = 0x04, /**< Windows Media Video format 8 */ OMX_VIDEO_WMVFormat9 = 0x08, /**< Windows Media Video format 9 */ - OMX_VIDEO_WMFFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_WMFFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_WMFFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_VIDEO_WMVFormatMax = 0x7FFFFFFF } OMX_VIDEO_WMVFORMATTYPE; -/** - * WMV Params +/** + * WMV Params * * STRUCT MEMBERS: * nSize : Size of the structure in bytes @@ -697,33 +715,33 @@ typedef enum OMX_VIDEO_WMVFORMATTYPE { * eFormat : Version of WMV stream / data */ typedef struct OMX_VIDEO_PARAM_WMVTYPE { - OMX_U32 nSize; + OMX_U32 nSize; OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_VIDEO_WMVFORMATTYPE eFormat; } OMX_VIDEO_PARAM_WMVTYPE; -/** - * Real Video Version +/** + * Real Video Version */ typedef enum OMX_VIDEO_RVFORMATTYPE { OMX_VIDEO_RVFormatUnused = 0, /**< Format unused or unknown */ OMX_VIDEO_RVFormat8, /**< Real Video format 8 */ OMX_VIDEO_RVFormat9, /**< Real Video format 9 */ OMX_VIDEO_RVFormatG2, /**< Real Video Format G2 */ - OMX_VIDEO_RVFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_RVFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_RVFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_VIDEO_RVFormatMax = 0x7FFFFFFF } OMX_VIDEO_RVFORMATTYPE; -/** - * Real Video Params +/** + * Real Video Params * * STUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * eFormat : Version of RV stream / data * nBitsPerPixel : Bits per pixel coded in the frame @@ -735,11 +753,11 @@ typedef enum OMX_VIDEO_RVFORMATTYPE { * nMaxEncodeFrameSize: Max encoded frame size * bEnablePostFilter : Turn on/off post filter * bEnableTemporalInterpolation : Turn on/off temporal interpolation - * bEnableLatencyMode : When enabled, the decoder does not display a decoded - * frame until it has detected that no enhancement layer - * frames or dependent B frames will be coming. This - * detection usually occurs when a subsequent non-B - * frame is encountered + * bEnableLatencyMode : When enabled, the decoder does not display a decoded + * frame until it has detected that no enhancement layer + * frames or dependent B frames will be coming. This + * detection usually occurs when a subsequent non-B + * frame is encountered */ typedef struct OMX_VIDEO_PARAM_RVTYPE { OMX_U32 nSize; @@ -759,8 +777,8 @@ typedef struct OMX_VIDEO_PARAM_RVTYPE { } OMX_VIDEO_PARAM_RVTYPE; -/** - * AVC profile types, each profile indicates support for various +/** + * AVC profile types, each profile indicates support for various * performance bounds and different annexes. */ typedef enum OMX_VIDEO_AVCPROFILETYPE { @@ -771,15 +789,15 @@ typedef enum OMX_VIDEO_AVCPROFILETYPE { OMX_VIDEO_AVCProfileHigh10 = 0x10, /**< High 10 profile */ OMX_VIDEO_AVCProfileHigh422 = 0x20, /**< High 4:2:2 profile */ OMX_VIDEO_AVCProfileHigh444 = 0x40, /**< High 4:4:4 profile */ - OMX_VIDEO_AVCProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_AVCProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_AVCProfileVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_VIDEO_AVCProfileMax = 0x7FFFFFFF + OMX_VIDEO_AVCProfileMax = 0x7FFFFFFF } OMX_VIDEO_AVCPROFILETYPE; -/** - * AVC level types, each level indicates support for various frame sizes, - * bit rates, decoder frame rates. No need +/** + * AVC level types, each level indicates support for various frame sizes, + * bit rates, decoder frame rates. No need */ typedef enum OMX_VIDEO_AVCLEVELTYPE { OMX_VIDEO_AVCLevel1 = 0x01, /**< Level 1 */ @@ -798,14 +816,14 @@ typedef enum OMX_VIDEO_AVCLEVELTYPE { OMX_VIDEO_AVCLevel42 = 0x2000, /**< Level 4.2 */ OMX_VIDEO_AVCLevel5 = 0x4000, /**< Level 5 */ OMX_VIDEO_AVCLevel51 = 0x8000, /**< Level 5.1 */ - OMX_VIDEO_AVCLevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_AVCLevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_AVCLevelVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_VIDEO_AVCLevelMax = 0x7FFFFFFF + OMX_VIDEO_AVCLevelMax = 0x7FFFFFFF } OMX_VIDEO_AVCLEVELTYPE; -/** - * AVC loop filter modes +/** + * AVC loop filter modes * * OMX_VIDEO_AVCLoopFilterEnable : Enable * OMX_VIDEO_AVCLoopFilterDisable : Disable @@ -815,20 +833,20 @@ typedef enum OMX_VIDEO_AVCLOOPFILTERTYPE { OMX_VIDEO_AVCLoopFilterEnable = 0, OMX_VIDEO_AVCLoopFilterDisable, OMX_VIDEO_AVCLoopFilterDisableSliceBoundary, - OMX_VIDEO_AVCLoopFilterKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_AVCLoopFilterKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_AVCLoopFilterVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_VIDEO_AVCLoopFilterMax = 0x7FFFFFFF } OMX_VIDEO_AVCLOOPFILTERTYPE; -/** - * AVC params +/** + * AVC params * * STRUCT MEMBERS: * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to - * nSliceHeaderSpacing : Number of macroblocks between slice header, put + * nSliceHeaderSpacing : Number of macroblocks between slice header, put * zero if not used * nPFrames : Number of P frames between each I frame * nBFrames : Number of B frames between each I frame @@ -841,85 +859,85 @@ typedef enum OMX_VIDEO_AVCLOOPFILTERTYPE { * nRefIdxForward : Pic param set ref frame index (index into ref * frame buffer of forward frames list), B frame * support - * bEnableUEP : Enable/disable unequal error protection. This + * bEnableUEP : Enable/disable unequal error protection. This * is only valid of data partitioning is enabled. * bEnableFMO : Enable/disable flexible macroblock ordering * bEnableASO : Enable/disable arbitrary slice ordering * bEnableRS : Enable/disable sending of redundant slices * eProfile : AVC profile(s) to use * eLevel : AVC level(s) to use - * nAllowedPictureTypes : Specifies the picture types allowed in the + * nAllowedPictureTypes : Specifies the picture types allowed in the * bitstream - * bFrameMBsOnly : specifies that every coded picture of the - * coded video sequence is a coded frame + * bFrameMBsOnly : specifies that every coded picture of the + * coded video sequence is a coded frame * containing only frame macroblocks - * bMBAFF : Enable/disable switching between frame and + * bMBAFF : Enable/disable switching between frame and * field macroblocks within a picture - * bEntropyCodingCABAC : Entropy decoding method to be applied for the - * syntax elements for which two descriptors appear + * bEntropyCodingCABAC : Entropy decoding method to be applied for the + * syntax elements for which two descriptors appear * in the syntax tables - * bWeightedPPrediction : Enable/disable weighted prediction shall not + * bWeightedPPrediction : Enable/disable weighted prediction shall not * be applied to P and SP slices - * nWeightedBipredicitonMode : Default weighted prediction is applied to B - * slices + * nWeightedBipredicitonMode : Default weighted prediction is applied to B + * slices * bconstIpred : Enable/disable intra prediction - * bDirect8x8Inference : Specifies the method used in the derivation - * process for luma motion vectors for B_Skip, - * B_Direct_16x16 and B_Direct_8x8 as specified - * in subclause 8.4.1.2 of the AVC spec + * bDirect8x8Inference : Specifies the method used in the derivation + * process for luma motion vectors for B_Skip, + * B_Direct_16x16 and B_Direct_8x8 as specified + * in subclause 8.4.1.2 of the AVC spec * bDirectSpatialTemporal : Flag indicating spatial or temporal direct - * mode used in B slice coding (related to - * bDirect8x8Inference) . Spatial direct mode is + * mode used in B slice coding (related to + * bDirect8x8Inference) . Spatial direct mode is * more common and should be the default. * nCabacInitIdx : Index used to init CABAC contexts * eLoopFilterMode : Enable/disable loop filter */ typedef struct OMX_VIDEO_PARAM_AVCTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nSliceHeaderSpacing; - OMX_U32 nPFrames; - OMX_U32 nBFrames; + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U32 nSliceHeaderSpacing; + OMX_U32 nPFrames; + OMX_U32 nBFrames; OMX_BOOL bUseHadamard; - OMX_U32 nRefFrames; + OMX_U32 nRefFrames; OMX_U32 nRefIdx10ActiveMinus1; OMX_U32 nRefIdx11ActiveMinus1; - OMX_BOOL bEnableUEP; - OMX_BOOL bEnableFMO; - OMX_BOOL bEnableASO; - OMX_BOOL bEnableRS; + OMX_BOOL bEnableUEP; + OMX_BOOL bEnableFMO; + OMX_BOOL bEnableASO; + OMX_BOOL bEnableRS; OMX_VIDEO_AVCPROFILETYPE eProfile; - OMX_VIDEO_AVCLEVELTYPE eLevel; - OMX_U32 nAllowedPictureTypes; - OMX_BOOL bFrameMBsOnly; - OMX_BOOL bMBAFF; - OMX_BOOL bEntropyCodingCABAC; - OMX_BOOL bWeightedPPrediction; - OMX_U32 nWeightedBipredicitonMode; + OMX_VIDEO_AVCLEVELTYPE eLevel; + OMX_U32 nAllowedPictureTypes; + OMX_BOOL bFrameMBsOnly; + OMX_BOOL bMBAFF; + OMX_BOOL bEntropyCodingCABAC; + OMX_BOOL bWeightedPPrediction; + OMX_U32 nWeightedBipredicitonMode; OMX_BOOL bconstIpred ; - OMX_BOOL bDirect8x8Inference; + OMX_BOOL bDirect8x8Inference; OMX_BOOL bDirectSpatialTemporal; OMX_U32 nCabacInitIdc; OMX_VIDEO_AVCLOOPFILTERTYPE eLoopFilterMode; } OMX_VIDEO_PARAM_AVCTYPE; typedef struct OMX_VIDEO_PARAM_PROFILELEVELTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 eProfile; /**< type is OMX_VIDEO_AVCPROFILETYPE, OMX_VIDEO_H263PROFILETYPE, + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U32 eProfile; /**< type is OMX_VIDEO_AVCPROFILETYPE, OMX_VIDEO_H263PROFILETYPE, or OMX_VIDEO_MPEG4PROFILETYPE depending on context */ - OMX_U32 eLevel; /**< type is OMX_VIDEO_AVCLEVELTYPE, OMX_VIDEO_H263LEVELTYPE, + OMX_U32 eLevel; /**< type is OMX_VIDEO_AVCLEVELTYPE, OMX_VIDEO_H263LEVELTYPE, or OMX_VIDEO_MPEG4PROFILETYPE depending on context */ OMX_U32 nProfileIndex; /**< Used to query for individual profile support information, - This parameter is valid only for + This parameter is valid only for OMX_IndexParamVideoProfileLevelQuerySupported index, For all other indices this parameter is to be ignored. */ } OMX_VIDEO_PARAM_PROFILELEVELTYPE; -/** - * Structure for dynamically configuring bitrate mode of a codec. +/** + * Structure for dynamically configuring bitrate mode of a codec. * * STRUCT MEMBERS: * nSize : Size of the struct in bytes @@ -928,18 +946,18 @@ typedef struct OMX_VIDEO_PARAM_PROFILELEVELTYPE { * nEncodeBitrate : Target average bitrate to be generated in bps */ typedef struct OMX_VIDEO_CONFIG_BITRATETYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nEncodeBitrate; + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U32 nEncodeBitrate; } OMX_VIDEO_CONFIG_BITRATETYPE; -/** +/** * Defines Encoder Frame Rate setting * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * xEncodeFramerate : Encoding framerate represented in Q16 format */ @@ -979,8 +997,8 @@ typedef struct OMX_PARAM_MACROBLOCKSTYPE { OMX_U32 nMacroblocks; } OMX_PARAM_MACROBLOCKSTYPE; -/** - * AVC Slice Mode modes +/** + * AVC Slice Mode modes * * OMX_VIDEO_SLICEMODE_AVCDefault : Normal frame encoding, one slice per frame * OMX_VIDEO_SLICEMODE_AVCMBSlice : NAL mode, number of MBs per frame @@ -990,13 +1008,13 @@ typedef enum OMX_VIDEO_AVCSLICEMODETYPE { OMX_VIDEO_SLICEMODE_AVCDefault = 0, OMX_VIDEO_SLICEMODE_AVCMBSlice, OMX_VIDEO_SLICEMODE_AVCByteSlice, - OMX_VIDEO_SLICEMODE_AVCKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_SLICEMODE_AVCKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_SLICEMODE_AVCVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_VIDEO_SLICEMODE_AVCLevelMax = 0x7FFFFFFF } OMX_VIDEO_AVCSLICEMODETYPE; -/** - * AVC FMO Slice Mode Params +/** + * AVC FMO Slice Mode Params * * STRUCT MEMBERS: * nSize : Size of the structure in bytes @@ -1007,7 +1025,7 @@ typedef enum OMX_VIDEO_AVCSLICEMODETYPE { * eSliceMode : Specifies the type of slice */ typedef struct OMX_VIDEO_PARAM_AVCSLICEFMO { - OMX_U32 nSize; + OMX_U32 nSize; OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_U8 nNumSliceGroups; @@ -1015,7 +1033,7 @@ typedef struct OMX_VIDEO_PARAM_AVCSLICEFMO { OMX_VIDEO_AVCSLICEMODETYPE eSliceMode; } OMX_VIDEO_PARAM_AVCSLICEFMO; -/** +/** * AVC IDR Period Configs * * STRUCT MEMBERS: @@ -1026,14 +1044,14 @@ typedef struct OMX_VIDEO_PARAM_AVCSLICEFMO { * nPFrames : Specifies internal of coding Intra frames */ typedef struct OMX_VIDEO_CONFIG_AVCINTRAPERIOD { - OMX_U32 nSize; + OMX_U32 nSize; OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_U32 nIDRPeriod; OMX_U32 nPFrames; } OMX_VIDEO_CONFIG_AVCINTRAPERIOD; -/** +/** * AVC NAL Size Configs * * STRUCT MEMBERS: @@ -1043,7 +1061,7 @@ typedef struct OMX_VIDEO_CONFIG_AVCINTRAPERIOD { * nNaluBytes : Specifies the NAL unit size */ typedef struct OMX_VIDEO_CONFIG_NALSIZE { - OMX_U32 nSize; + OMX_U32 nSize; OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_U32 nNaluBytes; diff --git a/domx/omx_core/src/OMX_Core.c b/domx/omx_core/src/OMX_Core.c index d585ac5..8d9b529 100755 --- a/domx/omx_core/src/OMX_Core.c +++ b/domx/omx_core/src/OMX_Core.c @@ -81,24 +81,31 @@ char compName[60][200]; char *tComponentName[MAXCOMP][MAX_ROLES] = { /*video and image components */ - {"OMX.TI.DUCATI1.VIDEO.DECODER", "video_decoder.mpeg4", + {"OMX.TI.DUCATI1.VIDEO.DECODER", + "video_decoder.mpeg4", "video_decoder.avc", "video_decoder.h263", "video_decoder.wmv", - "video_decoder.vp6", - "video_decoder.vp7", NULL}, - {"OMX.TI.DUCATI1.VIDEO.DECODER.secure", "video_decoder.mpeg4", + "video_decoder.mpeg2", + "video_decoder.svc", + "video_decoder.sorspk", NULL}, + {"OMX.TI.DUCATI1.VIDEO.DECODER.secure", + "video_decoder.mpeg4", "video_decoder.avc", "video_decoder.h263", NULL}, - {"OMX.TI.DUCATI1.VIDEO.H264D", "video_decoder.avc", NULL}, - {"OMX.TI.DUCATI1.VIDEO.H264E", "video_encoder.avc", NULL}, - {"OMX.TI.DUCATI1.VIDEO.MPEG4D", "video_decoder.mpeg4", NULL}, - {"OMX.TI.DUCATI1.VIDEO.MPEG4E", "video_encoder.mpeg4", - "video_encoder.h263",NULL}, - {"OMX.TI.DUCATI1.VIDEO.VP6D", "video_decoder.vp6", NULL}, - {"OMX.TI.DUCATI1.VIDEO.VP7D", "video_decoder.vp7", NULL}, - {"OMX.TI.DUCATI1.IMAGE.JPEGD", "jpeg_decoder.jpeg", NULL}, + {"OMX.TI.DUCATI1.VIDEO.H264E", + "video_encoder.avc", NULL}, + {"OMX.TI.DUCATI1.VIDEO.MPEG4E", + "video_encoder.mpeg4", + "video_encoder.h263",NULL}, {"OMX.TI.DUCATI1.VIDEO.CAMERA", "camera.omx", NULL}, +#ifdef USE_ITTIAM_AAC + {"OMX.ITTIAM.AAC.decode", "audio_decoder.aac", NULL}, + {"OMX.ITTIAM.BSAC.decode", "audio_decoder.aac", NULL}, +#endif + {"OMX.ITTIAM.WMA.decode", "audio_decoder.wma", NULL}, + {"OMX.ITTIAM.WMALSL.decode", "audio_decoder.wmalsl", NULL}, + {"OMX.ITTIAM.WMAPRO.decode", "audio_decoder.wmapro", NULL}, /* terminate the table */ {NULL, NULL}, }; @@ -215,7 +222,7 @@ OMX_ERRORTYPE OMX_GetHandle(OMX_HANDLETYPE * pHandle, /* Locate the first empty slot for a component. If no slots * are available, error out */ - for (i = 0; i < COUNTOF(pModules); i++) + for (i = 0; i < (int)COUNTOF(pModules); i++) { if (pModules[i] == NULL) break; @@ -246,36 +253,42 @@ OMX_ERRORTYPE OMX_GetHandle(OMX_HANDLETYPE * pHandle, { TIMM_OSAL_Error("Can't open misc driver device 0x%x\n", errno); } - - ret = read(secure_misc_drv_fd, &mode, sizeof(mode)); - if (ret < 0) - { - TIMM_OSAL_Error("Can't read from the misc driver"); - } - if(mode == enable && strstr(cComponentName,"secure") == NULL) - { - TIMM_OSAL_Error("non-secure component not supported in secure mode"); - eError = OMX_ErrorComponentNotFound; - } - ret = close(secure_misc_drv_fd); - if (ret < 0) - { - TIMM_OSAL_Error("Can't close the misc driver"); - } - //Dont allow non-secure usecases if we are in secure state. - //Else some of the memory regions will be unexpected firewalled. - //This provides a clean exit in case we are in secure mode. - if(eError == OMX_ErrorComponentNotFound) + else { - goto EXIT; + ret = read(secure_misc_drv_fd, &mode, sizeof(mode)); + if (ret != sizeof(mode)) + { + TIMM_OSAL_Error("Can't read from the misc driver"); + } + else + { + if(mode == enable && strstr(cComponentName,"secure") == NULL) + { + TIMM_OSAL_Error("non-secure component not supported in secure mode"); + eError = OMX_ErrorComponentNotFound; + } + } + ret = close(secure_misc_drv_fd); + if (ret < 0) + { + TIMM_OSAL_Error("Can't close the misc driver"); + } } -#endif + /* Don't allow non-secure usecases if we are in secure state. + * Else some of the memory regions will be unexpected firewalled. + * This provides a clean exit in case we are in secure mode. */ + if (eError == OMX_ErrorComponentNotFound) + { + goto EXIT; + } +#endif //CHECK_SECURE_STATE + //#if 0 pModules[i] = dlopen(buf, RTLD_LAZY | RTLD_GLOBAL); if (pModules[i] == NULL) { - dlError = dlerror(); + dlError = (char *)dlerror(); TIMM_OSAL_Error("Failed because %s", dlError); eError = OMX_ErrorComponentNotFound; goto EXIT; @@ -369,7 +382,7 @@ OMX_ERRORTYPE OMX_FreeHandle(OMX_HANDLETYPE hComponent) "OMX_FreeHandle called without calling OMX_Init first"); /* Locate the component handle in the array of handles */ - for (i = 0; i < COUNTOF(pModules); i++) + for (i = 0; i < (int)COUNTOF(pModules); i++) { if (pComponents[i] == hComponent) break; @@ -537,7 +550,7 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_ComponentNameEnum(OMX_OUT OMX_STRING CORE_require(count > 0, OMX_ErrorUndefined, "OMX_GetHandle called without calling OMX_Init first"); - if (nIndex >= tableCount) + if (nIndex >= (OMX_U32)tableCount) { eError = OMX_ErrorNoMore; } else @@ -581,7 +594,7 @@ OMX_API OMX_ERRORTYPE OMX_GetRolesOfComponent(OMX_IN OMX_STRING CORE_require(count > 0, OMX_ErrorUndefined, "OMX_GetHandle called without calling OMX_Init first"); - while (!bFound && i < tableCount) + while (!bFound && i < (OMX_U32)tableCount) { if (strcmp(cComponentName, componentTable[i].name) == 0) { @@ -642,7 +655,7 @@ OMX_API OMX_ERRORTYPE OMX_GetComponentsOfRole(OMX_IN OMX_STRING role, CORE_assert(componentTable[i].pRoleArray[j] != NULL, OMX_ErrorBadParameter, NULL); - for (i = 0; i < tableCount; i++) + for (i = 0; i < (OMX_U32)tableCount; i++) { for (j = 0; j < componentTable[i].nRoles; j++) { diff --git a/domx/omx_core/src/OMX_Core_Wrapper.c b/domx/omx_core/src/OMX_Core_Wrapper.c index 8d61dd4..6fbf3d7 100755 --- a/domx/omx_core/src/OMX_Core_Wrapper.c +++ b/domx/omx_core/src/OMX_Core_Wrapper.c @@ -38,17 +38,13 @@ #include "OMX_ComponentRegistry.h" #include "OMX_Core_Wrapper.h" -#include <utils/Log.h> +#include "timm_osal_trace.h" #undef LOG_TAG #define LOG_TAG "OMX_CORE" /** determine capabilities of a component before acually using it */ -#if 0 -#include "ti_omx_config_parser.h" -#else extern OMX_BOOL TIOMXConfigParser(OMX_PTR aInputParameters, OMX_PTR aOutputParameters); -#endif #endif @@ -58,12 +54,12 @@ extern OMX_BOOL TIOMXConfigParser(OMX_PTR aInputParameters, OMX_BOOL TIOMXConfigParserRedirect(OMX_PTR aInputParameters, OMX_PTR aOutputParameters) { - ALOGV("OMXConfigParserRedirect +\n"); + TIMM_OSAL_Entering("OMXConfigParserRedirect +\n"); OMX_BOOL Status = OMX_FALSE; Status = TIOMXConfigParser(aInputParameters, aOutputParameters); - ALOGV("OMXConfigParserRedirect -\n"); + TIMM_OSAL_Exiting("OMXConfigParserRedirect -\n"); return Status; } #endif @@ -92,14 +88,14 @@ OMX_ERRORTYPE TIComponentTable_FillBufferDone(OMX_OUT OMX_HANDLETYPE OMX_API OMX_ERRORTYPE TIOMX_Init(void) { - ALOGV("TIOMX_Init\n"); + TIMM_OSAL_Entering("TIOMX_Init\n"); return OMX_Init(); } OMX_API OMX_ERRORTYPE TIOMX_Deinit(void) { - ALOGV("TIOMX_Deinit\n"); + TIMM_OSAL_Entering("TIOMX_Deinit\n"); return OMX_Deinit(); } @@ -108,7 +104,7 @@ OMX_API OMX_ERRORTYPE TIOMX_ComponentNameEnum(OMX_OUT OMX_STRING cComponentName, OMX_IN OMX_U32 nNameLength, OMX_IN OMX_U32 nIndex) { - ALOGV("TIOMX_ComponentNameEnum\n"); + TIMM_OSAL_Entering("TIOMX_ComponentNameEnum\n"); return OMX_ComponentNameEnum(cComponentName, nNameLength, nIndex); } @@ -118,14 +114,14 @@ OMX_API OMX_ERRORTYPE TIOMX_GetHandle(OMX_OUT OMX_HANDLETYPE * pHandle, OMX_IN OMX_PTR pAppData, OMX_IN OMX_CALLBACKTYPE * pCallBacks) { - ALOGV("TIOMX_GetHandle\n"); + TIMM_OSAL_Entering("TIOMX_GetHandle\n"); return OMX_GetHandle(pHandle, cComponentName, pAppData, pCallBacks); } OMX_API OMX_ERRORTYPE TIOMX_FreeHandle(OMX_IN OMX_HANDLETYPE hComponent) { - ALOGV("TIOMX_FreeHandle\n"); + TIMM_OSAL_Entering("TIOMX_FreeHandle\n"); return OMX_FreeHandle(hComponent); } @@ -134,7 +130,7 @@ OMX_API OMX_ERRORTYPE TIOMX_GetComponentsOfRole(OMX_IN OMX_STRING role, OMX_INOUT OMX_U32 * pNumComps, OMX_INOUT OMX_U8 ** compNames) { - ALOGV("TIOMX_GetComponentsOfRole\n"); + TIMM_OSAL_Entering("TIOMX_GetComponentsOfRole\n"); return OMX_GetComponentsOfRole(role, pNumComps, compNames); } @@ -143,7 +139,7 @@ OMX_API OMX_ERRORTYPE TIOMX_GetRolesOfComponent(OMX_IN OMX_STRING compName, OMX_INOUT OMX_U32 * pNumRoles, OMX_OUT OMX_U8 ** roles) { - ALOGV("TIOMX_GetRolesOfComponent\n"); + TIMM_OSAL_Entering("TIOMX_GetRolesOfComponent\n"); return OMX_GetRolesOfComponent(compName, pNumRoles, roles); } @@ -153,7 +149,7 @@ OMX_API OMX_ERRORTYPE TIOMX_SetupTunnel(OMX_IN OMX_HANDLETYPE hOutput, OMX_IN OMX_HANDLETYPE hInput, OMX_IN OMX_U32 nPortInput) { - ALOGV("TIOMX_SetupTunnel\n"); + TIMM_OSAL_Entering("TIOMX_SetupTunnel\n"); return OMX_SetupTunnel(hOutput, nPortOutput, hInput, nPortInput); } @@ -162,7 +158,7 @@ OMX_API OMX_ERRORTYPE TIOMX_GetContentPipe(OMX_OUT OMX_HANDLETYPE * hPipe, OMX_IN OMX_STRING szURI) { - ALOGV("TIOMX_GetContentPipe\n"); + TIMM_OSAL_Entering("TIOMX_GetContentPipe\n"); //return OMX_GetContentPipe( // hPipe, |