--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omxil/.cproject	Fri May 07 16:25:23 2010 +0100
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?>
+
+<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+<storageModule buildFromInf="true" buildingTestComps="true" cleanLevel="0" concurrentBuildJobs="4" defaultMMPChangedAction="0" extraSBSv2Args="" infBuildComponents="" infFileLocation="omxilrefcomps\ref_components\audio\adpcmcodec\group\bld.inf" macrosFile="" makeEngineToUse="make" manageDependencies="true" moduleId="com.nokia.carbide.cdt.builder.carbideCPPBuilder" overrideMakeEngine="false" overrideWorkspaceSettings="false" promptForMMPChangedAction="true" useConcurrentBuilding="true" useDebugMode="false" useIncrementalBuilder="false" useKeepGoing="false" useMMPMacros="true"/>
+<storageModule moduleId="org.eclipse.cdt.core.settings">
+<cconfiguration id="Emulator Debug (WINSCW) [com.ncp.DriveV]">
+<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Emulator Debug (WINSCW) [com.ncp.DriveV]" moduleId="org.eclipse.cdt.core.settings" name="Emulator Debug (WINSCW) [com.ncp.DriveV]">
+<externalSettings/>
+<extensions>
+<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="com.nokia.cdt.debug.cw.symbian.SymbianE32" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="com.nokia.carbide.cdt.builder.MakmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="com.nokia.carbide.cdt.builder.CarbideMakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="com.nokia.carbide.cdt.builder.SBSv2ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="com.nokia.carbide.cdt.builder.MWLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="com.nokia.carbide.cdt.builder.RCOMPErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="com.nokia.carbide.cdt.builder.MWCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="com.nokia.carbide.cdt.builder.MakeDefErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+</extensions>
+</storageModule>
+<storageModule moduleId="CarbideConfigurationDataProvider">
+<ENV_VAR_DATA_ID/>
+<ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>
+<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="V:\epoc32\rom\"/>
+</storageModule>
+<storageModule filesCache="" includesCache="" macrosCache="_UNICODE;__SYMBIAN32__;__SUPPORT_CPP_EXCEPTIONS__;__CW32__;__WINS__;__WINSCW__;_DEBUG;" moduleId="configDataCache" sourcesCache="/omxil/omxilcomponentcommon/src/common;/omxil/omxilrefcomps/ref_components/audio/adpcmcodec/inc;/omxil/omxilrefcomps/ref_components/audio/adpcmcodec/src/common;/omxil/omxilrefcomps/ref_components/audio/adpcmcodec/src/decoder;/omxil/omxilrefcomps/ref_components/audio/adpcmcodec/src/encoder;/omxil/omxilrefcomps/ref_components/audio/common;" timestampCache="1272369116673" useMmpMacrosCache="true"/>
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+</cconfiguration>
+<cconfiguration id="Phone Release (ARMV5) [com.ncp.DriveV]">
+<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Phone Release (ARMV5) [com.ncp.DriveV]" moduleId="org.eclipse.cdt.core.settings" name="Phone Release (ARMV5) [com.ncp.DriveV]">
+<externalSettings/>
+<extensions>
+<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="com.nokia.cdt.debug.cw.symbian.SymbianE32" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="com.nokia.carbide.cdt.builder.MakmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="com.nokia.carbide.cdt.builder.RVCTLinkerErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="com.nokia.carbide.cdt.builder.CarbideMakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="com.nokia.carbide.cdt.builder.SBSv2ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="com.nokia.carbide.cdt.builder.Elf2E32ErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="com.nokia.carbide.cdt.builder.RCOMPErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="com.nokia.carbide.cdt.builder.MakeDefErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="com.nokia.carbide.cdt.builder.RVCTCompilerErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+</extensions>
+</storageModule>
+<storageModule moduleId="CarbideConfigurationDataProvider">
+<ENV_VAR_DATA_ID/>
+<ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>
+<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="V:\epoc32\rom\"/>
+</storageModule>
+<storageModule filesCache="" includesCache="" macrosCache="_UNICODE;__SYMBIAN32__;__ARMCC_2_2__;__SUPPORT_CPP_EXCEPTIONS__;__MARM__;__ARMCC_2__;NDEBUG;__MARM_ARMV5__;__GENERIC_MARM__;__EPOC32__;__ARMCC__;__EABI__;" moduleId="configDataCache" sourcesCache="/omxil/omxilcomponentcommon/src/common;/omxil/omxilrefcomps/ref_components/audio/adpcmcodec/inc;/omxil/omxilrefcomps/ref_components/audio/adpcmcodec/src/common;/omxil/omxilrefcomps/ref_components/audio/adpcmcodec/src/decoder;/omxil/omxilrefcomps/ref_components/audio/adpcmcodec/src/encoder;/omxil/omxilrefcomps/ref_components/audio/common;" timestampCache="1272369116689" useMmpMacrosCache="true"/>
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+</cconfiguration>
+</storageModule>
+</cproject>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omxil/.project	Fri May 07 16:25:23 2010 +0100
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>omxil</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.nokia.carbide.cdt.builder.carbideCPPBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>com.nokia.carbide.cdt.builder.carbideCPPBuilderNature</nature>
+		<nature>com.nokia.carbide.cdt.builder.carbideSBSv2BuilderNature</nature>
+	</natures>
+</projectDescription>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omxil/audio/group/bld.inf	Fri May 07 16:25:23 2010 +0100
@@ -0,0 +1,1 @@
+#include "../mcar_symbian_il_components/adpcmcodec/group/bld.inf"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omxil/audio/mcar_symbian_il_components/adpcmcodec/group/bld.inf	Fri May 07 16:25:23 2010 +0100
@@ -0,0 +1,22 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+PRJ_MMPFILES
+// Components
+../mmpfiles/omxiladpcmdecoder.mmp
+../mmpfiles/omxiladpcmencoder.mmp

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omxil/audio/mcar_symbian_il_components/adpcmcodec/inc/omxilsymbianadpcmdecoderextensions.h	Fri May 07 16:25:23 2010 +0100
@@ -0,0 +1,65 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+/**
+   @file
+   @internalComponent
+*/
+
+#ifndef OMXILSYMBIANADPCMDECODEREXTENSIONS_H
+#define OMXILSYMBIANADPCMDECODEREXTENSIONS_H
+
+#include <openmax/il/khronos/v1_x/OMX_Types.h>
+
+/**
+ * Current version of the AdPcm decoder config.
+ */
+const OMX_VERSIONTYPE KAdPcmDecoderConfigVersion = { 1, 0, 0, 0 };
+
+/**
+ * Custom index used by Symbian's ADPCM Decoder to set the size of AdPcm blocks
+ * @C OMX_SYMBIAN_AUDIO_PARAM_ADPCMDECODER_SAMPLESPERBLOCK .
+ */
+#define OMX_SymbianIndexParamAudioAdPcmDecoderBlockAlign 0x7FD19E5D
+
+/**
+ * Custom OpenMAX IL structure for the AdPcm decoder.
+ * Use with ID @C OMX_SymbianIndexParamAudioAdPcmDecoderSamplesPerBlock .
+ * Sets the size of AdPcm blocks.
+ */
+struct OMX_SYMBIAN_AUDIO_PARAM_ADPCMDECODER_BLOCKALIGN
+	{
+	/**
+	 * Set to the size of this structure, in bytes.
+	 */
+	OMX_U32 nSize;
+
+	/**
+	* Set to OMX specification version information.
+	*/
+	OMX_VERSIONTYPE nVersion;
+
+	/**< Port that this structure applies to */
+	OMX_U32 nPortIndex;            
+	
+	/**
+	* Sets the size of AdPcm blocks.
+	*/
+	OMX_U32 nBlockAlign;
+	};
+#endif //OMXILSYMBIANADPCMDECODEREXTENSIONS_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omxil/audio/mcar_symbian_il_components/adpcmcodec/mmpfiles/omxiladpcmdecoder.mmp	Fri May 07 16:25:23 2010 +0100
@@ -0,0 +1,63 @@
+/*
+* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+/*
+@file
+@SYMPurpose             omxiladpcmdecoder.dll
+*/
+
+#include                "../src/decoder/omxiladpcmdecoder.hrh"
+
+
+TARGET                  omxiladpcmdecoder.dll
+CAPABILITY              ALL -TCB
+TARGETTYPE              plugin
+UID                     0x10009D8D KUidSymbianOmxILAdPcmDecoderDll
+VENDORID                0x70000001
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN 
+
+
+USERINCLUDE             ../../common
+USERINCLUDE             ../src/common
+USERINCLUDE             ../src/decoder
+USERINCLUDE             ../inc
+USERINCLUDE              ../../../../omxilcomponentcommon/src/common
+USERINCLUDE              ../../../../omxilcore/traces
+
+
+
+LIBRARY             euser.lib
+LIBRARY		    ecom.lib
+LIBRARY		    omxilcomponentcommon.lib
+STATICLIBRARY 	    omxilcomponentif.lib
+
+SOURCEPATH ../src/common
+SOURCE omxiladpcmcodecprocessingfunctioncore.cpp
+SOURCE omxiladpcmcodecport.cpp
+SOURCE OmxILPcmPortAdPcmVariant.cpp
+SOURCE omxiladpcmcodecprocessingfunction.cpp
+
+SOURCEPATH ../src/decoder 
+RESOURCE omxiladpcmdecoder.rss
+SOURCE omxiladpcmdecoder.cpp
+SOURCE omxiladpcmcodecprocessingfunctioncoreadpcmtopcm.cpp
+SOURCE omxiladpcmdecoderport.cpp
+
+SOURCEPATH ../../common
+SOURCE OmxILPcmPortBase.cpp

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omxil/audio/mcar_symbian_il_components/adpcmcodec/mmpfiles/omxiladpcmencoder.mmp	Fri May 07 16:25:23 2010 +0100
@@ -0,0 +1,62 @@
+/*
+* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+/*
+@file
+@SYMPurpose             omxiladpcmencoder.dll
+*/
+
+#include                "../src/encoder/omxiladpcmencoder.hrh"
+
+TARGET                  omxiladpcmencoder.dll
+CAPABILITY              ALL -TCB
+TARGETTYPE              plugin
+UID                     0x10009D8D KUidSymbianOmxILAdPcmEncoderDll
+VENDORID                0x70000001
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN 
+
+USERINCLUDE             ../../common/
+USERINCLUDE             ../src/common/
+USERINCLUDE             ../src/encoder/
+USERINCLUDE             ../inc
+USERINCLUDE              ../../../../omxilcomponentcommon/src/common
+USERINCLUDE              ../../../../omxilcore/traces
+
+
+
+
+
+LIBRARY             euser.lib
+LIBRARY		   		ecom.lib
+LIBRARY			    omxilcomponentcommon.lib
+STATICLIBRARY 	    omxilcomponentif.lib
+
+SOURCEPATH ../src/common
+SOURCE omxiladpcmcodecprocessingfunctioncore.cpp
+SOURCE omxiladpcmcodecport.cpp
+SOURCE OmxILPcmPortAdPcmVariant.cpp
+SOURCE omxiladpcmcodecprocessingfunction.cpp
+
+SOURCEPATH ../src/encoder
+RESOURCE omxiladpcmencoder.rss
+SOURCE omxiladpcmencoder.cpp
+SOURCE omxiladpcmcodecprocessingfunctioncorepcmtoadpcm.cpp
+
+SOURCEPATH ../../common
+SOURCE OmxILPcmPortBase.cpp

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omxil/audio/mcar_symbian_il_components/adpcmcodec/src/common/OmxILAdPcmCodecConsts.h	Fri May 07 16:25:23 2010 +0100
@@ -0,0 +1,39 @@
+/*
+* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+#ifndef OmxILAdPcmCodecConsts_H
+#define OmxILAdPcmCodecConsts_H
+#include <e32std.h>
+
+const TInt KClamp = 32768;
+const TInt KMaskSign16bit = 0x8000;
+const TInt KMaskSign8bit = 0x80;
+const TInt KAndMask8bit = 0xff;
+const TInt KMaxImaAdpcmTableEntries = 88;
+const TUint KImaAdpcmBlockAlign = 256;
+const TUint KImaAdpcmMinBlockAlign = 32;
+const TUint KImaAdpcmMaxBlockAlign = 2048;
+//samples per block = [((block align - (4 * nChannels)) * 8) / (bits per sample * nChannels)] + 1
+const TUint KImaAdpcmSamplesPerBlock = ((KImaAdpcmBlockAlign - 4)*2) + 1;	//505
+const TUint KImaAdpcmStereoSamplesPerBlock = (KImaAdpcmBlockAlign - 8) + 1; //249
+const TUint KImaAdpcmTempBufferSize = KImaAdpcmSamplesPerBlock*2;
+const TUint KImaAdpcmStereoTempBufferSize = KImaAdpcmStereoSamplesPerBlock*4;
+
+//Gsm coded Frame size
+const TInt KCodedBufferSize = 152;
+
+#endif //OmxILAdPcmCodecConsts_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omxil/audio/mcar_symbian_il_components/adpcmcodec/src/common/OmxILPcmPortAdPcmVariant.cpp	Fri May 07 16:25:23 2010 +0100
@@ -0,0 +1,86 @@
+/*
+* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+/**
+   @file
+   @internalComponent
+*/
+
+// Self
+#include "OmxILPcmPortAdPcmVariant.h"
+
+// Project (MMP)
+/* None */
+
+// Local (INF)
+#include <openmax/il/khronos/v1_x/OMX_Component.h>
+
+#include "log.h"
+#include "omxilutil.h"
+
+
+// System
+/* None */
+
+COmxILPcmPortAdPcmVariant* COmxILPcmPortAdPcmVariant::NewL(const TOmxILCommonPortData& aCommonPortData, const RArray<OMX_AUDIO_CODINGTYPE>& aSupportedAudioFormats, const OMX_AUDIO_PARAM_PCMMODETYPE& aPcmModeType)
+	{
+	DEBUG_PRINTF(_L8("COmxILPcmPortAdPcmVariant::NewL"));
+	
+	COmxILPcmPortAdPcmVariant* self = new(ELeave)COmxILPcmPortAdPcmVariant(aCommonPortData, aPcmModeType);
+	
+	CleanupStack::PushL(self);
+	self->ConstructL(aSupportedAudioFormats);
+	CleanupStack::Pop();
+	
+	return self;
+	}
+
+COmxILPcmPortAdPcmVariant::COmxILPcmPortAdPcmVariant(const TOmxILCommonPortData& aCommonPortData, const OMX_AUDIO_PARAM_PCMMODETYPE& aPcmModeType)
+	:	COmxILPcmPortBase(aCommonPortData, aPcmModeType)
+	{
+	DEBUG_PRINTF(_L8("COmxILPcmPortAdPcmVariant::COmxILPcmPortAdPcmVariant"));
+	
+	// No action
+	}
+	 
+void COmxILPcmPortAdPcmVariant::ConstructL(const RArray<OMX_AUDIO_CODINGTYPE>& aSupportedAudioFormats)
+	{
+	DEBUG_PRINTF(_L8("COmxILPcmPortAdPcmVariant::ConstructL"));
+	
+	// Call base class
+	COmxILPcmPortBase::ConstructL(aSupportedAudioFormats);
+	}
+
+COmxILPcmPortAdPcmVariant::~COmxILPcmPortAdPcmVariant()
+	{
+	DEBUG_PRINTF(_L8("COmxILPcmPortAdPcmVariant::~COmxILPcmDecoderAPB0Port"));
+	// No action
+	}
+
+TBool COmxILPcmPortAdPcmVariant::ValidatePcmModeParams(const OMX_AUDIO_PARAM_PCMMODETYPE& aPcmModeType) const
+	{
+	OMX_AUDIO_PARAM_PCMMODETYPE type = ModeType();
+	DEBUG_PRINTF(_L8("COmxILPcmPortAdPcmVariant::ValidatePcmModeParams"));
+	return (aPcmModeType.nBitPerSample == 16)
+		&& (aPcmModeType.nPortIndex == ModeType().nPortIndex)					//port number changes are not allowed
+		&& (aPcmModeType.nChannels == 1)										// only mono is supported by the core encoder/decoder functions
+		&& (aPcmModeType.eChannelMapping[0] == OMX_AUDIO_ChannelLF)
+		&& (aPcmModeType.eChannelMapping[1] == OMX_AUDIO_ChannelRF)				// interleaving is ignored since only mono is supported
+		&& (static_cast<TInt>(aPcmModeType.nSamplingRate) > 0)					// sample rate must be positive
+		;
+	}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omxil/audio/mcar_symbian_il_components/adpcmcodec/src/common/OmxILPcmPortAdPcmVariant.h	Fri May 07 16:25:23 2010 +0100
@@ -0,0 +1,57 @@
+/*
+* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+/**
+   @file
+   @internalComponent
+*/
+
+#ifndef OMXILPCMPORTADPCMVARIANT_H
+#define OMXILPCMPORTADPCMVARIANT_H
+
+#include "OmxILPcmPortBase.h"
+
+class COmxILPcmPortAdPcmVariant : public COmxILPcmPortBase
+	{
+	public:
+		/**
+		 * Constructor.
+		 * @return 	Newly created COmxILPcmPortAdPcmVariant.
+		 */
+		static COmxILPcmPortAdPcmVariant* NewL(const TOmxILCommonPortData& aCommonPortData, const RArray<OMX_AUDIO_CODINGTYPE>& aSupportedAudioFormats, const OMX_AUDIO_PARAM_PCMMODETYPE& aPcmModeType); 
+		
+		~COmxILPcmPortAdPcmVariant();
+
+
+	private:
+		COmxILPcmPortAdPcmVariant(const TOmxILCommonPortData& aCommonPortData, const OMX_AUDIO_PARAM_PCMMODETYPE& aPcmModeType);
+		
+		/**
+		 * Second stage constructor.
+		 * See @C NewL for details.
+		 */
+		void ConstructL(const RArray<OMX_AUDIO_CODINGTYPE>& aSupportedAudioFormats);
+		
+		/**
+		 * From OmxILPcmPortBase.
+		 */
+		TBool ValidatePcmModeParams(const OMX_AUDIO_PARAM_PCMMODETYPE& aPcmModeType) const;
+	};
+
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omxil/audio/mcar_symbian_il_components/adpcmcodec/src/common/omxiladpcmcodecport.cpp	Fri May 07 16:25:23 2010 +0100
@@ -0,0 +1,218 @@
+/*
+* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+/**
+   @file
+   @internalComponent
+*/
+
+#include <openmax/il/khronos/v1_x/OMX_Component.h>
+#include "log.h"
+#include "omxilutil.h"
+#include "omxiladpcmcodecport.h"
+
+
+_LIT8(KMimeTypeAudioImaAdpcm, "audio/ima.adpcm"); // There is no valid mime type
+
+COmxILAdPcmCodecPort* COmxILAdPcmCodecPort::NewL(
+			const TOmxILCommonPortData& aCommonPortData,
+			const RArray<OMX_AUDIO_CODINGTYPE>& aSupportedAudioFormats,
+			const OMX_AUDIO_PARAM_ADPCMTYPE& aPcmModeType)
+	{
+	DEBUG_PRINTF(_L8("COmxILAdPcmCodecPort::NewL"));
+
+	COmxILAdPcmCodecPort* self =
+		new(ELeave)COmxILAdPcmCodecPort(aCommonPortData, aPcmModeType);
+
+	CleanupStack::PushL(self);
+	self->ConstructL(aSupportedAudioFormats);
+	CleanupStack::Pop();
+
+	return self;
+	}
+
+
+COmxILAdPcmCodecPort::COmxILAdPcmCodecPort(const TOmxILCommonPortData& aCommonPortData,
+		 const OMX_AUDIO_PARAM_ADPCMTYPE& aPcmModeType)
+	:	COmxILAudioPort(aCommonPortData),
+		iParamAudioAdPcm(aPcmModeType)
+	{
+	DEBUG_PRINTF(_L8("COmxILAdPcmCodecPort::NewL"));	
+	}
+
+
+void COmxILAdPcmCodecPort::ConstructL(const RArray<OMX_AUDIO_CODINGTYPE>& aSupportedAudioFormats)
+	{
+	DEBUG_PRINTF(_L8("COmxILAdPcmCodecPort::ConstructL"));
+	
+	// Debug checks (release version will leave in ConstructL instead)
+	ASSERT(aSupportedAudioFormats.Count() == 1);
+	ASSERT(aSupportedAudioFormats[0] == OMX_AUDIO_CodingADPCM);
+
+	if (aSupportedAudioFormats.Count() != 1 || aSupportedAudioFormats[0] != OMX_AUDIO_CodingADPCM)
+		{
+		User::Leave(KErrNotSupported);
+		}
+
+	COmxILAudioPort::ConstructL(aSupportedAudioFormats);
+
+	// before constructL comlpetes, we must be finished with the iParamPortDefinition
+	iParamPortDefinition.eDomain = OMX_PortDomainAudio;
+
+	TUint8* mimeptr = const_cast<TUint8*>(KMimeTypeAudioImaAdpcm().Ptr());	// KMimeTypeAudioPcm is already nul-terminated since it's made from a literal C-style string
+							
+	iParamPortDefinition.format.audio.cMIMEType = reinterpret_cast<OMX_STRING>(mimeptr);
+
+	iParamPortDefinition.format.audio.bFlagErrorConcealment = OMX_FALSE;
+	iParamPortDefinition.format.audio.eEncoding = OMX_AUDIO_CodingADPCM;
+	}
+
+
+COmxILAdPcmCodecPort::~COmxILAdPcmCodecPort()
+	{
+	DEBUG_PRINTF(_L8("COmxILAdPcmCodecPort::~COmxILAdPcmDecoderAPB0Port"));
+	// nothing to do
+	}
+
+OMX_ERRORTYPE COmxILAdPcmCodecPort::GetLocalOmxParamIndexes(RArray<TUint>& aIndexArray) const
+	{
+    DEBUG_PRINTF(_L8("COmxILAdPcmCodecPort::GetLocalOmxParamIndexes"));
+
+	// Always collect param indexes from parent
+	OMX_ERRORTYPE omxRetValue = COmxILAudioPort::GetLocalOmxParamIndexes(aIndexArray);
+	if (OMX_ErrorNone != omxRetValue)
+		{
+		return omxRetValue;
+		}
+
+	TInt err = aIndexArray.InsertInOrder(OMX_IndexParamAudioAdpcm);
+	if (KErrNone != err && KErrAlreadyExists != err)	// Note that index duplication is OK.
+		{
+		return OMX_ErrorInsufficientResources;
+		}
+
+	return OMX_ErrorNone;
+	}
+
+OMX_ERRORTYPE COmxILAdPcmCodecPort::GetLocalOmxConfigIndexes(RArray<TUint>& aIndexArray) const
+	{
+    DEBUG_PRINTF(_L8("COmxILAdPcmDecoderAPB0Port::GetLocalOmxConfigIndexes"));
+    return COmxILAudioPort::GetLocalOmxConfigIndexes(aIndexArray);
+	}
+
+OMX_ERRORTYPE COmxILAdPcmCodecPort::GetParameter(OMX_INDEXTYPE aParamIndex, TAny* apComponentParameterStructure) const
+	{
+    DEBUG_PRINTF(_L8("COmxILAdPcmCodecPort::GetParameter"));
+
+    // we only have OMX_IndexParamAudioAdpcm - pass all other requests to our parent
+    if (aParamIndex!=OMX_IndexParamAudioAdpcm)
+		{
+		return COmxILAudioPort::GetParameter(aParamIndex, apComponentParameterStructure);
+		}
+
+    OMX_ERRORTYPE err = TOmxILUtil::CheckOmxStructSizeAndVersion( apComponentParameterStructure, sizeof iParamAudioAdPcm );
+    if (err==OMX_ErrorNone)
+    	{
+    	// export our PCM mode settings
+    	OMX_AUDIO_PARAM_ADPCMTYPE* const pcmmode = static_cast<OMX_AUDIO_PARAM_ADPCMTYPE*>(apComponentParameterStructure);
+    	*pcmmode = iParamAudioAdPcm;
+    	}
+
+	return err;
+	}
+
+
+OMX_ERRORTYPE COmxILAdPcmCodecPort::SetParameter(OMX_INDEXTYPE aParamIndex, const TAny* apComponentParameterStructure, TBool& aUpdateProcessingFunction)
+	{
+    DEBUG_PRINTF(_L8("COmxILAdPcmCodecPort::SetParameter"));
+
+    // we only have OMX_IndexParamAudioAdpcm - pass all other requests to our parent
+    if (aParamIndex!=OMX_IndexParamAudioAdpcm)
+		{
+		return COmxILAudioPort::SetParameter(aParamIndex, apComponentParameterStructure, aUpdateProcessingFunction);
+		}
+
+    OMX_ERRORTYPE err = TOmxILUtil::CheckOmxStructSizeAndVersion( const_cast<TAny*>(apComponentParameterStructure), sizeof iParamAudioAdPcm );
+    if (err!=OMX_ErrorNone)
+    	{
+    	return err;
+    	}
+
+    // get and sanity check the new settings
+	const OMX_AUDIO_PARAM_ADPCMTYPE* pcmmode = static_cast<const OMX_AUDIO_PARAM_ADPCMTYPE*>(apComponentParameterStructure);
+	if (!CheckPcmModeParamsAreSane(*pcmmode))
+		{
+		return OMX_ErrorBadParameter;
+		}
+
+	// preserve the new settings and update the processing function
+	iParamAudioAdPcm = *pcmmode;
+	aUpdateProcessingFunction = EFalse;//no need to update processing function as we handle ALL changes for AdPcm here
+
+	return OMX_ErrorNone;
+	}
+
+
+OMX_ERRORTYPE COmxILAdPcmCodecPort::SetFormatInPortDefinition(const OMX_PARAM_PORTDEFINITIONTYPE& aPortDefinition, TBool& aUpdateProcessingFunction)
+	{
+	DEBUG_PRINTF(_L8("COmxILAdPcmCodecPort::SetFormatInPortDefinition"));
+
+	// Currently not changing cMIMEType type of this port
+	// Same thing for pNativeRender and eEncoding
+	iParamPortDefinition.format.audio.bFlagErrorConcealment = aPortDefinition.format.audio.bFlagErrorConcealment;
+
+	// Error concealment not currently needed at the processing function
+	aUpdateProcessingFunction = EFalse;
+
+	return OMX_ErrorNone;
+	}
+
+TBool COmxILAdPcmCodecPort::IsTunnelledPortCompatible( const OMX_PARAM_PORTDEFINITIONTYPE& /*aPortDefinition*/) const
+	{
+	return ETrue;
+	//TODO: Restore proper port compatibility chek
+	/*
+	DEBUG_PRINTF(_L8("COmxILAdPcmCodecPort::IsTunnelledPortCompatible"));
+
+	if(aPortDefinition.eDomain != iParamPortDefinition.eDomain
+		|| aPortDefinition.format.audio.eEncoding != iParamPortDefinition.format.audio.eEncoding)
+		{
+		return EFalse;
+		}
+
+	// check that the MIME types match
+	TPtrC8 tunnelMimeType( reinterpret_cast<TUint8* const>(aPortDefinition.format.audio.cMIMEType), User::StringLength(reinterpret_cast<TUint8* const>(aPortDefinition.format.audio.cMIMEType)) );
+	TPtrC8 myMimeType( reinterpret_cast<TUint8* const>(iParamPortDefinition.format.audio.cMIMEType), User::StringLength(reinterpret_cast<TUint8* const>(iParamPortDefinition.format.audio.cMIMEType)) );
+
+	if (tunnelMimeType != myMimeType)
+		{
+		return EFalse;
+		}
+	
+	return ETrue;
+	*/
+	}
+
+
+TBool COmxILAdPcmCodecPort::CheckPcmModeParamsAreSane(const OMX_AUDIO_PARAM_ADPCMTYPE& aPcmModeType) const
+	{
+	return (aPcmModeType.nBitsPerSample == 4)
+		&& (aPcmModeType.nPortIndex == iParamAudioAdPcm.nPortIndex)//port number changes are not allowed
+		&& (aPcmModeType.nChannels == 1 || aPcmModeType.nChannels == 2)
+		;
+	}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omxil/audio/mcar_symbian_il_components/adpcmcodec/src/common/omxiladpcmcodecport.h	Fri May 07 16:25:23 2010 +0100
@@ -0,0 +1,70 @@
+/*
+* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+/**
+   @file
+   @internalComponent
+*/
+
+
+#ifndef OMXILADPCMCODECPORT_H
+#define OMXILADPCMCODECPORT_H
+#include "omxilaudioport.h"
+
+class COmxILAdPcmCodecPort : public COmxILAudioPort
+	{
+public:
+	static COmxILAdPcmCodecPort* NewL(const TOmxILCommonPortData& aCommonPortData,
+			 const RArray<OMX_AUDIO_CODINGTYPE>& aSupportedAudioFormats,
+			 const OMX_AUDIO_PARAM_ADPCMTYPE& aPcmModeType);
+
+	~COmxILAdPcmCodecPort();
+
+	// From COmxILPort
+	OMX_ERRORTYPE GetLocalOmxParamIndexes(RArray<TUint>& aIndexArray) const;
+	OMX_ERRORTYPE GetLocalOmxConfigIndexes(RArray<TUint>& aIndexArray) const;
+	OMX_ERRORTYPE GetParameter(OMX_INDEXTYPE aParamIndex,
+							   TAny* apComponentParameterStructure) const;
+	OMX_ERRORTYPE SetParameter(OMX_INDEXTYPE aParamIndex,
+							   const TAny* apComponentParameterStructure,
+							   TBool& aUpdateProcessingFunction);
+
+	inline const OMX_AUDIO_PARAM_ADPCMTYPE& ModeType() const;
+
+protected:
+	COmxILAdPcmCodecPort(const TOmxILCommonPortData& aCommonPortData,
+			 const OMX_AUDIO_PARAM_ADPCMTYPE& aPcmModeType);
+	
+	void ConstructL(const RArray<OMX_AUDIO_CODINGTYPE>& aSupportedAudioFormats);
+
+private:
+	// From COmxILPort
+	OMX_ERRORTYPE SetFormatInPortDefinition(
+		const OMX_PARAM_PORTDEFINITIONTYPE& aPortDefinition,
+		TBool& aUpdateProcessingFunction);
+	TBool IsTunnelledPortCompatible(
+		const OMX_PARAM_PORTDEFINITIONTYPE& aPortDefinition) const;
+
+	TBool CheckPcmModeParamsAreSane(const OMX_AUDIO_PARAM_ADPCMTYPE& aPcmModeType) const;
+
+private:
+	OMX_AUDIO_PARAM_ADPCMTYPE iParamAudioAdPcm;
+	};
+
+#include "omxiladpcmcodecport.inl"
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omxil/audio/mcar_symbian_il_components/adpcmcodec/src/common/omxiladpcmcodecport.inl	Fri May 07 16:25:23 2010 +0100
@@ -0,0 +1,27 @@
+/*
+* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+/**
+   @file
+   @internalComponent
+*/
+
+const OMX_AUDIO_PARAM_ADPCMTYPE& COmxILAdPcmCodecPort::ModeType() const
+	{
+	return iParamAudioAdPcm;
+	}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omxil/audio/mcar_symbian_il_components/adpcmcodec/src/common/omxiladpcmcodecprocessingfunction.cpp	Fri May 07 16:25:23 2010 +0100
@@ -0,0 +1,333 @@
+/*
+* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+/**
+   @file
+   @internalComponent
+*/
+
+#include "omxiladpcmcodecprocessingfunction.h"
+#include "OmxILAdPcmCodecConsts.h"
+#include "omxilsymbianadpcmdecoderextensions.h"
+#include "omxilcallbacknotificationif.h"
+#include "log.h"
+
+COmxILAdPcmCodecProcessingFunction* COmxILAdPcmCodecProcessingFunction::NewL(COmxILAdPcmCodecProcessingFunctionCore* aCore, MOmxILCallbackNotificationIf& aCallbacks)
+	{
+	COmxILAdPcmCodecProcessingFunction* self = new(ELeave)COmxILAdPcmCodecProcessingFunction(aCore, aCallbacks);
+	CleanupStack::PushL(self);
+	self->ConstructL();
+	CleanupStack::Pop(self);
+
+	return self;
+	}
+
+COmxILAdPcmCodecProcessingFunction::COmxILAdPcmCodecProcessingFunction(COmxILAdPcmCodecProcessingFunctionCore* aCore, MOmxILCallbackNotificationIf& aCallbacks)
+	: COmxILProcessingFunction(aCallbacks)
+	, iCore( aCore )
+	{
+	iCore->SetObserver( this );
+	}
+
+void COmxILAdPcmCodecProcessingFunction::ConstructL()
+	{
+	
+	}
+
+COmxILAdPcmCodecProcessingFunction::~COmxILAdPcmCodecProcessingFunction()
+	{
+	//we do not own iCore;
+
+	iBuffersToEmpty.Reset();//we don't own the buffers
+	iBuffersToFill.Reset();//we don't own the buffers
+	}
+
+
+OMX_ERRORTYPE COmxILAdPcmCodecProcessingFunction::StateTransitionIndication(COmxILFsm::TStateIndex aNewState)
+	{
+	OMX_ERRORTYPE err = OMX_ErrorNone;
+
+	switch(aNewState)
+		{
+		case COmxILFsm::EStateIdle:
+			{
+			iCore->Reset();
+			//
+			TInt symerr = iCore->CheckConversion();
+			if (symerr == KErrNone )
+				{
+				symerr = iCore->Configure();
+				}
+			if (symerr == KErrNotSupported)
+				{
+				err = OMX_ErrorUnsupportedSetting;
+				}
+			else if(symerr!=KErrNone) 
+				{
+				err = OMX_ErrorUndefined;
+				}
+			
+			}
+			break;
+
+		case COmxILFsm::EStateExecuting:
+			iCore->Start();
+			break;
+
+		case COmxILFsm::EStateInvalid:
+		case COmxILFsm::EStateLoaded:
+		case COmxILFsm::EStateWaitForResources:
+			iCore->Reset();
+			break;
+
+		case COmxILFsm::EStatePause:
+			iCore->Stop();
+			break;
+
+		case COmxILFsm::ESubStateLoadedToIdle:
+		case COmxILFsm::ESubStateIdleToLoaded://Deinitalization
+		case COmxILFsm::ESubStateExecutingToIdle:
+		case COmxILFsm::ESubStatePauseToIdle:
+			// do nothing
+			break;
+		}
+
+	iState = aNewState;
+	return err;
+	}
+
+OMX_ERRORTYPE COmxILAdPcmCodecProcessingFunction::BufferFlushingIndication(TUint32 aPortIndex, OMX_DIRTYPE aDirection)
+	{
+	TBool portflushed = EFalse;
+
+	// flush the input buffers if requested
+	if ((aPortIndex == OMX_ALL && aDirection == OMX_DirMax) ||
+			(aPortIndex == 0 && aDirection == OMX_DirInput))
+		{
+		// reset the core to release any in use buffers
+		iCore->Reset();
+
+		// send notification for each input buffer
+		for (TInt i=0; i<iBuffersToEmpty.Count(); i++)
+			{
+			iCallbacks.BufferDoneNotification(iBuffersToEmpty[i], 0, OMX_DirInput);
+			}
+
+		// release the buffers
+		iBuffersToEmpty.Reset();
+
+		portflushed = ETrue;
+		}
+
+	// flush the output buffers if requested
+	if ((aPortIndex == OMX_ALL && aDirection == OMX_DirMax) ||
+			(aPortIndex == 1 && aDirection == OMX_DirOutput))
+		{
+		// reset the core to release any in use buffers
+		iCore->Reset();
+
+		// send notification for each input buffer
+		for (TInt i=0; i<iBuffersToFill.Count(); i++)
+			{
+			iCallbacks.BufferDoneNotification(iBuffersToFill[i], 1, OMX_DirOutput);
+			}
+
+		// release the buffers
+		iBuffersToFill.Reset();
+
+		portflushed = ETrue;
+		}
+
+	// Check we flushed any port
+	if (!portflushed)
+		return OMX_ErrorUndefined;
+
+	return OMX_ErrorNone;
+	}
+
+OMX_ERRORTYPE COmxILAdPcmCodecProcessingFunction::ParamIndication(OMX_INDEXTYPE aParamIndex, const TAny* apComponentParameterStructure)
+	{
+	OMX_ERRORTYPE err = OMX_ErrorNone;
+
+	switch(aParamIndex)
+        {
+        case OMX_SymbianIndexParamAudioAdPcmDecoderBlockAlign:
+            {
+            const OMX_SYMBIAN_AUDIO_PARAM_ADPCMDECODER_BLOCKALIGN* pAdPcmDecoderParam
+                = static_cast<const OMX_SYMBIAN_AUDIO_PARAM_ADPCMDECODER_BLOCKALIGN*>(
+                apComponentParameterStructure);
+
+            err = iCore->SetBlockAlign(pAdPcmDecoderParam->nBlockAlign);
+            }
+            break;
+
+        default:
+            // ignore
+            break;
+        }
+
+    return err;
+	}
+
+OMX_ERRORTYPE COmxILAdPcmCodecProcessingFunction::ConfigIndication(OMX_INDEXTYPE /*aConfigIndex*/, const TAny* /*apComponentConfigStructure*/)
+	{
+    // no configs are processable for this codec...
+    return OMX_ErrorUnsupportedSetting;
+
+	}
+
+OMX_ERRORTYPE COmxILAdPcmCodecProcessingFunction::BufferIndication(OMX_BUFFERHEADERTYPE* apBufferHeader, OMX_DIRTYPE aDirection)
+	{
+	if (!apBufferHeader)
+		{
+		return OMX_ErrorBadParameter;
+		}
+	
+	OMX_ERRORTYPE err = OMX_ErrorNone;
+	if (aDirection == OMX_DirInput)
+		{
+		//Buffers must be a multiple of block align. Artifact of CMMFImaAdpcmToPcm16Codec::CheckPreconditions
+		//EXECEPT for the last buffer when we will just throw away extra data 
+		TBool lastBuffer = apBufferHeader->nFlags & OMX_BUFFERFLAG_EOS ? ETrue : EFalse;
+		if( ( apBufferHeader->nFilledLen % iCore->BlockAlign() ) != 0)
+			{
+            if( !lastBuffer && iCore->ForgetNotAlignedInputBuffers()) //don't deal with partial input buffers (decoder) apart from the last one
+                {
+                return OMX_ErrorBadParameter;
+                }
+			}
+
+		TInt symerr = iBuffersToEmpty.Append(apBufferHeader);
+		if (symerr!=KErrNone)
+			{
+			err = OMX_ErrorInsufficientResources;
+			}
+		}
+	else if (aDirection == OMX_DirOutput)
+		{
+		
+		TInt symerr = iBuffersToFill.Append(apBufferHeader);
+		if (symerr!=KErrNone)
+			{
+			err = OMX_ErrorInsufficientResources;
+			}
+		}
+	else
+		{
+		// direction is neither input or output... bad parameter!
+		err = OMX_ErrorBadParameter;
+		}
+
+	// on success, and if we're in a running state, (re)start the core to process the buffers
+	if (err==OMX_ErrorNone && (iBuffersToEmpty.Count()>0 || iBuffersToFill.Count()>0) && iState==OMX_StateExecuting)
+		{
+		iCore->Start();
+		}
+
+	return err;
+	}
+
+OMX_BOOL COmxILAdPcmCodecProcessingFunction::BufferRemovalIndication(OMX_BUFFERHEADERTYPE* apBufferHeader, OMX_DIRTYPE aDirection)
+	{
+	OMX_BOOL headerreleased = OMX_FALSE;
+
+	// select which buffer array to process based on direction
+	RPointerArray<OMX_BUFFERHEADERTYPE>* bufarray = NULL;
+	if (aDirection==OMX_DirInput)
+		{
+		bufarray = &iBuffersToEmpty;
+		}
+	else if (aDirection==OMX_DirOutput)
+		{
+		bufarray = &iBuffersToFill;
+		}
+
+
+	// find the buffer in the array
+	TInt pos = bufarray->Find(apBufferHeader);
+	if (pos!=KErrNotFound)
+		{
+		// if this buffer is at the head of the array, and the core is active, then the core may be using it...
+		// in this case we want to reset the core (to stop it using the buffer), release the buffer, and then restart the core
+		TBool bufinuse = (pos==0 && iCore->IsRunning());
+		if (bufinuse)
+			{
+			iCore->Reset();
+			}
+
+		// remove the buffer
+		bufarray->Remove(pos);
+		headerreleased = OMX_TRUE;
+
+		// if the core was reset, restart it
+		if (bufinuse)
+			{
+			iCore->Start();
+			}
+		}
+
+	return headerreleased;
+	}
+
+OMX_BUFFERHEADERTYPE* COmxILAdPcmCodecProcessingFunction::NextInputBuffer()
+	{
+	return (iBuffersToEmpty.Count()>0) ? iBuffersToEmpty[0] : NULL ;
+	}
+
+OMX_BUFFERHEADERTYPE* COmxILAdPcmCodecProcessingFunction::NextOutputBuffer()
+	{
+	return (iBuffersToFill.Count()>0) ? iBuffersToFill[0] : NULL;
+	}
+
+void COmxILAdPcmCodecProcessingFunction::InputBufferConsumed(OMX_BUFFERHEADERTYPE* aBuffer)
+	{
+	ASSERT(iBuffersToEmpty.Count()>0);
+	ASSERT(iBuffersToEmpty[0]==aBuffer);
+
+	iBuffersToEmpty.Remove(0);
+
+	iCallbacks.BufferDoneNotification(aBuffer, 0, OMX_DirInput);
+	}
+
+void COmxILAdPcmCodecProcessingFunction::OutputBufferFilled(OMX_BUFFERHEADERTYPE* aBuffer, TBool aMarkWithEos)
+	{
+	DEBUG_PRINTF(_L8("COmxILPcmDecoderProcessingFunction::OutputBufferFilled"));
+
+	ASSERT(iBuffersToFill.Count()>0);
+	ASSERT(iBuffersToFill[0]==aBuffer);
+	
+	iBuffersToFill.Remove(0);
+
+	if (aMarkWithEos)
+		{
+		// Propagate the EOS flag
+		aBuffer->nFlags |= OMX_BUFFERFLAG_EOS;
+		}
+
+	OMX_U32 flags = aBuffer->nFlags;
+	iCallbacks.BufferDoneNotification(aBuffer, 1, OMX_DirOutput);
+
+	if (aMarkWithEos)
+		{
+		iCallbacks.EventNotification(
+			OMX_EventBufferFlag,
+			1,
+			flags,
+			0);
+		}
+	}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/omxil/audio/mcar_symbian_il_components/adpcmcodec/src/common/omxiladpcmcodecprocessingfunction.h	Fri May 07 16:25:23 2010 +0100
@@ -0,0 +1,66 @@
+/*
+* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+/**
+   @file
+   @internalComponent
+*/
+
+#ifndef OMXILADPCMCODECPOCESSINGFUNCTION_H
+#define OMXILADPCMCODECPOCESSINGFUNCTION_H
+
+#include <openmax/il/khronos/v1_x/OMX_Audio.h>
+#include <openmax/il/khronos/v1_x/OMX_Types.h>
+#include "omxilprocessingfunction.h"
+#include "omxiladpcmcodecprocessingfunctioncore.h"
+
+class COmxILAdPcmCodecProcessingFunction : public COmxILProcessingFunction, private MOmxILAdPcmCodecProcessingFunctionCoreContext
+	{
+public:
+	static COmxILAdPcmCodecProcessingFunction* NewL(COmxILAdPcmCodecProcessingFunctionCore* aCore, MOmxILCallbackNotificationIf& aCallbacks);
+	~COmxILAdPcmCodecProcessingFunction();
+
+	// from COmxILProcessingFunction
+	OMX_ERRORTYPE StateTransitionIndication(COmxILFsm::TStateIndex aNewState);
+	OMX_ERRORTYPE BufferFlushingIndication(TUint32 aPortIndex, OMX_DIRTYPE aDirection);
+	OMX_ERRORTYPE ParamIndication(OMX_INDEXTYPE aParamIndex, const TAny* apComponentParameterStructure);
+	OMX_ERRORTYPE ConfigIndication(OMX_INDEXTYPE aConfigIndex, const TAny* apComponentConfigStructure);
+	OMX_ERRORTYPE BufferIndication(OMX_BUFFERHEADERTYPE* apBufferHeader, OMX_DIRTYPE aDirection);
+	OMX_BOOL BufferRemovalIndication(OMX_BUFFERHEADERTYPE* apBufferHeader, OMX_DIRTYPE aDirection);
+	
+private:
+	COmxILAdPcmCodecProcessingFunction(COmxILAdPcmCodecProcessingFunctionCore* aCore, MOmxILCallbackNotificationIf& aCallbacks);
+	void ConstructL();
+
+	// from MOmxILAdPcmCodecProcessingFunctionCoreContext
+	OMX_BUFFERHEADERTYPE* NextInputBuffer();
+	OMX_BUFFERHEADERTYPE* NextOutputBuffer();
+	void InputBufferConsumed(OMX_BUFFERHEADERTYPE* aBuffer);
+	void OutputBufferFilled(OMX_BUFFERHEADERTYPE* aBuffer, TBool aMarkWithEos);
+
+
+private:
+	COmxILFsm::TStateIndex iState;
+	COmxILAdPcmCodecProcessingFunctionCore* iCore;
+
+	RPointerArray<OMX_BUFFERHEADERTYPE> iBuffersToEmpty;
+	RPointerArray<OMX_BUFFERHEADERTYPE> iBuffersToFill;
+	};
+
+
+#endif /*OMXILADPCMCODECPOCESSINGFUNCTION_H_*/