diff -r 481b3bce574a -r b6488ac24ddc omxil/omxilcomponentcommon/src/common/omxilotherport.cpp
--- a/omxil/omxilcomponentcommon/src/common/omxilotherport.cpp	Mon Aug 23 21:48:44 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,171 +0,0 @@
-// 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 "omxilotherport.h"
-#include "omxilutil.h"
-
-EXPORT_C COmxILOtherPort::COmxILOtherPort(const TOmxILCommonPortData& aCommonPortData) 
-  : COmxILPort(aCommonPortData)
-	{
-	iParamOtherPortFormat.nSize = sizeof(OMX_OTHER_PARAM_PORTFORMATTYPE);
-	iParamOtherPortFormat.nVersion = aCommonPortData.iOmxVersion;
-	iParamOtherPortFormat.nPortIndex = aCommonPortData.iPortIndex;
-	iParamOtherPortFormat.nIndex = 0;
-	}
-	
-// [YYC]: proposal for deep copy, virtual & called from derived CostructL
-EXPORT_C void COmxILOtherPort::ConstructL(const RArray<OMX_OTHER_FORMATTYPE>& aSupportedOtherFormats)
-	{
-	TUint count = aSupportedOtherFormats.Count();
-	for (TInt i = 0; i < count; i++)
-		{
-		iSupportedOtherFormats.AppendL(aSupportedOtherFormats[i]);
-		}
-	iParamOtherPortFormat.eFormat = count ? iSupportedOtherFormats[0] : OMX_OTHER_FormatMax;	
-	}
-
-EXPORT_C COmxILOtherPort::~COmxILOtherPort()
-	{
-	iSupportedOtherFormats.Close();
-	}
-
-EXPORT_C OMX_ERRORTYPE COmxILOtherPort::GetLocalOmxParamIndexes(RArray<TUint>& aIndexArray) const
-	{
-	// Always collect local indexes from parent
-	OMX_ERRORTYPE omxRetValue = COmxILPort::GetLocalOmxParamIndexes(aIndexArray);
-	if (omxRetValue != OMX_ErrorNone)
-		{
-		return omxRetValue;
-		}
-
-	TInt err = aIndexArray.InsertInOrder(OMX_IndexParamOtherPortFormat);
-	// Note that index duplication is OK
-	if (err != KErrNone && err != KErrAlreadyExists)
-		{
-		return OMX_ErrorInsufficientResources;
-		}
-
-	return OMX_ErrorNone;
-	}
-
-EXPORT_C OMX_ERRORTYPE COmxILOtherPort::GetLocalOmxConfigIndexes(RArray<TUint>& aIndexArray) const
-	{
-	// Always collect local indexes from parent
-	return COmxILPort::GetLocalOmxConfigIndexes(aIndexArray);
-	}
-
-EXPORT_C OMX_ERRORTYPE COmxILOtherPort::GetParameter(OMX_INDEXTYPE aParamIndex, 
-													TAny* apComponentParameterStructure) const
-	{
-	switch(aParamIndex)
-		{
-		case OMX_IndexParamOtherPortFormat:
-			{
-			OMX_ERRORTYPE omxRetValue = TOmxILUtil::CheckOmxStructSizeAndVersion(apComponentParameterStructure,
-					  															sizeof(OMX_OTHER_PARAM_PORTFORMATTYPE));
-			
-			if (omxRetValue != OMX_ErrorNone)
-				{
-				return omxRetValue;
-				}
-
-			OMX_OTHER_PARAM_PORTFORMATTYPE* pParamOtherPortFormat = 
-				static_cast<OMX_OTHER_PARAM_PORTFORMATTYPE*>(apComponentParameterStructure);
-
-			if (pParamOtherPortFormat->nIndex >= iSupportedOtherFormats.Count())
-				{
-				return OMX_ErrorNoMore;
-				}
-	
-			pParamOtherPortFormat->eFormat = iSupportedOtherFormats[pParamOtherPortFormat->nIndex];
-			}
-			break;
-		default:
-			{
-			// Try the parent's indexes
-			return COmxILPort::GetParameter(aParamIndex, apComponentParameterStructure);
-			}
-		};
-
-	return OMX_ErrorNone;
-	}
-
-EXPORT_C OMX_ERRORTYPE COmxILOtherPort::SetParameter(OMX_INDEXTYPE aParamIndex, 
-						     const TAny* apComponentParameterStructure,
-						     TBool& aUpdateProcessingFunction)
-	{
-	aUpdateProcessingFunction = EFalse;
-
-	switch(aParamIndex)
-		{
-		case OMX_IndexParamOtherPortFormat:
-			{
-			OMX_ERRORTYPE omxRetValue = TOmxILUtil::CheckOmxStructSizeAndVersion(const_cast<OMX_PTR>(apComponentParameterStructure),
-								  												sizeof(OMX_OTHER_PARAM_PORTFORMATTYPE));
-
-			if (omxRetValue != OMX_ErrorNone)
-				{
-				return omxRetValue;
-				}
-						
-			const OMX_OTHER_PARAM_PORTFORMATTYPE* pParamOtherPortFormat = 
-				static_cast<const  OMX_OTHER_PARAM_PORTFORMATTYPE*>(apComponentParameterStructure);
-
-			// Check in case the specified format is not actually supported by this
-			// port
-			OMX_OTHER_FORMATTYPE newFormatType = pParamOtherPortFormat->eFormat;
-
-			// OMX_OTHER_FormatVendorReserved is the last of the supported values as of
-			// v1.1.1
-			if (newFormatType > OMX_OTHER_FormatVendorReserved)
-			    {
-			    return OMX_ErrorBadParameter;
-			    }
-
-			if (KErrNotFound == iSupportedOtherFormats.Find(newFormatType))
-			    {
-			    return OMX_ErrorUnsupportedSetting;
-			    }
-
-			// Set the new default format, but check first that we are actually
-			// changing something...
-			if (iParamOtherPortFormat.eFormat != newFormatType)
-			    {
-			    iParamOtherPortFormat.eFormat = newFormatType;
-
-			    // This is an indication to the PortManager that the processing
-			    // function needs to get updated
-			    //
-			    aUpdateProcessingFunction = ETrue;
-			    }
-			}
-			break;
-		default:
-			{
-			// Try the parent's indexes
-			return COmxILPort::SetParameter(aParamIndex, 
-											apComponentParameterStructure, 
-											aUpdateProcessingFunction);
-			}
-		};
-
-	return OMX_ErrorNone;
-	}