Bunch of SHAIs Updates
authorarunabha
Sat, 10 Oct 2009 12:43:55 +0100
changeset 2 ea09f30a96a5
parent 1 d7a6bb4d51e7
child 3 89965ac1daf8
Bunch of SHAIs Updates
Audio Signal Processing/audio_codecs_chipset_api.h
Audio Signal Processing/audio_render_chipset_api.h
Audio Signal Processing/audio_sourcesink_chipset_api.h
Audio Signal Processing/audio_transducer_chipset_api.h
--- a/Audio Signal Processing/audio_codecs_chipset_api.h	Fri Oct 02 14:41:46 2009 +0100
+++ b/Audio Signal Processing/audio_codecs_chipset_api.h	Sat Oct 10 12:43:55 2009 +0100
@@ -13,8 +13,7 @@
   Nokia Corporation - initial contribution.
 
   Contributors:
-*/
-
+*/
 #ifndef AUDIO_CODECS_CHIPSET_API_H
 #define AUDIO_CODECS_CHIPSET_API_H
 
@@ -30,137 +29,20 @@
 
 #include <OMX_Audio.h>
 
-/** AMR-WB+ related **/
 
-typedef enum OMX_AUDIOCODINGEXTTYPE {
-    OMX_AudioCodingExtStart = 0x6F000000,    /* =  OMX_AUDIO_CodingExtensions */
-    /* Add Khronos approved extended components indexes here */
-    OMX_AUDIO_CodingAMRWBPLUS,
-    OMX_AudioCodingExtMax = 0x6FFFFFFF
-} OMX_AUDIOCODINGEXTTYPE;
-
-/** AMR Wideband Plus Extensions */
-/** AMR Frame format Extension */ 
-typedef enum OMX_AUDIO_AMREXT_FRAMEFORMATTYPE { 
-    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_AMRWideBandPlusFrameFormat,     /**< 3GPP TS 26.290, clause 8.2 */
-    OMX_AUDIO_AMRFrameFormatMax = 0x7FFFFFFF 
-} OMX_AUDIO_AMREXT_FRAMEFORMATTYPE; 
-
-typedef enum OMX_AUDIO_AMRDTXMODETYPE { 
-    OMX_AUDIO_AMRDTXModeUsed = 0,  /**< DTX used or unused */ 
-    OMX_AUDIO_AMRDTXModeOnVAD1,    /**< Use Type 1 VAD */ 
-    OMX_AUDIO_AMRDTXModeOnVAD2,    /**< Use Type 2 VAD */
-    OMX_AUDIO_AMRDTXModeOnAuto,    /**< VAD type automatic */
-    OMX_AUDIO_AMRDTXModeAsEFR,     /**< DTX frames as EFR */
-    OMX_AUDIO_AMRDTXModeMax = 0x7FFFFFFF 
-
- } OMX_AUDIO_AMRDTXMODETYPE; 
-
-
+/** WMA param **/
 
-/** AMR band mode extension */
-typedef enum OMX_AUDIO_AMREXT_BANDMODETYPE {
-    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_AMRBandModeNB3,                 /**< AMRNB Mode 3 =  6700 bps */
-    OMX_AUDIO_AMRBandModeNB4,                 /**< AMRNB Mode 4 =  7400 bps */
-    OMX_AUDIO_AMRBandModeNB5,                 /**< AMRNB Mode 5 =  7950 bps */
-    OMX_AUDIO_AMRBandModeNB6,                 /**< AMRNB Mode 6 = 10200 bps */
-    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_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_AMRBandModeWP0,                 /**< AMR-WB+ 13.6 kbps (mono, 16/24kHz output) */
-    OMX_AUDIO_AMRBandModeWP1,                 /**< AMR-WB+ 18 kbps (stereo, 16/24kHz output) */
-    OMX_AUDIO_AMRBandModeWP2,                 /**< AMR-WB+ 24 kbps (mono, 16/24kHz output) */
-    OMX_AUDIO_AMRBandModeWP3,                 /**< AMR-WB+ 24 kbps (stereo, 16/24kHz output) */
-    OMX_AUDIO_AMRBandModeWP4,                 /**< AMR-WB+ 10.4 kbps (mono) */
-    OMX_AUDIO_AMRBandModeWP5,                 /**< AMR-WB+ 12.0 kbps (mono) */
-    OMX_AUDIO_AMRBandModeWP6,                 /**< AMR-WB+ 13.6 kbps (mono) */
-    OMX_AUDIO_AMRBandModeWP7,                 /**< AMR-WB+ 15.2 kbps (mono) */
-    OMX_AUDIO_AMRBandModeWP8,                 /**< AMR-WB+ 16.8 kbps (mono) */
-    OMX_AUDIO_AMRBandModeWP9,                 /**< AMR-WB+ 19.2 kbps (mono) */
-    OMX_AUDIO_AMRBandModeWP10,                /**< AMR-WB+ 20.8 kbps (mono) */
-    OMX_AUDIO_AMRBandModeWP11,                /**< AMR-WB+ 24.0 kbps (mono) */
-    OMX_AUDIO_AMRBandModeWP12,                /**< AMR-WB+ 12.4 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP13,                /**< AMR-WB+ 12.8 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP14,                /**< AMR-WB+ 14.0 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP15,                /**< AMR-WB+ 14.4 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP16,                /**< AMR-WB+ 15.2 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP17,                /**< AMR-WB+ 16.0 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP18,                /**< AMR-WB+ 16.4 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP19,                /**< AMR-WB+ 17.2 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP20,                /**< AMR-WB+ 18.0 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP21,                /**< AMR-WB+ 18.4 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP22,                /**< AMR-WB+ 19.2 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP23,                /**< AMR-WB+ 20.0 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP24,                /**< AMR-WB+ 20.4 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP25,                /**< AMR-WB+ 21.2 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP26,                /**< AMR-WB+ 22.4 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP27,                /**< AMR-WB+ 23.2 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP28,                /**< AMR-WB+ 24.0 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP29,                /**< AMR-WB+ 25.6 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP30,                /**< AMR-WB+ 26.0 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP31,                /**< AMR-WB+ 26.8 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP32,                /**< AMR-WB+ 28.8 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP33,                /**< AMR-WB+ 29.6 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP34,                /**< AMR-WB+ 30.0 kbps (stereo) */
-    OMX_AUDIO_AMRBandModeWP35,                /**< AMR-WB+ 32.0 kbps (stereo) */
-    
-    OMX_AUDIO_AMRBandModeMax = 0x7FFFFFFF /**< 5.15 kbps */
-} OMX_AUDIO_AMREXT_BANDMODETYPE;
-     
+typedef struct OMX_AUDIO_PARAM_WMAAVGBYTESTYPE { 
+OMX_U32 nSize; 
+OMX_VERSIONTYPE nVersion; 
+OMX_U32 nPortIndex;  
+OMX_U32 nAvgBytesPerSec;
+} OMX_AUDIO_PARAM_WMAAVGBYTESTYPE;
 
-/** AMR params extension */
-
-
-typedef struct OMX_AUDIO_PARAM_AMREXT_TYPE {
-    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 nBitRate;                       /**< Bit rate read only field */
-    OMX_AUDIO_AMREXT_BANDMODETYPE eAMRBandMode; /**< AMR Band Mode enumeration */ 
-    OMX_AUDIO_AMRDTXMODETYPE  eAMRDTXMode;  /**< AMR DTX Mode enumeration */
-    OMX_AUDIO_AMREXT_FRAMEFORMATTYPE eAMRFrameFormat; /**< AMR frame format enumeration */
-    OMX_U32 nAMRWideBandPlusISF;            /**< AMR-WB+ internal Sampling Frequency Factor expressed in percentage */
-    OMX_BOOL bAMRWideBandPlusLC;            /**< Activates/deactivates AMR-WB+ low complexity Extended AMR Wide Band encoding mode */
-    OMX_BOOL bAMRWideBandPlusLimiter        /**< Activates/deactivates the limiter option of the decoder */
-
-} OMX_AUDIO_PARAM_AMREXT_TYPE;
-
-/** End of AMR-WB+ related **/
-
-/** WMA Pro related **/
+/** End of WMA related **/
 
 /** WMA Pro params **/
 
-typedef enum OMX_AUDIO_WMAPROFORMATTYPE {
-    OMX_AUDIO_WMAPROFormatUnused = 0,          /**< AMRNB Mode unused / unknown */
-    OMX_AUDIO_WMAPROFormat9,           
-    OMX_AUDIO_WMAPROFormat10,
-    OMX_AUDIO_WMAPROFormatMax = 0x7FFFFFFF    
-} OMX_AUDIO_WMAPROFORMATTYPE;
-
 typedef enum OMX_AUDIO_WMAPROPROFILETYPE {
     OMX_AUDIO_WMAPROProfileUnused = 0,          /**< AMRNB Mode unused / unknown */
     OMX_AUDIO_WMAPROProfileM0,
@@ -176,7 +58,6 @@
 		OMX_U32 nPortIndex;
 		OMX_U16 nChannels;
 		OMX_U32 nBitRate;
-		OMX_AUDIO_WMAPROFORMATTYPE eFormat;
 		OMX_AUDIO_WMAPROPROFILETYPE eProfile;
 		OMX_U32 nSamplingRate;
 		OMX_U32 nBlockAlign;
@@ -185,10 +66,36 @@
 		OMX_U32 nAdvancedEncodeOptions;
 		OMX_U32 nAdvancedEncodeOptions2;
 		OMX_U32 nChannelMask;
+		OMX_U32 nSourceBitsPerSample;
 } OMX_AUDIO_PARAM_WMAPROTYPE;
 
 /** End of WMA Pro related **/
 
+typedef struct OMX_AUDIO_CONFIG_AMRMODETYPE {
+		OMX_U32 nSize;
+		OMX_VERSIONTYPE nVersion;
+		OMX_U32 nPortIndex;
+		OMX_U32 nBitRate;
+		OMX_AUDIO_AMRBANDMODETYPE eAMRBandMode;
+} OMX_AUDIO_CONFIG_AMRMODETYPE;
+
+typedef struct OMX_AUDIO_CONFIG_ILBCFRAMETYPE {
+		OMX_U32 nSize;
+		OMX_VERSIONTYPE nVersion;
+		OMX_U32 nPortIndex;
+		OMX_U32 nFrameLength; 
+} OMX_AUDIO_CONFIG_ILBCFRAMETYPE;
+
+/** SBC codec related **/
+typedef struct OMX_AUDIO_CONFIG_SBCBITPOOLTYPE {
+	  OMX_U32 nSize;
+	  OMX_VERSIONTYPE nVersion;
+	  OMX_U32 nPortIndex;
+	  OMX_U32 nNewBitPool; 
+} OMX_AUDIO_CONFIG_SBCBITPOOLTYPE;
+
+/** End of SBC codec related **/
+
 /** iLBC related **/
 typedef struct OMX_AUDIO_PARAM_ILBCTYPE  { 
      OMX_U32 nSize;                                    
@@ -216,9 +123,6 @@
 
 /** End of G711 related **/
 
-
-/** End of Dummy component **/
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
--- a/Audio Signal Processing/audio_render_chipset_api.h	Fri Oct 02 14:41:46 2009 +0100
+++ b/Audio Signal Processing/audio_render_chipset_api.h	Sat Oct 10 12:43:55 2009 +0100
@@ -13,8 +13,7 @@
   Nokia Corporation - initial contribution.
 
   Contributors:
-*/
-
+*/
 #ifndef AUDIO_RENDER_CHIPSET_API_H
 #define AUDIO_RENDER_CHIPSET_API_H
 
@@ -68,6 +67,11 @@
 OMX_AUDIO_3DOutputMax	/*Allowance for expansion in the number of positional 3D audio types */
 } OMX_AUDIO_3DOUTPUTTYPE;
 
+typedef enum OMX_AUDIO_ROLLOFFMODEL {
+OMX_AUDIO_RollOffExponential,	/*Positional 3D audio for headphones */
+OMX_AUDIO_RollOffLinear	/*Positional 3D audio for two closely spaced loudspeakers */
+} OMX_AUDIO_ROLLOFFMODEL;
+
 typedef struct OMX_AUDIO_CONFIG_3DOUTPUTTYPE {
     OMX_U32 nSize;
     OMX_VERSIONTYPE nVersion;
@@ -91,7 +95,7 @@
     OMX_BOOL bEnabled;
 } OMX_AUDIO_PARAM_3DDOPPLERMODETYPE;
 
-typedef struct OMX_AUDIO_CONFIG_3DDIRECTIVITYSETTINGSTYPE {
+typedef struct OMX_AUDIO_CONFIG_3DDOPPLERSETTINGSTYPE {
     OMX_U32 nSize;
     OMX_VERSIONTYPE nVersion;
     OMX_U32 nPortIndex;
@@ -104,8 +108,8 @@
     OMX_U32 nSize;
     OMX_VERSIONTYPE nVersion;
     OMX_U32 nPortIndex;
-    OMX_BS16 sDirectLevel;
-    OMX_BS16 sRoomLevel;
+    OMX_BS32 sDirectLevel;
+    OMX_BS32 sRoomLevel;
 } OMX_AUDIO_CONFIG_3DLEVELSTYPE;
 
 typedef struct OMX_AUDIO_CONFIG_3DDISTANCEATTENUATIONTYPE {
@@ -114,8 +118,8 @@
     OMX_U32 nPortIndex;
     OMX_BS32 sMinDistance;
     OMX_BS32 sMaxDistance;
-    OMX_BS16 sRollOffFactor;
-    OMX_BS16 sRoomRollOffFactor;
+    OMX_BS32 sRollOffFactor;
+    OMX_BS32 sRoomRollOffFactor;
     OMX_AUDIO_ROLLOFFMODEL eRollOffModel;
     OMX_BOOL bMuteAfterMax;
 } OMX_AUDIO_CONFIG_3DDISTANCEATTENUATIONTYPE;
@@ -126,7 +130,7 @@
     OMX_U32 nPortIndex;
     OMX_BS32 sInnerAngle;
     OMX_BS32 sOuterAngle;
-    OMX_BS16 sOuterLevel;
+    OMX_BS32 sOuterLevel;
 } OMX_AUDIO_CONFIG_3DDIRECTIVITYSETTINGSTYPE;
 
 typedef struct OMX_AUDIO_CONFIG_3DDIRECTIVITYORIENTATIONTYPE {
@@ -198,12 +202,6 @@
 OMX_U32 nListeningAngle;
  } OMX_AUDIO_CONFIG_VIRTUALIZERLOUDSPEAKERTYPE;
 
-typedef struct OMX_AUDIO_CONFIG_VIRTUALIZERUPMIXTYPE {
-OMX_U32 nSize;
-OMX_VERSIONTYPE nVersion;
-OMX_U32 nPortIndex;
-OMX_BOOL bEnable;
-} OMX_AUDIO_CONFIG_VIRTUALIZERUPMIXTYPE;
 
 /* End of audio virtualizer related params */
 
@@ -241,31 +239,6 @@
 } OMX_AUDIO_CONFIG_VISUALIZATIONWAVEFORMTYPE;
 
 
-typedef struct OMX_AUDIO_CONFIG_DOWNMIXERTYPE {
-OMX_U32 nSize;
-OMX_VERSIONTYPE nVersion;
-OMX_U32 nPortIndex;
-OMX_BOOL bEnable;
-} OMX_AUDIO_CONFIG_DOWNMIXERTYPE;
-
-
-typedef enum OMX_OTHER_FORMATTYPE {
-    OMX_OTHER_FormatTime = 0, /**< Transmission of various timestamps, elapsed time, 
-                                   time deltas, etc */
-    OMX_OTHER_FormatPower,    /**< Perhaps used for enabling/disabling power 
-                                   management, setting clocks? */
-    OMX_OTHER_FormatStats,    /**< Could be things such as frame rate, frames 
-                                   dropped, etc */
-    OMX_OTHER_FormatBinary,   /**< Arbitrary binary data */
-    OMX_OTHER_FormatVendorReserved = 1000, /**< Starting value for vendor specific 
-                                                formats */
-    OMX_OTHER_FormatNokiaSpectral,
-    OMX_OTHER_FormatMax = 0x7FFFFFFF
-} OMX_OTHER_FORMATTYPE;
-
-
-
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
--- a/Audio Signal Processing/audio_sourcesink_chipset_api.h	Fri Oct 02 14:41:46 2009 +0100
+++ b/Audio Signal Processing/audio_sourcesink_chipset_api.h	Sat Oct 10 12:43:55 2009 +0100
@@ -13,8 +13,7 @@
   Nokia Corporation - initial contribution.
 
   Contributors:
-*/
-
+*/
 #ifndef AUDIO_SOURCESINK_CHIPSET_API_H
 #define AUDIO_SOURCESINK_CHIPSET_API_H
 
@@ -31,16 +30,10 @@
 #include <OMX_Audio.h>
 
 /* Including audio_hw_control_chipset_api_v0_1.h */
-#include "audio_hw_control_chipset_api_v0_1.h"
+/*#include "audio_hw_control_chipset_api_v0_1.h"*/
 
-typedef struct OMX_AUDIO_PARAM_SIDETONEYPE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_U32 nPortIndex;
-    OMX_S32 nAttenuation;
-    OMX_S32 nGain;
-   } OMX_AUDIO_PARAM_SIDETONETYPE;
-
+typedef OMX_AUDIO_CONFIG_VOLUMETYPE OMX_AUDIO_CONFIG_SIDETONEATTENUATIONTYPE;
+typedef OMX_AUDIO_CONFIG_VOLUMETYPE OMX_AUDIO_CONFIG_SIDETONEGAINTYPE;
 
 /* HDMI related configuration structure */
 typedef struct OMX_AUDIO_PARAM_HDMITYPE {
@@ -52,23 +45,36 @@
     OMX_U32 nQFormat;
 } OMX_AUDIO_PARAM_HDMITYPE;
 
-typedef struct OMX_AUDIO_CONFIG_TONEGENERATORTYPE {
-		OMX_U32 nSize;
-		OMX_VERSIONTYPE nVersion;
-		OMX_U32 nPortIndex;
-		OMX_BOOL bEnabled;
-		OMX_TONEGENTONETYPE eTonetype;
-		OMX_U32 nFrequency[2];
-		OMX_U32 nDigit;
-} OMX_AUDIO_CONFIG_TONEGENERATORTYPE
 
 /* Enumerations */
 typedef enum OMX_TONEGENTONETYPE { 
-    OMX_TONEGEN_NormalTone,  /**< Normal Tone */ 
-    OMX_TONEGEN_DtmfTone,    /**< DTMF Tone */ 
+    OMX_TONEGEN_NormalTone,  /**Normal Tone */ 
+    OMX_TONEGEN_DtmfTone,    /**DTMF Tone */ 
   } OMX_TONEGENTONETYPE; 
 
-      
+    
+typedef struct OMX_AUDIO_CONFIG_TONEGENERATORTYPE {
+	OMX_U32 nSize;
+	OMX_VERSIONTYPE nVersion;
+	OMX_U32 nPortIndex;
+	OMX_BOOL bEnable;
+	OMX_TONEGENTONETYPE eTonetype;
+	OMX_U32 nFrequency[2];
+	OMX_U32 nDigit;
+} OMX_AUDIO_CONFIG_TONEGENERATORTYPE;
+
+/* Click Removal algorithm parameters */
+
+typedef struct OMX_AUDIO_CONFIG_CLICKREMOVALTYPE {
+   	OMX_U32 nSize;
+   	OMX_VERSIONTYPE nVersion;
+   	OMX_U32 nPortIndex;
+   	OMX_BOOL bEnable;
+	OMX_BU32 sClickControl;
+} OMX_AUDIO_CONFIG_CLICKREMOVALTYPE;
+
+/* End of click removal params */
+
 
 #ifdef __cplusplus
 }
--- a/Audio Signal Processing/audio_transducer_chipset_api.h	Fri Oct 02 14:41:46 2009 +0100
+++ b/Audio Signal Processing/audio_transducer_chipset_api.h	Sat Oct 10 12:43:55 2009 +0100
@@ -13,8 +13,7 @@
   Nokia Corporation - initial contribution.
 
   Contributors:
-*/
-
+*/
 #ifndef AUDIO_TRANSDUCER_CHIPSET_API_H
 #define AUDIO_TRANSDUCER_CHIPSET_API_H
 
@@ -56,6 +55,7 @@
      OMX_U32 nSize;
      OMX_VERSIONTYPE nVersion;  
      OMX_U32 nPortIndex;
+     OMX_U32 nChannel;
      OMX_BU32 sBandIndex ; 
      OMX_AUDIO_FILTERTYPE eFilterType;
      OMX_U32 nFilterCenterCutoffFrequency;
@@ -68,7 +68,8 @@
      OMX_U32 nSize;
      OMX_VERSIONTYPE nVersion;  
      OMX_U32 nPortIndex;
-     OMX_u32 nFrequencyPoints; 
+     OMX_U32 nChannel;
+     OMX_U32 nFrequencyPoints; 
      OMX_S32 nFrequencies[MAX_FIRRESPONSE_POINTS];
      OMX_S32 nGains[MAX_FIRRESPONSE_POINTS];
 } OMX_AUDIO_CONFIG_FIR_RESPONSE;
@@ -94,6 +95,7 @@
     OMX_U32 nSize;
     OMX_VERSIONTYPE nVersion;
     OMX_U32 nPortIndex;
+    OMX_U32 nChannel;	
     OMX_BOOL bEnable;
     OMX_BU32 sBandIndex;
     OMX_BU32 sBandRange;
@@ -122,7 +124,7 @@
 OMX_AUDIO_SPLLimitation,	
 OMX_AUDIO_SPLNormalization,	
 OMX_AUDIO_SPLMax,
-} OMX_AUDIO_OMX_AUDIO_SPLLIMITTYPE;
+} OMX_AUDIO_SPLLIMITTYPE;
 
 
 typedef struct OMX_AUDIO_CONFIG_SPLLIMITTYPE {
@@ -136,16 +138,6 @@
 } OMX_AUDIO_CONFIG_SPLLIMITTYPE;
 /* End of transducer SPL limit params */
 
-/* Click Removal algorithm parameters */
-
-typedef struct OMX_AUDIO_CONFIG_CLICKREMOVALTYPE {
-   	OMX_U32 nSize;
-   	OMX_VERSIONTYPE nVersion;
-   	OMX_U32 nPortIndex;
-   	OMX_BOOL bEnable;
-		OMX_BU16 sClickControl;
-} OMX_AUDIO_CONFIG_CLICKREMOVALTYPE;
-/* End of click removal params */
 
 /* Earpiece Active Noise Control */