diff -r ebf79c79991a -r 5e8b14bae8c3 khronosfws/openmax_al/src/engine/xavideodecodercapabilitiesitf.c
--- a/khronosfws/openmax_al/src/engine/xavideodecodercapabilitiesitf.c	Fri Jun 25 17:36:03 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,203 +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 "xavideodecodercapabilitiesitf.h"
-#include "xacapabilitiesmgr.h"   
-
-
-/* XAVideoDecoderCapabilitiesItfImpl* GetImpl
- * Description: Validate interface pointer and cast it to implementation pointer.
- */
-static XAVideoDecoderCapabilitiesItfImpl* GetImpl(XAVideoDecoderCapabilitiesItf self)
-{
-    if( self )
-    {
-        XAVideoDecoderCapabilitiesItfImpl* impl = (XAVideoDecoderCapabilitiesItfImpl*)(*self);
-        if( impl && (impl == impl->self) )
-        {
-            return impl;
-        }
-    }
-    return NULL;
-}
-
-/**
- * Base interface XAVideoDecoderCapabilitiesItf implementation
- **/
-
-/* XAresult XAVideoDecoderCapabilitiesItfImpl_GetVideoDecoders
- * Description: Retrieves available video decoders.
- */
-XAresult XAVideoDecoderCapabilitiesItfImpl_GetVideoDecoders(
-                            XAVideoDecoderCapabilitiesItf self,
-                            XAuint32* pNumDecoders,
-                            XAuint32* pDecoderIds)
-{
-    XAVideoDecoderCapabilitiesItfImpl* impl = NULL;
-    XAresult res = XA_RESULT_SUCCESS;
-
-    DEBUG_API("->XAVideoDecoderCapabilitiesItfImpl_GetVideoDecoders");
-
-    impl = GetImpl(self);
-    if( !impl || !pNumDecoders )
-    {
-        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
-        res = XA_RESULT_PARAMETER_INVALID;
-    }
-    else
-    {
-        if( pDecoderIds )
-        {   /* query array of decoders */
-            if( *pNumDecoders < impl->numCodecs )
-            {
-                DEBUG_ERR("XA_RESULT_BUFFER_INSUFFICIENT");
-                res = XA_RESULT_BUFFER_INSUFFICIENT;
-            }
-            else
-            {
-                
-  
-                XAuint32 i = 0;
-                XACapabilities temp;
-                for( i=0; i<impl->numCodecs; i++ )
-                {
-                    /* query decoder id from adaptation using index value */
-                    XACapabilitiesMgr_GetCapsByIdx(NULL, (XACapsType)(XACAP_DECODER|XACAP_VIDEO), i, &temp);
-                    pDecoderIds[i] = temp.xaid;
-                }
-
-            }
-        }
-        /* return number of decoders */
-        *pNumDecoders = impl->numCodecs;
-    }
-
-    DEBUG_API("<-XAVideoDecoderCapabilitiesItfImpl_GetVideoDecoders");
-    return res;
-}
-
-/* XAresult XAVideoDecoderCapabilitiesItfImpl_GetVideoDecoderCapabilities
- * Description: Retrieves video decoder capabilities.
- */
-XAresult XAVideoDecoderCapabilitiesItfImpl_GetVideoDecoderCapabilities(
-                            XAVideoDecoderCapabilitiesItf self,
-                            XAuint32 decoderId,
-                            XAuint32* pIndex,
-                            XAVideoCodecDescriptor* pDescriptor)
-{
-    XAVideoDecoderCapabilitiesItfImpl* impl = NULL;
-    XAresult res = XA_RESULT_SUCCESS;
-    DEBUG_API("->XAVideoDecoderCapabilitiesItfImpl_GetDecoderCapabilities");
-    impl = GetImpl(self);
-
-    if( !impl || !pIndex )
-    {
-        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
-        res = XA_RESULT_PARAMETER_INVALID;
-    }
-    else
-    {
-        if( !pDescriptor )
-        {   /* query number of capa structures */
-            *pIndex = 1;
-        }
-        else
-        {   /* query capabilities */
-            if( *pIndex >= 1 )
-            {
-                DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
-                res = XA_RESULT_PARAMETER_INVALID;
-            }
-            else
-            {
-                /* query capabilities from adaptation using codec id */
-  
-                XACapabilities temp;
-                memset(pDescriptor,0,sizeof(XAVideoCodecDescriptor));
-                res = XACapabilitiesMgr_GetCapsById(NULL, (XACapsType)(XACAP_DECODER|XACAP_VIDEO), decoderId, &temp);
-                if( res == XA_RESULT_SUCCESS )
-                {
-                    XAVideoCodecDescriptor* desc = (XAVideoCodecDescriptor*)(&temp.pEntry);
-                    /* map applicable values to XAVideoCodecCapabilities */
-                    pDescriptor->codecId = temp.xaid;
-                    pDescriptor->maxWidth = desc->maxWidth;
-                    pDescriptor->maxHeight = desc->maxHeight;
-                    pDescriptor->maxFrameRate = (desc->maxFrameRate & 0xffff)<<16;
-                    pDescriptor->maxBitRate = desc->maxBitRate;
-                    /*other caps undefined*/
-                    pDescriptor->rateControlSupported = 0; /* reserved in decoders */
-                    pDescriptor->profileSetting = 0; /* unknown for theora or motionjpeg */
-                    pDescriptor->levelSetting = 0; /* unknown for theora or motionjpeg */
-                }
-
-            }
-        }
-    }
-
-    DEBUG_API("<-XAVideoDecoderCapabilitiesItfImpl_GetDecoderCapabilities");
-    return res;
-}
-
-/**
- * XAVideoDecoderCapabilitiesItfImpl -specific methods
- **/
-
-/* XAVideoDecoderCapabilitiesItfImpl_Create
- * Description: Allocate and initialize XAVideoDecoderCapabilitiesItfImpl
- */
-XAVideoDecoderCapabilitiesItfImpl* XAVideoDecoderCapabilitiesItfImpl_Create()
-{
-    XAVideoDecoderCapabilitiesItfImpl* self = (XAVideoDecoderCapabilitiesItfImpl*)
-        calloc(1,sizeof(XAVideoDecoderCapabilitiesItfImpl));
-    DEBUG_API("->XAVideoDecoderCapabilitiesItfImpl_Create");
-
-    if( self )
-    {
-        /* init itf default implementation */
-        self->itf.GetVideoDecoders =
-            XAVideoDecoderCapabilitiesItfImpl_GetVideoDecoders;
-        self->itf.GetVideoDecoderCapabilities =
-            XAVideoDecoderCapabilitiesItfImpl_GetVideoDecoderCapabilities;
-
-  
-        /* init variables */
-        assert( XACapabilitiesMgr_GetCapsCount( NULL, (XACapsType)(XACAP_DECODER|XACAP_VIDEO),
-                                  &(self->numCodecs) ) == XA_RESULT_SUCCESS );
-
-        self->self = self;
-    }
-    DEBUG_API("<-XAVideoDecoderCapabilitiesItfImpl_Create");
-    return self;
-}
-
-/* void XAVideoDecoderCapabilitiesItfImpl_Free
- * Description: Free all resources reserved at XAVideoDecoderCapabilitiesItfImpl_Create
- */
-void XAVideoDecoderCapabilitiesItfImpl_Free(XAVideoDecoderCapabilitiesItfImpl* self)
-{
-    DEBUG_API("->XAVideoDecoderCapabilitiesItfImpl_Free");
-    assert(self==self->self);
-    free(self);
-    DEBUG_API("<-XAVideoDecoderCapabilitiesItfImpl_Free");
-}