diff -r ebf79c79991a -r 5e8b14bae8c3 khronosfws/openmax_al/src/engine/xaimagedecodercapabilitiesitf.c
--- a/khronosfws/openmax_al/src/engine/xaimagedecodercapabilitiesitf.c	Fri Jun 25 17:36:03 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,165 +0,0 @@
-/*
-* 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: 
-*
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <string.h>
-
-#include "xaglobals.h"
-#include "xaimagedecodercapabilitiesitf.h"
-  
-#include "xacapabilitiesmgr.h"
-
-/* XAImageDecoderCapabilitiesItfImpl* GetImpl
- * Description: Validate interface pointer and cast it to implementation pointer.
- */
-static XAImageDecoderCapabilitiesItfImpl* GetImpl(XAImageDecoderCapabilitiesItf self)
-{
-    if( self )
-    {
-        XAImageDecoderCapabilitiesItfImpl* impl = (XAImageDecoderCapabilitiesItfImpl*)(*self);
-        if( impl && (impl == impl->self) )
-        {
-            return impl;
-        }
-    }
-    return NULL;
-}
-
-/**
- * Base interface XAImageDecoderCapabilitiesItf implementation
- **/
-
-/* XAresult XAImageDecoderCapabilitiesItfImpl_GetImageDecoderCapabilities
- * Description: Retrieves image decoder capabilities.
- */
-XAresult XAImageDecoderCapabilitiesItfImpl_GetImageDecoderCapabilities(
-                            XAImageDecoderCapabilitiesItf self,
-                            XAuint32* pDecoderId,
-                            XAImageCodecDescriptor* pDescriptor)
-{
-    XAImageDecoderCapabilitiesItfImpl* impl = NULL;
-    XAresult res = XA_RESULT_SUCCESS;
-    DEBUG_API("->XAImageDecoderCapabilitiesItfImpl_GetImageDecoderCapabilities");
-
-    impl = GetImpl(self);
-    if( !impl || !pDecoderId )
-    {
-        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
-        res = XA_RESULT_PARAMETER_INVALID;
-    }
-    else
-    {
-        if( !pDescriptor )
-        {   /* query number of image decoders */
-            *pDecoderId = impl->numCodecs;
-        }
-        else
-        {
-            /* query capabilities from adaptation using codec id */
-  
-            XACapabilities temp;
-            memset(pDescriptor,0,sizeof(XAImageCodecDescriptor));
-            /* here pEncoderId refers to index rather than codec id */
-            res = XACapabilitiesMgr_GetCapsByIdx(NULL, (XACapsType)(XACAP_DECODER|XACAP_IMAGE), *pDecoderId, &temp);
-            if( res == XA_RESULT_SUCCESS )
-            {
-                XAImageCodecDescriptor* desc = (XAImageCodecDescriptor*)(&temp.pEntry);
-                /* map applicable values to XAAudioCodecCapabilities */
-                pDescriptor->codecId = temp.xaid;
-                pDescriptor->maxWidth = desc->maxWidth;
-                pDescriptor->maxHeight = desc->maxHeight;
-            }
-
-        }
-    }
-
-    DEBUG_API("<-XAImageDecoderCapabilitiesItfImpl_GetImageDecoderCapabilities");
-    return res;
-}
-
-/* XAresult XAImageDecoderCapabilitiesItfImpl_QueryColorFormats
- * Description: This method is used to query the color formats supported
- *              by the image decoder.
- */
-XAresult XAImageDecoderCapabilitiesItfImpl_QueryColorFormats(
-                            const XAImageDecoderCapabilitiesItf self,
-                            XAuint32* pIndex,
-                            XAuint32* pColorFormats)
-{
-    XAImageDecoderCapabilitiesItfImpl* impl = NULL;
-    XAresult res = XA_RESULT_SUCCESS;
-    DEBUG_API("->XAImageDecoderCapabilitiesItfImpl_QueryColorFormats");
-    impl = GetImpl(self);
-    if( !impl || !pIndex )
-    {
-        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
-        res = XA_RESULT_PARAMETER_INVALID;
-    }
-    else
-    {
-
-        res = XACapabilitiesMgr_QueryColorFormats(NULL, pIndex, pColorFormats);
-        
-    }
-    DEBUG_API("<-XAImageDecoderCapabilitiesItfImpl_QueryColorFormats");
-    return res;
-}
-
-/**
- * XAImageDecoderCapabilitiesItfImpl -specific methods
- **/
-
-/* XAImageDecoderCapabilitiesItfImpl_Create
- * Description: Allocate and initialize XAImageDecoderCapabilitiesItfImpl
- */
-XAImageDecoderCapabilitiesItfImpl* XAImageDecoderCapabilitiesItfImpl_Create()
-{
-    XAImageDecoderCapabilitiesItfImpl* self = (XAImageDecoderCapabilitiesItfImpl*)
-        calloc(1,sizeof(XAImageDecoderCapabilitiesItfImpl));
-    DEBUG_API("->XAImageDecoderCapabilitiesItfImpl_Create");
-
-    if( self )
-    {
-        /* init itf default implementation */
-        self->itf.GetImageDecoderCapabilities =
-            XAImageDecoderCapabilitiesItfImpl_GetImageDecoderCapabilities;
-        self->itf.QueryColorFormats =
-            XAImageDecoderCapabilitiesItfImpl_QueryColorFormats;
-
-  
-        /* init variables */
-        assert( XACapabilitiesMgr_GetCapsCount( NULL, (XACapsType)(XACAP_DECODER|XACAP_IMAGE),
-                                  &(self->numCodecs) ) == XA_RESULT_SUCCESS );
-
-        self->self = self;
-    }
-    DEBUG_API("<-XAImageDecoderCapabilitiesItfImpl_Create");
-    return self;
-}
-
-/* void XAImageDecoderCapabilitiesItfImpl_Free
- * Description: Free all resources reserved at XAImageDecoderCapabilitiesItfImpl
- */
-void XAImageDecoderCapabilitiesItfImpl_Free(XAImageDecoderCapabilitiesItfImpl* self)
-{
-    DEBUG_API("->XAImageDecoderCapabilitiesItfImpl_Free");
-    assert(self==self->self);
-    free(self);
-    DEBUG_API("<-XAImageDecoderCapabilitiesItfImpl_Free");
-}