--- a/khronosfws/openmax_al/group/openmaxal.mmp	Fri Sep 17 08:33:15 2010 +0300
+++ b/khronosfws/openmax_al/group/openmaxal.mmp	Mon Oct 04 00:51:56 2010 +0300
@@ -38,14 +38,14 @@
 //MACRO 	USE_LOCAL_WINDOW_RESOURCES
 //MACRO           PROFILE_TIME
 //MACRO           PRINT_TO_CONSOLE_TIME_DIFF
+//MACRO		PROFILE_HEAP_USAGE
+//MACRO		INPUTSRCSELECTION_FEATURE
 
 SOURCEPATH      ../src/gst_adaptation
 SOURCE	        xaadaptationgst.c
 SOURCE 	        xagstcapabilitiesmgr.c
 SOURCE	        xaaudioencoderitfadaptation.c
-SOURCE	        xaengineadaptctx.c
 SOURCE	        xamediarecorderadaptctx.c
-SOURCE	        xametadataadaptation.c
 SOURCE	        xarecorditfadaptation.c
 
 SOURCEPATH ../src/adptcommon
@@ -56,7 +56,6 @@
 SOURCEPATH      ../src/common
 SOURCE          openmaxal.c
 SOURCE          xacommon.c
-SOURCE          xaconfigextensionsitf.c
 SOURCE          xadynamicsourceitf.c
 SOURCE          xadynintmgmtitf.c
 SOURCE          xametadataextractionitf.c
@@ -67,6 +66,7 @@
 SOURCE 		xastreaminformationitf.c
 SOURCE          xanokialinearvolumeitf.c
 SOURCE          xanokiavolumeextitf.c
+SOURCE          xavideopostprocessingitf.c
 
 SOURCEPATH      ../src/engine
 SOURCE          xaaudioencodercapabilitiesitf.c
@@ -85,7 +85,6 @@
 SOURCEPATH      ../src/mediarecorder
 SOURCE          xaaudioencoderitf.c
 SOURCE          xamediarecorder.c
-SOURCE          xametadatainsertionitf.c
 SOURCE          xarecorditf.c
 
 SOURCEPATH      ../src/metadataextractor
@@ -96,9 +95,6 @@
 SOURCE		xaradioitf.c
 
 SOURCEPATH      ../src/mmf_adaptation
-//	Removing below file since currently there is no Engine related
-// 	mmf adaptation
-//SOURCE          xaengineadaptctxmmf.c
 SOURCE	        xamediaplayeradaptctxmmf.c
 SOURCE	        xaplayitfadaptationmmf.c
 SOURCE	        xaadaptationmmf.c
@@ -120,6 +116,9 @@
 SOURCE  	cmetadatautilityitf.cpp
 SOURCE		xametadataadaptctxmmf.c
 SOURCE		xaplaybackrateitfadaptationmmf.c
+SOURCE 		xaprefetchstatusitfadaptationmmf.c
+SOURCE		prefetchlevelupdatetimer.cpp
+SOURCE      	xavideopostprosessingitfadaptationmmf.c
 
 USERINCLUDE     ../inc
 USERINCLUDE     ../src
@@ -137,7 +136,15 @@
 OS_LAYER_LIBC_SYSTEMINCLUDE
 OS_LAYER_GLIB_SYSTEMINCLUDE
 MW_LAYER_GSTREAMER_SYSTEMINCLUDE
+
+#if defined (MW_LAYER_KHRONOS_SYSTEMINCLUDE)
+MW_LAYER_KHRONOS_SYSTEMINCLUDE
+#else
 SYSTEMINCLUDE /epoc32/include/platform/mw/khronos 
+#endif
+
+SOURCEPATH      ../src/xadebugtraceutility
+SOURCE          xadebugtraceutility.cpp
 
 LIBRARY         euser.lib
 LIBRARY         libc.lib
@@ -162,5 +169,6 @@
 LIBRARY 	libgstcoreelements.lib
 LIBRARY		libgstcoreindexers.lib
 LIBRARY 	MetaDataUtility.lib
+LIBRARY		libgstdevsoundext.lib
 STATICLIBRARY   hxmetadatautil.lib
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/khronosfws/openmax_al/inc/xadebugtraceutility.h	Mon Oct 04 00:51:56 2010 +0300
@@ -0,0 +1,43 @@
+/*
+* Copyright (c) 2010 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:  xadebugtraceutility header
+*
+*/
+
+#ifndef XADEBUGTRACEUTILITY_H
+#define XADEBUGTRACEUTILITY_H
+
+/* Functions to be used by c files */
+#ifdef _cplusplus
+extern "C" {
+#endif
+
+void xa_print(const char* formatString);
+void xa_print_1(const char* formatString, int a1);
+void xa_print_1_str(const char* formatString, const char* a1);
+void xa_print_2(const char* formatString, int a1, int a2);
+void xa_print_2_str(const char* formatString, const char* a1, const char* a2);
+void xa_print_3(const char* formatString, int a1, int a2, int a3);
+void xa_print_4(const char* formatString, int a1, int a2, int a3, int a4);
+void xa_heap_total_alloc_print(const char* formatString);
+#ifdef _cplusplus
+}
+#endif
+
+/* Functions to be used by cpp files */
+void xa_cppprint(const char* formatString);
+void xa_cppprint_1(const char* formatString, int a1);
+void xa_cppprint_2(const char* formatString, int a1, int a2);
+
+#endif /* XADEBUGTRACEUTILITY_H */

--- a/khronosfws/openmax_al/src/adptcommon/xaadptbasectx.c	Fri Sep 17 08:33:15 2010 +0300
+++ b/khronosfws/openmax_al/src/adptcommon/xaadptbasectx.c	Mon Oct 04 00:51:56 2010 +0300
@@ -15,7 +15,6 @@
  *
  */
 
-#include <assert.h>
 #include <string.h>
 #include "xaadptbasectx.h"
 #include "xathreadsafety.h"
@@ -37,7 +36,7 @@
                     sizeof(XAAdaptEvtHdlr));
             if (!pSelf->evtHdlrs)
                 {
-                DEBUG_ERR("Memory allocation failure in Base Ctx.")
+                DEBUG_ERR("Memory allocation failure in Base Ctx.");
                 return XA_RESULT_MEMORY_FAILURE;
                 }
             }
@@ -45,7 +44,7 @@
         }
     else
         {
-        DEBUG_ERR("Invalid Adaptation Base Context.")
+        DEBUG_ERR("Invalid Adaptation Base Context.");
         return XA_RESULT_PARAMETER_INVALID;
         }
 

--- a/khronosfws/openmax_al/src/adptcommon/xaadptbasectx.h	Fri Sep 17 08:33:15 2010 +0300
+++ b/khronosfws/openmax_al/src/adptcommon/xaadptbasectx.h	Mon Oct 04 00:51:56 2010 +0300
@@ -69,29 +69,29 @@
 /* TYPEDEFS */
 
 /* Adaptation device IDs */
-#define XA_ADAPTID_DEVSOUNDSRC      0xAD7E5001
-#define XA_ADAPTID_DEVSOUNDSINK     0xAD7E5002
-#define XA_ADAPTID_AUTOAUDIOSINK    0xAD7E5003
-#define XA_ADAPTID_AUDIOTESTSRC     0xAD7E5004
-#define XA_ADAPTID_AUTOVIDEOSINK    0xAD7E5005
-#define XA_ADAPTID_VIDEOTESTSRC     0xAD7E5006
-#define XA_ADAPTID_V4L2SRC          0xAD7E5007
-#define XA_ADAPTID_JACKSINK         0xAD7E5008
-#define XA_ADAPTID_MOTIONJPEG       0xAD7E5009
-#define XA_ADAPTID_THEORA           0xAD7E500A
-#define XA_ADAPTID_VORBIS           0xAD7E500B
-
-#define XA_ADAPTID_VIBRA            0xAD7E500C
-#define XA_ADAPTID_LEDARRAY         0xAD7E500D
-
-#define XA_ADAPTID_RAWVIDEO         0xAD7E500E
-
+#define XA_ADAPTID_DEVSOUNDSRC_MIC          0xAD7E5001
+#define XA_ADAPTID_DEVSOUNDSINK             0xAD7E5002
+#define XA_ADAPTID_AUTOAUDIOSINK            0xAD7E5003
+#define XA_ADAPTID_AUDIOTESTSRC             0xAD7E5004
+#define XA_ADAPTID_AUTOVIDEOSINK            0xAD7E5005
+#define XA_ADAPTID_VIDEOTESTSRC             0xAD7E5006
+#define XA_ADAPTID_V4L2SRC                  0xAD7E5007
+#define XA_ADAPTID_JACKSINK                 0xAD7E5008
+#define XA_ADAPTID_MOTIONJPEG               0xAD7E5009
+#define XA_ADAPTID_THEORA                   0xAD7E500A
+#define XA_ADAPTID_VORBIS                   0xAD7E500B
+#define XA_ADAPTID_VIBRA                    0xAD7E500C
+#define XA_ADAPTID_LEDARRAY                 0xAD7E500D
+#define XA_ADAPTID_RAWVIDEO                 0xAD7E500E
+#define XA_ADAPTID_DEVSOUNDSRC_FMRX         0xAD7E500F
+#define XA_ADAPTID_DEVSOUNDSRC_CALL         0xAD7E5010    
+    
 #define XA_ADAPT_DEFAULTAUDIOOUTPUT XA_ADAPTID_DEVSOUNDSINK
 
 #ifdef XA_USE_TEST_PLUGINS
 #define XA_ADAPT_DEFAULTAUDIOINPUT  XA_ADAPTID_AUDIOTESTSRC
 #else
-#define XA_ADAPT_DEFAULTAUDIOINPUT  XA_ADAPTID_DEVSOUNDSRC
+#define XA_ADAPT_DEFAULTAUDIOINPUT  XA_ADAPTID_DEVSOUNDSRC_MIC
 #endif
 
 #define XA_ADAPT_OGGPROFILE_UNKNOWN 0x1

--- a/khronosfws/openmax_al/src/adptcommon/xacapabilitiesmgr.c	Fri Sep 17 08:33:15 2010 +0300
+++ b/khronosfws/openmax_al/src/adptcommon/xacapabilitiesmgr.c	Mon Oct 04 00:51:56 2010 +0300
@@ -19,86 +19,128 @@
 #include "xacapabilitiesmgr.h"
 #include "xammfcapabilitiesmgr.h"
 #include "xagstcapabilitiesmgr.h"
+#include "xaadptbasectx.h"
 #include <stdio.h>
 #include <string.h>
 
-static XAresult XACapabilitiesMgr_GetAudioInputDeviceCapabilities(
+static XAresult XACapabilitiesMgr_GetAudioInputDeviceMicCapabilities(
+        XACapabilities **ppNode);
+static XAresult XACapabilitiesMgr_GetAudioInputDeviceFMRxCapabilities(
+        XACapabilities **ppNode);
+static XAresult XACapabilitiesMgr_GetAudioInputDeviceCallCapabilities(
         XACapabilities **ppNode);
 static XAresult XACapabilitiesMgr_GetAudioOutputDeviceCapabilities(
         XACapabilities **ppNode);
 
 /* XAresult XAGSTCapabilitiesMgr_UpdateAudioIOCapabilitieList
- * Description: Update the capabilities list supported by GStreamer framework.
+ * Description: Update the capabilities list supported by the engine.
  */
 XAresult XACapabilitiesMgr_UpdateAudioIOCapabilitieList(
         FrameworkMap *frameworkMap, XACapabilities **ppListHead)
 
     {
     XAresult res = XA_RESULT_SUCCESS;
-    XACapabilities *lastNode;
-    XACapabilities *firstNode;
+    XACapabilities *lastNode = NULL;
+    XACapabilities *firstNode = NULL;
     XACapabilities *newNode = NULL;
 
+    DEBUG_API("->XACapabilitiesMgr_UpdateAudioIOCapabilitieList");
+
     if (!frameworkMap || !ppListHead)
         {
-        res = XA_RESULT_PARAMETER_INVALID;
+        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
+        DEBUG_API("<-XACapabilitiesMgr_UpdateAudioIOCapabilitieList");
+        return XA_RESULT_PARAMETER_INVALID;
+        }
+
+    res = XACapabilitiesMgr_GetAudioInputDeviceMicCapabilities(&newNode);
+    if (res != XA_RESULT_SUCCESS)
+        {
+        XACapabilitiesMgr_DeleteCapabilitieList(&firstNode);
+        DEBUG_API("<-XACapabilitiesMgr_UpdateAudioIOCapabilitieList");
         return res;
         }
 
-    lastNode = *ppListHead;
-    firstNode = *ppListHead;
-
-    DEBUG_API("->XACapabilitiesMgr_UpdateAudioIOCapabilitieList");
-
-    /* traverse and point to the last node in the list */
-    while (lastNode && lastNode->next)
+    if (!firstNode)
         {
-        lastNode = lastNode->next;
+        firstNode = newNode;
+        lastNode = newNode;
         }
-
-    /* If no input devices are supported, the function returns
-     * XA_RESULT_SUCCESS and newNode will be NULL*/
-    newNode = NULL;
-    res = XACapabilitiesMgr_GetAudioInputDeviceCapabilities(&newNode);
+    
+    res = XACapabilitiesMgr_GetAudioInputDeviceFMRxCapabilities(&newNode);
     if (res != XA_RESULT_SUCCESS)
         {
+        XACapabilitiesMgr_DeleteCapabilitieList(&firstNode);
+        DEBUG_API("<-XACapabilitiesMgr_UpdateAudioIOCapabilitieList");
         return res;
         }
 
-    if (lastNode)
+    if (!firstNode)
+        {
+        firstNode = newNode;
+        lastNode = newNode;
+        }
+    else
         {
         lastNode->next = newNode;
+        lastNode = newNode;
         }
-    if (newNode)
-        { /* if a new node is created move lastNode to the new item */
-        if (!firstNode)
-            firstNode = newNode;
+    
+    res = XACapabilitiesMgr_GetAudioInputDeviceCallCapabilities(&newNode);
+    if (res != XA_RESULT_SUCCESS)
+        {
+        XACapabilitiesMgr_DeleteCapabilitieList(&firstNode);
+        DEBUG_API("<-XACapabilitiesMgr_UpdateAudioIOCapabilitieList");
+        return res;
+        }
+
+    if (!firstNode)
+        {
+        firstNode = newNode;
+        lastNode = newNode;
+        }
+    else
+        {
+        lastNode->next = newNode;
         lastNode = newNode;
         }
 
-    /* If no input devices are supported, the function returns
-     * XA_RESULT_SUCCESS and newNode will be NULL*/
-    newNode = NULL;
     res = XACapabilitiesMgr_GetAudioOutputDeviceCapabilities(&newNode);
     if (res != XA_RESULT_SUCCESS)
         {
+        XACapabilitiesMgr_DeleteCapabilitieList(&firstNode);
+        DEBUG_API("<-XACapabilitiesMgr_UpdateAudioIOCapabilitieList");
         return res;
         }
 
-    if (lastNode)
+    if (!firstNode)
+        {
+        firstNode = newNode;
+        lastNode = newNode;
+        }
+    else
         {
         lastNode->next = newNode;
-        }
-    if (newNode)
-        { /* if a new node is created move lastNode to the new item */
-        if (!firstNode)
-            firstNode = newNode;
         lastNode = newNode;
         }
-    /* if empty list, then append first node as the head */
-    if (!(*ppListHead))
+
+    /* if we have some iodevice capabilities in the list */
+    if (firstNode)
         {
-        *ppListHead = firstNode;
+        /* if empty list, then append first node as the head */
+        if (!(*ppListHead))
+            {
+            *ppListHead = firstNode;
+            }
+        else /* traverse to the last item in the list and link firstNode to it */
+            {
+            lastNode = *ppListHead;
+            while(lastNode->next)
+                {
+                lastNode = lastNode->next;
+                }
+            lastNode->next = firstNode;
+            }
         }
     DEBUG_API("<-XACapabilitiesMgr_UpdateAudioIOCapabilitieList");
     return res;
@@ -109,10 +151,13 @@
     {
     XACapabilities* list = NULL;
     XAresult res = XA_RESULT_SUCCESS;
-    if (!ppListHead)
+
+    DEBUG_API("->XACapabilitiesMgr_CreateCapabilitieList");
+    if (!frameworkMap || !ppListHead)
         {
-        res = XA_RESULT_PARAMETER_INVALID;
-        return res;
+        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
+        DEBUG_API("<-XACapabilitiesMgr_CreateCapabilitieList");
+        return XA_RESULT_PARAMETER_INVALID;
         }
 
     *ppListHead = NULL;
@@ -121,6 +166,7 @@
     if (res != XA_RESULT_SUCCESS)
         {
         XACapabilitiesMgr_DeleteCapabilitieList(&list);
+        DEBUG_API("<-XACapabilitiesMgr_CreateCapabilitieList");
         return res;
         }
 
@@ -128,6 +174,7 @@
     if (res != XA_RESULT_SUCCESS)
         {
         XACapabilitiesMgr_DeleteCapabilitieList(&list);
+        DEBUG_API("<-XACapabilitiesMgr_CreateCapabilitieList");
         return res;
         }
 
@@ -135,10 +182,12 @@
     if (res != XA_RESULT_SUCCESS)
         {
         XACapabilitiesMgr_DeleteCapabilitieList(&list);
+        DEBUG_API("<-XACapabilitiesMgr_CreateCapabilitieList");
         return res;
         }
 
     *ppListHead = list;
+    DEBUG_API("<-XACapabilitiesMgr_CreateCapabilitieList");
     return res;
     }
 
@@ -148,10 +197,12 @@
     XACapabilities* nextNode = NULL;
     XAresult res = XA_RESULT_SUCCESS;
 
+    DEBUG_API("->XACapabilitiesMgr_DeleteCapabilitieList");
     if (!ppListHead)
         {
-        res = XA_RESULT_PARAMETER_INVALID;
-        return res;
+        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
+        DEBUG_API("<-XACapabilitiesMgr_DeleteCapabilitieList");
+        return XA_RESULT_PARAMETER_INVALID;
         }
 
     currNode = *ppListHead;
@@ -192,7 +243,6 @@
                 free(entries[i].pBitratesSupported);
                 }
             free(entries);
-
             }
 
         if (currNode->adaptId)
@@ -206,6 +256,8 @@
         }
 
     *ppListHead = NULL;
+
+    DEBUG_API("<-XACapabilitiesMgr_DeleteCapabilitieList");
     return res;
     }
 
@@ -222,8 +274,9 @@
     DEBUG_API("->XACapabilitiesMgr_GetCapsCount");
     if (!currNode || !count)
         {
-        res = XA_RESULT_PARAMETER_INVALID;
-        return res;
+        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
+        DEBUG_API("<-XACapabilitiesMgr_GetCapsCount");
+        return XA_RESULT_PARAMETER_INVALID;
         }
 
     (*count) = 0;
@@ -254,8 +307,9 @@
 
     if (!currNode)
         {
-        res = XA_RESULT_PARAMETER_INVALID;
-        return res;
+        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
+        DEBUG_API("<-XACapabilitiesMgr_GetCapsById");
+        return XA_RESULT_PARAMETER_INVALID;
         }
 
     while (currNode)
@@ -272,8 +326,9 @@
 
     if (!found)
         {
-        res = XA_RESULT_FEATURE_UNSUPPORTED;
-        return res;
+        DEBUG_ERR("XA_RESULT_FEATURE_UNSUPPORTED");
+        DEBUG_API("<-XACapabilitiesMgr_GetCapsById");
+        return XA_RESULT_FEATURE_UNSUPPORTED;
         }
 
     DEBUG_API("<-XACapabilitiesMgr_GetCapsById");
@@ -295,8 +350,9 @@
 
     if (!currNode)
         {
-        res = XA_RESULT_PARAMETER_INVALID;
-        return res;
+        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
+        DEBUG_API("<-XACapabilitiesMgr_GetCapsByIdx");
+        return XA_RESULT_PARAMETER_INVALID;
         }
 
     while (currNode)
@@ -315,8 +371,9 @@
 
     if (!found)
         {
-        res = XA_RESULT_PARAMETER_INVALID;
-        return res;
+        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
+        DEBUG_API("<-XACapabilitiesMgr_GetCapsByIdx");
+        return XA_RESULT_PARAMETER_INVALID;
         }
 
     DEBUG_API("<-XACapabilitiesMgr_GetCapsByIdx");
@@ -336,9 +393,9 @@
 
     if (!pIndex)
         {
-        DEBUG_ERR("illegal NULL parameter");
-        res = XA_RESULT_PARAMETER_INVALID;
-        return res;
+        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
+        DEBUG_API("<-XACapabilitiesMgr_QueryColorFormats");
+        return XA_RESULT_PARAMETER_INVALID;
         }
 
     res = XACapabilitiesMgr_GetCapsById(pListHead,
@@ -354,7 +411,7 @@
             { /* query color format */
             if (*pIndex >= 1) /* one used by camera context */
                 {
-                DEBUG_ERR("index parameter invalid");
+                DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
                 res = XA_RESULT_PARAMETER_INVALID;
                 }
             else
@@ -373,24 +430,106 @@
     }
 
 /* Add AudioInputDeviceCaps */
-XAresult XACapabilitiesMgr_GetAudioInputDeviceCapabilities(
+XAresult XACapabilitiesMgr_GetAudioInputDeviceMicCapabilities(
         XACapabilities** ppNode)
     {
     XAresult res = XA_RESULT_SUCCESS;
     XACapabilities *newNode = NULL;
     XAAudioInputDescriptor *entries = NULL;
-    XAchar micDeviceName[] = "Default Mic";
+    XAchar inpDeviceName[] = "Default Mic";
     int strLen = 0;
 
+    DEBUG_API("->XACapabilitiesMgr_GetAudioInputDeviceMicCapabilities");
     newNode = (XACapabilities *) calloc(1, sizeof(XACapabilities));
     if (!newNode)
         {
-        res = XA_RESULT_MEMORY_FAILURE;
-        return res;
+        DEBUG_ERR("XA_RESULT_MEMORY_FAILURE");
+        DEBUG_API("<-XACapabilitiesMgr_GetAudioInputDeviceMicCapabilities");
+        return XA_RESULT_MEMORY_FAILURE;
         }
 
     newNode->capsType = AUD_I;
-    newNode->xaid = 0xAD7E5001;
+    newNode->xaid = XA_ADAPTID_DEVSOUNDSRC_MIC;
+    newNode->noOfEntries = 1;
+
+    /* Allocate array */
+    entries = (XAAudioInputDescriptor*) calloc(1,
+            sizeof(XAAudioInputDescriptor));
+    if (!entries)
+        {
+        XACapabilitiesMgr_DeleteCapabilitieList(&newNode);
+        DEBUG_ERR("XA_RESULT_MEMORY_FAILURE");
+        DEBUG_API("<-XACapabilitiesMgr_GetAudioInputDeviceMicCapabilities");
+        return XA_RESULT_MEMORY_FAILURE;
+        }
+
+    newNode->pEntry = (void*) entries;
+
+    strLen = strlen((char*) inpDeviceName);
+    entries->deviceName = (XAchar *) calloc(strLen + 1, sizeof(XAchar));
+    if (!entries->deviceName)
+        {
+        XACapabilitiesMgr_DeleteCapabilitieList(&newNode);
+        DEBUG_ERR("XA_RESULT_MEMORY_FAILURE");
+        DEBUG_API("<-XACapabilitiesMgr_GetAudioInputDeviceMicCapabilities");
+        return XA_RESULT_MEMORY_FAILURE;
+        }
+
+    strncpy((char*) entries->deviceName, (char*) inpDeviceName, strLen);
+    entries->deviceName[strLen] = '\0'; /*Null terminate it*/
+    entries->deviceConnection = XA_DEVCONNECTION_INTEGRATED;
+    entries->deviceScope = XA_DEVSCOPE_ENVIRONMENT;
+    entries->deviceLocation = XA_DEVLOCATION_HANDSET;
+    entries->isForTelephony = XA_BOOLEAN_FALSE;
+    entries->minSampleRate = 8000000; /* milliHz */
+    entries->maxSampleRate = 48000000; /* milliHz */
+    entries->isFreqRangeContinuous = XA_BOOLEAN_FALSE;
+    entries->numOfSamplingRatesSupported = 5;
+    entries->samplingRatesSupported = (XAmilliHertz*) calloc(
+            entries->numOfSamplingRatesSupported, sizeof(XAmilliHertz));
+    if (!entries->samplingRatesSupported)
+        {
+        XACapabilitiesMgr_DeleteCapabilitieList(&newNode);
+        DEBUG_ERR("XA_RESULT_MEMORY_FAILURE");
+        DEBUG_API("<-XACapabilitiesMgr_GetAudioInputDeviceMicCapabilities");
+        return XA_RESULT_MEMORY_FAILURE;
+        }
+    /* entries in milliHz */
+    entries->samplingRatesSupported[0] = 8000000;
+    entries->samplingRatesSupported[1] = 16000000;
+    entries->samplingRatesSupported[2] = 24000000;
+    entries->samplingRatesSupported[3] = 32000000;
+    entries->samplingRatesSupported[4] = 48000000;
+    entries->maxChannels = 2;
+
+    newNode->pEntry = (void*) entries;
+
+    *ppNode = newNode;
+    DEBUG_API("<-XACapabilitiesMgr_GetAudioInputDeviceMicCapabilities");
+    return res;
+    }
+
+/* Add AudioInputDeviceCaps */
+XAresult XACapabilitiesMgr_GetAudioInputDeviceFMRxCapabilities(
+        XACapabilities** ppNode)
+    {
+    XAresult res = XA_RESULT_SUCCESS;
+    XACapabilities *newNode = NULL;
+    XAAudioInputDescriptor *entries = NULL;
+    XAchar inpDeviceName[] = "FMRadio Recvr";
+    int strLen = 0;
+
+    DEBUG_API("->XACapabilitiesMgr_GetAudioInputDeviceFMRxCapabilities");
+    newNode = (XACapabilities *) calloc(1, sizeof(XACapabilities));
+    if (!newNode)
+        {
+        DEBUG_ERR("XA_RESULT_MEMORY_FAILURE");
+        DEBUG_API("<-XACapabilitiesMgr_GetAudioInputDeviceFMRxCapabilities");
+        return XA_RESULT_MEMORY_FAILURE;
+        }
+
+    newNode->capsType = AUD_I;
+    newNode->xaid = XA_ADAPTID_DEVSOUNDSRC_FMRX;
     newNode->noOfEntries = 1;
 
     /* Allocate array */
@@ -398,58 +537,135 @@
             sizeof(XAAudioInputDescriptor));
     if (!entries)
         {
-        res = XA_RESULT_MEMORY_FAILURE;
         XACapabilitiesMgr_DeleteCapabilitieList(&newNode);
-        return res;
+        DEBUG_ERR("XA_RESULT_MEMORY_FAILURE");
+        DEBUG_API("<-XACapabilitiesMgr_GetAudioInputDeviceFMRxCapabilities");
+        return XA_RESULT_MEMORY_FAILURE;
         }
 
     newNode->pEntry = (void*) entries;
 
-    strLen = strlen((char*) micDeviceName);
+    strLen = strlen((char*) inpDeviceName);
     entries->deviceName = (XAchar *) calloc(strLen + 1, sizeof(XAchar));
     if (!entries->deviceName)
         {
-        res = XA_RESULT_MEMORY_FAILURE;
         XACapabilitiesMgr_DeleteCapabilitieList(&newNode);
-        return res;
+        DEBUG_ERR("XA_RESULT_MEMORY_FAILURE");
+        DEBUG_API("<-XACapabilitiesMgr_GetAudioInputDeviceFMRxCapabilities");
+        return XA_RESULT_MEMORY_FAILURE;
         }
 
-    strncpy((char*) entries->deviceName, (char*) micDeviceName, strLen);
+    strncpy((char*) entries->deviceName, (char*) inpDeviceName, strLen);
     entries->deviceName[strLen] = '\0'; /*Null terminate it*/
     entries->deviceConnection = XA_DEVCONNECTION_INTEGRATED;
     entries->deviceScope = XA_DEVSCOPE_ENVIRONMENT;
     entries->deviceLocation = XA_DEVLOCATION_HANDSET;
     entries->isForTelephony = XA_BOOLEAN_FALSE;
     entries->minSampleRate = 8000000; /* milliHz */
-    entries->maxSampleRate = 96000000; /* milliHz */
+    entries->maxSampleRate = 48000000; /* milliHz */
     entries->isFreqRangeContinuous = XA_BOOLEAN_FALSE;
-    entries->numOfSamplingRatesSupported = 12;
+    entries->numOfSamplingRatesSupported = 5;
     entries->samplingRatesSupported = (XAmilliHertz*) calloc(
             entries->numOfSamplingRatesSupported, sizeof(XAmilliHertz));
     if (!entries->samplingRatesSupported)
         {
-        res = XA_RESULT_MEMORY_FAILURE;
         XACapabilitiesMgr_DeleteCapabilitieList(&newNode);
-        return res;
+        DEBUG_ERR("XA_RESULT_MEMORY_FAILURE");
+        DEBUG_API("<-XACapabilitiesMgr_GetAudioInputDeviceFMRxCapabilities");
+        return XA_RESULT_MEMORY_FAILURE;
         }
     /* entries in milliHz */
     entries->samplingRatesSupported[0] = 8000000;
-    entries->samplingRatesSupported[1] = 11025000;
-    entries->samplingRatesSupported[2] = 12000000;
-    entries->samplingRatesSupported[3] = 16000000;
-    entries->samplingRatesSupported[4] = 22050000;
-    entries->samplingRatesSupported[5] = 24000000;
-    entries->samplingRatesSupported[6] = 32000000;
-    entries->samplingRatesSupported[7] = 44100000;
-    entries->samplingRatesSupported[8] = 48000000;
-    entries->samplingRatesSupported[9] = 64000000;
-    entries->samplingRatesSupported[10] = 88200000;
-    entries->samplingRatesSupported[11] = 96000000;
+    entries->samplingRatesSupported[1] = 16000000;
+    entries->samplingRatesSupported[2] = 24000000;
+    entries->samplingRatesSupported[3] = 32000000;
+    entries->samplingRatesSupported[4] = 48000000;
     entries->maxChannels = 2;
 
     newNode->pEntry = (void*) entries;
 
     *ppNode = newNode;
+    DEBUG_API("<-XACapabilitiesMgr_GetAudioInputDeviceFMRxCapabilities");
+    return res;
+    }
+
+/* Add AudioInputDeviceCaps */
+XAresult XACapabilitiesMgr_GetAudioInputDeviceCallCapabilities(
+        XACapabilities** ppNode)
+    {
+    XAresult res = XA_RESULT_SUCCESS;
+    XACapabilities *newNode = NULL;
+    XAAudioInputDescriptor *entries = NULL;
+    XAchar inpDeviceName[] = "Call";
+    int strLen = 0;
+
+    DEBUG_API("->XACapabilitiesMgr_GetAudioInputDeviceCallCapabilities");
+    newNode = (XACapabilities *) calloc(1, sizeof(XACapabilities));
+    if (!newNode)
+        {
+        DEBUG_ERR("XA_RESULT_MEMORY_FAILURE");
+        DEBUG_API("<-XACapabilitiesMgr_GetAudioInputDeviceCallCapabilities");
+        return XA_RESULT_MEMORY_FAILURE;
+        }
+
+    newNode->capsType = AUD_I;
+    newNode->xaid = XA_ADAPTID_DEVSOUNDSRC_CALL;
+    newNode->noOfEntries = 1;
+
+    /* Allocate array */
+    entries = (XAAudioInputDescriptor*) calloc(1,
+            sizeof(XAAudioInputDescriptor));
+    if (!entries)
+        {
+        XACapabilitiesMgr_DeleteCapabilitieList(&newNode);
+        DEBUG_ERR("XA_RESULT_MEMORY_FAILURE");
+        DEBUG_API("<-XACapabilitiesMgr_GetAudioInputDeviceCallCapabilities");
+        return XA_RESULT_MEMORY_FAILURE;
+        }
+
+    newNode->pEntry = (void*) entries;
+
+    strLen = strlen((char*) inpDeviceName);
+    entries->deviceName = (XAchar *) calloc(strLen + 1, sizeof(XAchar));
+    if (!entries->deviceName)
+        {
+        XACapabilitiesMgr_DeleteCapabilitieList(&newNode);
+        DEBUG_ERR("XA_RESULT_MEMORY_FAILURE");
+        DEBUG_API("<-XACapabilitiesMgr_GetAudioInputDeviceCallCapabilities");
+        return XA_RESULT_MEMORY_FAILURE;
+        }
+
+    strncpy((char*) entries->deviceName, (char*) inpDeviceName, strLen);
+    entries->deviceName[strLen] = '\0'; /*Null terminate it*/
+    entries->deviceConnection = XA_DEVCONNECTION_INTEGRATED;
+    entries->deviceScope = XA_DEVSCOPE_ENVIRONMENT;
+    entries->deviceLocation = XA_DEVLOCATION_HANDSET;
+    entries->isForTelephony = XA_BOOLEAN_FALSE;
+    entries->minSampleRate = 8000000; /* milliHz */
+    entries->maxSampleRate = 48000000; /* milliHz */
+    entries->isFreqRangeContinuous = XA_BOOLEAN_FALSE;
+    entries->numOfSamplingRatesSupported = 5;
+    entries->samplingRatesSupported = (XAmilliHertz*) calloc(
+            entries->numOfSamplingRatesSupported, sizeof(XAmilliHertz));
+    if (!entries->samplingRatesSupported)
+        {
+        XACapabilitiesMgr_DeleteCapabilitieList(&newNode);
+        DEBUG_ERR("XA_RESULT_MEMORY_FAILURE");
+        DEBUG_API("<-XACapabilitiesMgr_GetAudioInputDeviceCallCapabilities");
+        return XA_RESULT_MEMORY_FAILURE;
+        }
+    /* entries in milliHz */
+    entries->samplingRatesSupported[0] = 8000000;
+    entries->samplingRatesSupported[1] = 16000000;
+    entries->samplingRatesSupported[2] = 24000000;
+    entries->samplingRatesSupported[3] = 32000000;
+    entries->samplingRatesSupported[4] = 48000000;
+    entries->maxChannels = 2;
+
+    newNode->pEntry = (void*) entries;
+
+    *ppNode = newNode;
+    DEBUG_API("<-XACapabilitiesMgr_GetAudioInputDeviceCallCapabilities");
     return res;
     }
 
@@ -462,15 +678,17 @@
     XAchar outputDeviceName[] = "Default Speaker";
     int strLen = 0;
 
+    DEBUG_API("->XACapabilitiesMgr_GetAudioOutputDeviceCapabilities");
     newNode = (XACapabilities *) calloc(1, sizeof(XACapabilities));
     if (!newNode)
         {
-        res = XA_RESULT_MEMORY_FAILURE;
-        return res;
+        DEBUG_ERR("XA_RESULT_MEMORY_FAILURE");
+        DEBUG_API("<-XACapabilitiesMgr_GetAudioOutputDeviceCapabilities");
+        return XA_RESULT_MEMORY_FAILURE;
         }
 
     newNode->capsType = AUD_O;
-    newNode->xaid = 0xAD7E5002;
+    newNode->xaid = XA_ADAPTID_DEVSOUNDSINK;
     newNode->noOfEntries = 1;
 
     /* Allocate array */
@@ -478,9 +696,10 @@
             sizeof(XAAudioOutputDescriptor));
     if (!entries)
         {
-        res = XA_RESULT_MEMORY_FAILURE;
         XACapabilitiesMgr_DeleteCapabilitieList(&newNode);
-        return res;
+        DEBUG_ERR("XA_RESULT_MEMORY_FAILURE");
+        DEBUG_API("<-XACapabilitiesMgr_GetAudioOutputDeviceCapabilities");
+        return XA_RESULT_MEMORY_FAILURE;
         }
 
     newNode->pEntry = (void*) entries;
@@ -489,9 +708,10 @@
     entries->pDeviceName = (XAchar *) calloc(strLen + 1, sizeof(XAchar));
     if (!entries->pDeviceName)
         {
-        res = XA_RESULT_MEMORY_FAILURE;
         XACapabilitiesMgr_DeleteCapabilitieList(&newNode);
-        return res;
+        DEBUG_ERR("XA_RESULT_MEMORY_FAILURE");
+        DEBUG_API("<-XACapabilitiesMgr_GetAudioOutputDeviceCapabilities");
+        return XA_RESULT_MEMORY_FAILURE;
         }
     strncpy((char*) entries->pDeviceName, (char*) outputDeviceName, strLen);
     entries->pDeviceName[strLen] = '\0'; /*Null terminate it*/
@@ -500,35 +720,30 @@
     entries->deviceLocation = XA_DEVLOCATION_HANDSET;
     entries->isForTelephony = XA_BOOLEAN_FALSE;
     entries->minSampleRate = 8000000; /* milliHz */
-    entries->maxSampleRate = 96000000; /* milliHz */
+    entries->maxSampleRate = 48000000; /* milliHz */
     entries->isFreqRangeContinuous = XA_BOOLEAN_FALSE;
-    entries->numOfSamplingRatesSupported = 12;
+    entries->numOfSamplingRatesSupported = 5;
     entries->samplingRatesSupported = (XAmilliHertz*) calloc(
             entries->numOfSamplingRatesSupported, sizeof(XAmilliHertz));
     if (!entries->samplingRatesSupported)
         {
-        res = XA_RESULT_MEMORY_FAILURE;
         XACapabilitiesMgr_DeleteCapabilitieList(&newNode);
-        return res;
+        DEBUG_ERR("XA_RESULT_MEMORY_FAILURE");
+        DEBUG_API("<-XACapabilitiesMgr_GetAudioOutputDeviceCapabilities");
+        return XA_RESULT_MEMORY_FAILURE;
         }
     /* entries in milliHz */
     entries->samplingRatesSupported[0] = 8000000;
-    entries->samplingRatesSupported[1] = 11025000;
-    entries->samplingRatesSupported[2] = 12000000;
-    entries->samplingRatesSupported[3] = 16000000;
-    entries->samplingRatesSupported[4] = 22050000;
-    entries->samplingRatesSupported[5] = 24000000;
-    entries->samplingRatesSupported[6] = 32000000;
-    entries->samplingRatesSupported[7] = 44100000;
-    entries->samplingRatesSupported[8] = 48000000;
-    entries->samplingRatesSupported[9] = 64000000;
-    entries->samplingRatesSupported[10] = 88200000;
-    entries->samplingRatesSupported[11] = 96000000;
+    entries->samplingRatesSupported[1] = 16000000;
+    entries->samplingRatesSupported[2] = 24000000;
+    entries->samplingRatesSupported[3] = 32000000;
+    entries->samplingRatesSupported[4] = 48000000;
     entries->maxChannels = 2;
 
     newNode->pEntry = (void*) entries;
 
     *ppNode = newNode;
+
+    DEBUG_API("<-XACapabilitiesMgr_GetAudioOutputDeviceCapabilities");
     return res;
     }
-

--- a/khronosfws/openmax_al/src/adptcommon/xaframeworkmgr.c	Fri Sep 17 08:33:15 2010 +0300
+++ b/khronosfws/openmax_al/src/adptcommon/xaframeworkmgr.c	Mon Oct 04 00:51:56 2010 +0300
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "xaframeworkmgr.h"
+#include "xadebug.h"
 
 /* Default line width permitted in the cfg file + 2 to hold "\r\n"*/
 #define LINEWIDTH 82
@@ -79,60 +80,65 @@
     FrameworkMap *curNode = NULL;
     FWMgrBool newNode;
     FrameworkMap *frameworkMap = NULL;
+    FILE* fp = NULL;
 
-    FILE* fp = fopen(configFileLocationC, "r");
+    DEBUG_API("->XAFrameworkMgr_CreateFrameworkMap");
+    /* Open file on C drive */
+    DEBUG_INFO("Opening configuration file from C drive...");
+    fp = fopen(configFileLocationC, "r");
     if (fp == NULL)
         {
+        DEBUG_INFO("Opening configuration file from Z drive...");
         fp = fopen(configFileLocationZ, "r");
         }
 
-    if (fp != NULL)
+    if (fp == NULL)
+        {
+        DEBUG_ERR("ERROR: Unable to open configuration file!");
+        DEBUG_API("<-XAFrameworkMgr_CreateFrameworkMap");
+        return NULL;
+        }
+    while ((fgets(buffer, LINEWIDTH, fp) != NULL) && processedEntry)
         {
-        while ((fgets(buffer, LINEWIDTH, fp) != NULL) && processedEntry)
-            {
-            /* keep looping until NULL pointer OR error... */
-            lineNumber++;
-            readSize = strlen(buffer);
-            /* Ignore comments line */
-            if (buffer[0] == '#')
-                continue;
+        /* keep looping until NULL pointer OR error... */
+        lineNumber++;
+        readSize = strlen(buffer);
+        /* Ignore comments line */
+        if (buffer[0] == '#')
+            continue;
 
-            /* Ignore replace "\r\n" with '\0' */
-            if ((readSize >= 2) && (buffer[readSize - 2] == '\r')
-                    && (buffer[readSize - 1] == '\n'))
-                buffer[readSize - 2] = '\0';
-
-            /* Ignore new line... */
-            if (readSize == 2)
-                continue;
+        /* Ignore replace "\r\n" with '\0' */
+        if ((readSize >= 2) && (buffer[readSize - 2] == '\r')
+                && (buffer[readSize - 1] == '\n'))
+            buffer[readSize - 2] = '\0';
 
-            processedEntry = processConfigEntry(buffer, &currentMediaType,
-                    &currentFrameworkType, &currentTagType, &newNode,
-                    &curNode);
-            if (newNode)
+        /* Ignore new line... */
+        if (readSize == 2)
+            continue;
+
+        processedEntry = processConfigEntry(buffer, &currentMediaType,
+                &currentFrameworkType, &currentTagType, &newNode,
+                &curNode);
+        if (newNode)
+            {
+            /*Just link to the last element in the chain*/
+            if (!frameworkMap)
                 {
-                /*Just link to the last element in the chain*/
-                if (!frameworkMap)
+                frameworkMap = curNode;
+                }
+            else
+                {
+                FrameworkMap *lastNode = frameworkMap;
+                while (lastNode->next)
                     {
-                    frameworkMap = curNode;
+                    lastNode = lastNode->next;
                     }
-                else
-                    {
-                    FrameworkMap *lastNode = frameworkMap;
-                    while (lastNode->next)
-                        {
-                        lastNode = lastNode->next;
-                        }
-                    lastNode->next = curNode;
-                    }
+                lastNode->next = curNode;
                 }
             }
-        fclose(fp);
         }
-    else
-        {
-        printf("unable to open config file!\n");
-        }
+    fclose(fp);
+    DEBUG_API("<-XAFrameworkMgr_CreateFrameworkMap");
     return frameworkMap;
     }
 
@@ -145,31 +151,50 @@
     FrameworkMap *node = map;
     int i;
     int loopIndex = 0;
+
+    DEBUG_API("->XAFrameworkMgr_DumpFrameworkMap");
     while (node)
         {
         loopIndex++;
-        printf("%d>", loopIndex);
+        DEBUG_INFO_A1("%d>", loopIndex);
         if (node->moType == FWMgrMOPlayer)
-            printf("MediaPlayer-");
+            {
+            DEBUG_INFO("MediaPlayer-");
+            }
         else if (node->moType == FWMgrMORecorder)
-            printf("MediaRecrdr-");
+            {
+            DEBUG_INFO("MediaRecrdr-");
+            }
         else
-            printf("UKNOWN-");
+            {
+            DEBUG_INFO("UKNOWN-");
+            }
         if (node->fwType == FWMgrFWMMF)
-            printf("MMF-");
+            {
+            DEBUG_INFO("MMF-");
+            }
         else if (node->fwType == FWMgrFWGST)
-            printf("GST-");
+            {
+            DEBUG_INFO("GST-");
+            }
         else
-            printf("UKNOWN-");
-        printf("Scheme[");
+            {
+            DEBUG_INFO("UKNOWN-");
+            }
+        DEBUG_INFO("Scheme[");
         for (i = 0; i < node->uriSchemeCount; i++)
-            printf(" %s", node->uriSchemes[i]);
+            {
+            DEBUG_INFO_A1_STR(" %s", node->uriSchemes[i]);
+            }
         printf("]FileExt[");
         for (i = 0; i < node->fileExtCount; i++)
-            printf(" %s", node->fileExts[i]);
-        printf("]\n");
+            {
+            DEBUG_INFO_A1_STR(" %s", node->fileExts[i]);
+            }
+        DEBUG_INFO("]\n");
         node = node->next;
         }
+    DEBUG_API("<-XAFrameworkMgr_DumpFrameworkMap");
     }
 #endif
 
@@ -181,6 +206,7 @@
     FrameworkMap *node = *map;
     FrameworkMap *nextNode = NULL;
     int i;
+    DEBUG_API("->XAFrameworkMgr_DeleteFrameworkMap");
     while (node)
         {
         for (i = 0; i < node->uriSchemeCount; i++)
@@ -196,6 +222,7 @@
         node = nextNode;
         }
     *map = NULL;
+    DEBUG_API("<-XAFrameworkMgr_DeleteFrameworkMap");
     }
 
 /* FWMgrFwType XAFrameworkMgr_GetFramework
@@ -214,17 +241,21 @@
     int i = 0;
     int copyLen = 0;
 
+    DEBUG_API("->XAFrameworkMgr_GetFramework");
     if (!map || !uri)
         {
-        /* TODO Log invalid uri */
+        DEBUG_ERR("NULL map/uri");
+        DEBUG_API("<-XAFrameworkMgr_GetFramework");
         return retVal;
         }
 
+    DEBUG_INFO_A1_STR("uri[%s]", uri);
     /* Get uri scheme */
     uriScheme = strchr(uri, ':');
     if (uriScheme == NULL)
         {
-        /* TODO Log invalid uri */
+        DEBUG_ERR("malformed URI. Could not find [:]");
+        DEBUG_API("<-XAFrameworkMgr_GetFramework");
         return retVal;
         }
 
@@ -239,7 +270,8 @@
         char* dotLoc = strrchr(uri, '.');
         if (dotLoc == NULL)
             {
-            /* TODO Log invalid uri */
+            DEBUG_ERR("malformed URI. Could not find extension char[.]");
+            DEBUG_API("<-XAFrameworkMgr_GetFramework");
             free(uriScheme);
             return retVal;
             }
@@ -260,8 +292,9 @@
             for (i = 0; i < node->uriSchemeCount; i++)
                 {
                 if (strcasecmp(uriScheme, node->uriSchemes[i]) == 0)
-                    {
+                    {                    
                     uriMatchFound = FWMgrTrue;
+                    DEBUG_INFO_A1_STR("Found macthing framework for scheme[%s]", uriScheme);
                     break;
                     }
                 }
@@ -277,15 +310,17 @@
                     if (strcasecmp(fileExt, node->fileExts[i]) == 0)
                         {
                         fileExtMatchFound = FWMgrTrue;
+                        DEBUG_INFO_A1_STR("Found macthing framework for fileext[%s]", fileExt);
                         break;
                         }
                     }
                 }
 
-            if ((uriMatchFound == FWMgrTrue) && (fileExtMatchFound
-                    == FWMgrTrue))
+            if ((uriMatchFound == FWMgrTrue) &&
+                    (fileExtMatchFound == FWMgrTrue))
                 {
                 retVal = node->fwType;
+                DEBUG_INFO_A1("Framework is[%d]", (int)retVal);
                 break;
                 }
             }
@@ -293,6 +328,7 @@
         }
     free(uriScheme);
     free(fileExt);
+    DEBUG_API("<-XAFrameworkMgr_GetFramework");
     return retVal;
     }
 

--- a/khronosfws/openmax_al/src/common/xacommon.c	Fri Sep 17 08:33:15 2010 +0300
+++ b/khronosfws/openmax_al/src/common/xacommon.c	Mon Oct 04 00:51:56 2010 +0300
@@ -99,7 +99,7 @@
             FILE* file = fopen((char*) fname, "r");
             if (!file)
                 {
-                DEBUG_INFO_A1("%s not found from filesystem", fname);
+                DEBUG_INFO_A1_STR("%s not found from filesystem", (char *)fname);
                 ret = XA_RESULT_CONTENT_NOT_FOUND;
                 }
             else
@@ -251,7 +251,7 @@
         if (counter > 0)
             {
             /*XADataSink and XADataSrc are equivalent, use XADataSink for both*/
-xaSnk            = va_arg(argptr, XADataSink*);
+            xaSnk = va_arg(argptr, XADataSink*);
             }
         if( !xaSnk )
             { /*NULL sinks/sources are possible, not checked here*/
@@ -269,63 +269,63 @@
         switch ( *(XAuint32*)(xaSnk->pLocator) )
             {
             case XA_DEFAULTDEVICEID_AUDIOOUTPUT:
-            DEBUG_INFO("XA_DEFAULTDEVICEID_AUDIOOUTPUT");
-            uri = (XADataLocator_URI*)xaSnk->pLocator;
-            break;
+                DEBUG_INFO("XA_DEFAULTDEVICEID_AUDIOOUTPUT");
+                uri = (XADataLocator_URI*)xaSnk->pLocator;
+                break;
             case XA_DATALOCATOR_URI:
-            DEBUG_INFO("XA_DATALOCATOR_URI");
-            uri = (XADataLocator_URI*)xaSnk->pLocator;
-            if( !uri->URI && !xaSnk->pFormat )
-                {
-                DEBUG_ERR("Invalid parameter set for uri ");
-                ret = XA_RESULT_PARAMETER_INVALID;
-                }
-            break;
-            case XA_DATALOCATOR_NATIVEDISPLAY:
-            DEBUG_INFO("Sink locator type - XA_DATALOCATOR_NATIVEDISPLAY");
-            display = (XADataLocator_NativeDisplay*)(xaSnk->pLocator);
-            if( !display->hDisplay || !display->hWindow )
-                {
-                /*No action at this time*/
-                DEBUG_INFO("Warning - no display or window handle set");
-                }
-            break;
-            case XA_DATALOCATOR_OUTPUTMIX:
-            DEBUG_INFO("Sink locator type - XA_DATALOCATOR_OUTPUTMIX");
-                {
-                omix = (XADataLocator_OutputMix*)(xaSnk->pLocator);
-                if ( !omix->outputMix )
+                DEBUG_INFO("XA_DATALOCATOR_URI");
+                uri = (XADataLocator_URI*)xaSnk->pLocator;
+                if( !uri->URI && !xaSnk->pFormat )
                     {
-                    DEBUG_ERR("Invalid parameter set for outputmix");
+                    DEBUG_ERR("Invalid parameter set for uri ");
                     ret = XA_RESULT_PARAMETER_INVALID;
                     }
-                }
-            break;
+                break;
+            case XA_DATALOCATOR_NATIVEDISPLAY:
+                DEBUG_INFO("Sink locator type - XA_DATALOCATOR_NATIVEDISPLAY");
+                display = (XADataLocator_NativeDisplay*)(xaSnk->pLocator);
+                if( !display->hDisplay || !display->hWindow )
+                    {
+                    /*No action at this time*/
+                    DEBUG_INFO("Warning - no display or window handle set");
+                    }
+                break;
+            case XA_DATALOCATOR_OUTPUTMIX:
+                DEBUG_INFO("Sink locator type - XA_DATALOCATOR_OUTPUTMIX");
+                    {
+                    omix = (XADataLocator_OutputMix*)(xaSnk->pLocator);
+                    if ( !omix->outputMix )
+                        {
+                        DEBUG_ERR("Invalid parameter set for outputmix");
+                        ret = XA_RESULT_PARAMETER_INVALID;
+                        }
+                    }
+                break;
             case XA_DATALOCATOR_ADDRESS:
-            DEBUG_INFO("XA_DATALOCATOR_ADDRESS");
-            address = (XADataLocator_Address*)(xaSnk->pLocator);
-            if( !address->pAddress && !xaSnk->pFormat )
-                {
-                DEBUG_ERR("Invalid parameter set for address");
-                ret = XA_RESULT_PARAMETER_INVALID;
-                }
-            break;
+                DEBUG_INFO("XA_DATALOCATOR_ADDRESS");
+                address = (XADataLocator_Address*)(xaSnk->pLocator);
+                if( !address->pAddress && !xaSnk->pFormat )
+                    {
+                    DEBUG_ERR("Invalid parameter set for address");
+                    ret = XA_RESULT_PARAMETER_INVALID;
+                    }
+                break;
             case XA_DATALOCATOR_IODEVICE:
-            DEBUG_INFO("XA_DATALOCATOR_IODEVICE");
-            iodevice = (XADataLocator_IODevice*)(xaSnk->pLocator);
-            if( iodevice->device )
-                {
-                DEBUG_INFO("Media object as IODevice");
-                }
-            else
-                {
-                DEBUG_INFO("Iodevice id used");
-                }
-            break;
+                DEBUG_INFO("XA_DATALOCATOR_IODEVICE");
+                iodevice = (XADataLocator_IODevice*)(xaSnk->pLocator);
+                if( iodevice->device )
+                    {
+                    DEBUG_INFO("Media object as IODevice");
+                    }
+                else
+                    {
+                    DEBUG_INFO("Iodevice id used");
+                    }
+                break;
             default:
-            DEBUG_ERR("Incorrect data locator for sink.")
-            ret = XA_RESULT_PARAMETER_INVALID;
-            break;
+                DEBUG_ERR("Incorrect data locator for sink.");
+                ret = XA_RESULT_PARAMETER_INVALID;
+                break;
             }
         counter ++;
         }

--- a/khronosfws/openmax_al/src/common/xaconfigextensionsitf.c	Fri Sep 17 08:33:15 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,180 +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 "xaconfigextensionsitf.h"
-
-static XAConfigExtensionsItfImpl* GetImpl(XAConfigExtensionsItf self)
-{
-    if( self )
-    {
-        XAConfigExtensionsItfImpl* impl = (XAConfigExtensionsItfImpl*)(*self);
-        if( impl && (impl == impl->self) )
-        {
-            return impl;
-        }
-    }
-    return NULL;
-}
-
-/**
- * Base interface XAConfigExtensionsItf implementation
- */
-XAresult XAConfigExtensionsItfImpl_SetConfiguration(
-                            XAConfigExtensionsItf self,
-                            const XAchar* configKey,
-                            XAuint32 valueSize,
-                            const void* pConfigValue)
-{
-    XAConfigExtensionsItfImpl* impl = GetImpl(self);
-    XAresult res = XA_RESULT_SUCCESS;
-    DEBUG_API("->XAConfigExtensionsItfImpl_SetConfiguration");
-    if( !impl || !configKey )
-    {
-        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
-        DEBUG_API("<-XAConfigExtensionsItfImpl_SetConfiguration");
-        return XA_RESULT_PARAMETER_INVALID;
-    }
-    if( strcmp((char *)configKey, CPCONFIGKEY) == 0
-        && pConfigValue )
-    {
-        XAuint8 numValue = *(XAuint8*)(pConfigValue);
-        impl->testbufferconf = numValue;
-        if( numValue>4 )
-        {   /* Conformance tester uses only reference-to-string values, try to parse string to integer
-             * First char is enough since legal values are 0 to 4
-             */
-            XAchar* chVal = *(XAchar**)(pConfigValue);
-            if(chVal)
-            {
-                impl->testbufferconf = *chVal;
-                numValue = (*chVal) - 48;
-            }
-            if( numValue>4 )
-            {
-                res = XA_RESULT_PARAMETER_INVALID;
-            }
-        }
-        DEBUG_INFO_A1("CP conf value %d", numValue);
-        if(res == XA_RESULT_SUCCESS)
-        {
-
-            /*Inform adaptation*/
-            if( impl->ctx )
-            {
-/*                res = XAAdaptationBase_SetCPConfiguration(impl->ctx,impl->testbufferconf);*/
-            }
-
-        }
-    }
-    else
-    {
-        DEBUG_ERR("Unknown key or invalid value pointer");
-        res = XA_RESULT_PARAMETER_INVALID;
-    }
-    DEBUG_API("<-XAConfigExtensionsItfImpl_SetConfiguration");
-    return res;
-}
-
-XAresult XAConfigExtensionsItfImpl_GetConfiguration(
-                            XAConfigExtensionsItf self,
-                            const XAchar* configKey,
-                            XAuint32* pValueSize,
-                            void* pConfigValue)
-{
-    XAConfigExtensionsItfImpl* impl = GetImpl(self);
-    XAresult res = XA_RESULT_SUCCESS;
-    DEBUG_API("->XAConfigExtensionsItfImpl_GetConfiguration");
-
-    if( !impl )
-    {
-        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
-        DEBUG_API("<-XAConfigExtensionsItfImpl_SetConfiguration");
-        return XA_RESULT_PARAMETER_INVALID;
-    }
-
-    if( strcmp((char *)configKey, CPCONFIGKEY) == 0
-            && pValueSize
-            && sizeof(XAuint8) <= *pValueSize
-            && pConfigValue )
-    {
-        memcpy(*(XAuint8**)pConfigValue, &(impl->testbufferconf),1);
-        *pValueSize = sizeof(XAuint8);
-        res = XA_RESULT_SUCCESS;
-    }
-    else
-    {
-        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
-        res = XA_RESULT_PARAMETER_INVALID;
-    }
-    DEBUG_API("<-XAConfigExtensionsItfImpl_GetConfiguration");
-    return res;
-}
-
- 
-XAresult XAConfigExtensionsItfImpl_SetContext(XAConfigExtensionsItfImpl* self,XAAdaptationBaseCtx* adptctx)
-    {
-    XAresult res = XA_RESULT_SUCCESS;
-    DEBUG_API("->XAConfigExtensionsItfImpl_SetContext");
-    if( adptctx && self)
-    {
-        self->ctx = adptctx;
-        res = XA_RESULT_SUCCESS;
-    }
-    else
-    {
-        DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
-        res = XA_RESULT_PARAMETER_INVALID;
-    }
-    DEBUG_API("<-XAConfigExtensionsItfImpl_SetContext");
-    return res;
-    }
-
-/**
- * XAConfigExtensionsItfImpl -specific methods
- **/
-XAConfigExtensionsItfImpl* XAConfigExtensionsItfImpl_Create()
-{
-    XAConfigExtensionsItfImpl* self = (XAConfigExtensionsItfImpl*)
-        calloc(1,sizeof(XAConfigExtensionsItfImpl));
-    DEBUG_API("->XAConfigExtensionsItfImpl_Create");
-
-    if(self)
-    {
-        /* init itf default implementation */
-        self->itf.GetConfiguration =
-            XAConfigExtensionsItfImpl_GetConfiguration;
-        self->itf.SetConfiguration =
-            XAConfigExtensionsItfImpl_SetConfiguration;
-        /* init variables */
-        self->self = self;
-    }
-    DEBUG_API("<-XAConfigExtensionsItfImpl_Create");
-    return self;
-}
-
-void XAConfigExtensionsItfImpl_Free(XAConfigExtensionsItfImpl* self)
-{
-    DEBUG_API("->XAConfigExtensionsItfImpl_Free");
-    assert(self==self->self);
-    free(self);
-    DEBUG_API("<-XAConfigExtensionsItfImpl_Free");
-}

--- a/khronosfws/openmax_al/src/common/xaconfigextensionsitf.h	Fri Sep 17 08:33:15 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +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: 
-*
-*/
-
-#ifndef XACONFIGEXTENSIONSITF_H
-#define XACONFIGEXTENSIONSITF_H
-
-#include "xaadptbasectx.h"
-
-/** MACROS **/
-
-/** TYPES **/
-
-/** ENUMERATIONS **/
-
-/** STRUCTURES **/
-/* Definition of XAConfigExtensionsItf implementation */
-typedef struct XAConfigExtensionsItfImpl_
-{
-    /* parent interface */
-    struct XAConfigExtensionsItf_ itf;
-    /* pointer to self */
-    struct XAConfigExtensionsItfImpl_* self;
-    /* variables */
-    XAuint8 testbufferconf;
-   
-    /*Adaptation variables*/
-    XAAdaptationBaseCtx *ctx;
-  
-} XAConfigExtensionsItfImpl;
-
-/* Base interface XAConfigExtensionsItf implementation */
-XAresult XAConfigExtensionsItfImpl_SetConfiguration(
-                            XAConfigExtensionsItf self,
-                            const XAchar* configKey,
-                            XAuint32 valueSize,
-                            const void* pConfigValue);
-
-XAresult XAConfigExtensionsItfImpl_GetConfiguration(
-                            XAConfigExtensionsItf self,
-                            const XAchar* configKey,
-                            XAuint32* pValueSize,
-                            void* pConfigValue);
-
-XAresult XAConfigExtensionsItfImpl_SetContext(XAConfigExtensionsItfImpl* self,XAAdaptationBaseCtx* ctx);
-
-/* XAConfigExtensionsItfImpl -specific methods */
-XAConfigExtensionsItfImpl* XAConfigExtensionsItfImpl_Create(void);
-void XAConfigExtensionsItfImpl_Free(XAConfigExtensionsItfImpl* self);
-
-#endif /* XACONFIGEXTENSIONSITF_H */

--- a/khronosfws/openmax_al/src/common/xadebug.h	Fri Sep 17 08:33:15 2010 +0300
+++ b/khronosfws/openmax_al/src/common/xadebug.h	Mon Oct 04 00:51:56 2010 +0300
@@ -19,6 +19,8 @@
 #ifndef XADEBUG_H
 #define XADEBUG_H
 
+#include "xadebugtraceutility.h"
+
 #define _DEBUG_API_     1
 #define _DEBUG_ERR_     2
 #define _DEBUG_INFO_    4
@@ -42,63 +44,92 @@
 #ifdef _DEBUG
 #include <stdio.h>
     #if ( DEBUG_LEVEL & _DEBUG_API_ )
-        #define DEBUG_API(X) printf(X"\n");
-        #define DEBUG_API_A1(X,A1) printf(X"\n",A1);
-        #define DEBUG_API_A2(X,A1,A2) printf(X"\n",A1,A2);
-        #define DEBUG_API_A3(X,A1,A2,A3) printf(X"\n",A1,A2,A3);
-        #define DEBUG_API_A4(X,A1,A2,A3,A4) printf(X"\n",A1,A2,A3,A4);
-    #else // ( DEBUG_LEVEL & _DEBUG_API_ ) 
+        #define DEBUG_API(X)                    xa_print(X)
+        #define DEBUG_API_A1(X,A1)              xa_print_1(X, A1)
+        #define DEBUG_API_A1_STR(X, A1)         xa_print_1_str(X, A1)
+        #define DEBUG_API_A2(X,A1,A2)           xa_print_2(X, A1, A2)
+        #define DEBUG_API_A2_STR(X, A1, A2)     xa_print_2_str(X, A1, A2)
+        #define DEBUG_API_A3(X,A1,A2,A3)        xa_print_3(X, A1, A2, A3)
+        #define DEBUG_API_A4(X,A1,A2,A3,A4)     xa_print_4(X, A1, A2, A3, A4)
+
+        #define DEBUG_CPP_API(X)                xa_cppprint(X)
+        #define DEBUG_CPP_API_A1(X,A1)          xa_cppprint_1(X, A1)
+        #define DEBUG_CPP_API_A2(X,A1,A2)       xa_cppprint_2(X, A1, A2)
+
+#else // ( DEBUG_LEVEL & _DEBUG_API_ ) 
         #define DEBUG_API(X);
-        #define DEBUG_API_A1(X,A1);
-        #define DEBUG_API_A2(X,A1,A2);
-        #define DEBUG_API_A3(X,A1,A2,A3);
-        #define DEBUG_API_A4(X,A1,A2,A3,A4);
-    #endif // ( DEBUG_LEVEL & _DEBUG_API_ ) 
+        #define DEBUG_API_A1(X,A1)
+        #define DEBUG_API_A1_STR(X, A1)
+        #define DEBUG_API_A2(X,A1,A2)
+        #define DEBUG_API_A2_STR(X, A1, A2)
+        #define DEBUG_API_A3(X,A1,A2,A3)
+        #define DEBUG_API_A4(X,A1,A2,A3,A4)
+
+        #define DEBUG_CPP_API(X)
+        #define DEBUG_CPP_API_A1(X,A1)
+        #define DEBUG_CPP_API_A2(X,A1,A2)
+
+#endif // ( DEBUG_LEVEL & _DEBUG_API_ ) 
 
     #if ( DEBUG_LEVEL & _DEBUG_ERR_ )
-        #define DEBUG_ERR(X) printf("  ERR: "X"\n");
-        #define DEBUG_ERR_A1(X,A1) printf("  ERR: "X"\n",A1);
-        #define DEBUG_ERR_A2(X,A1,A2) printf("  ERR: "X"\n",A1,A2);
-        #define DEBUG_ERR_A3(X,A1,A2,A3) printf("  ERR: "X"\n",A1,A2,A3);
+        #define DEBUG_ERR(X)                    xa_print(X)
+        #define DEBUG_ERR_A1(X,A1)              xa_print_1(X, A1)
+        #define DEBUG_ERR_A1_STR(X,A1)          xa_print_1_str(X, A1)
+        #define DEBUG_ERR_A2(X,A1,A2)           xa_print_2(X, A1, A2)
+        #define DEBUG_ERR_A3(X,A1,A2,A3)        xa_print_3(X, A1, A2, A3)
     #else // ( DEBUG_LEVEL & _DEBUG_ERR_ ) 
-        #define DEBUG_ERR(X);
-        #define DEBUG_ERR_A1(X,A1);
-        #define DEBUG_ERR_A2(X,A1,A2);
-        #define DEBUG_ERR_A3(X,A1,A2,A3);
+        #define DEBUG_ERR(X)
+        #define DEBUG_ERR_A1(X,A1)
+        #define DEBUG_ERR_A1_STR(X,A1)
+        #define DEBUG_ERR_A2(X,A1,A2)
+        #define DEBUG_ERR_A3(X,A1,A2,A3)
     #endif // ( DEBUG_LEVEL & _DEBUG_ERR_ ) 
 
     #if ( DEBUG_LEVEL & _DEBUG_INFO_ )
-        #define DEBUG_INFO(X) printf("  :"X"\n");
-        #define DEBUG_INFO_A1(X,A1) printf("  :"X"\n",A1);
-        #define DEBUG_INFO_A2(X,A1,A2) printf("  :"X"\n",A1,A2);
-        #define DEBUG_INFO_A3(X,A1,A2,A3) printf("  :"X"\n",A1,A2,A3);
-        #define DEBUG_INFO_A4(X,A1,A2,A3,A4) printf("  :"X"\n",A1,A2,A3,A4);
+        #define DEBUG_INFO(X)                   xa_print(X)
+        #define DEBUG_INFO_A1(X,A1)             xa_print_1(X, A1)
+        #define DEBUG_INFO_A1_STR(X, A1)        xa_print_1_str(X, A1)
+        #define DEBUG_INFO_A2(X,A1,A2)          xa_print_2(X, A1, A2)
+        #define DEBUG_INFO_A2_STR(X, A1, A2)    xa_print_2_str(X, A1, A2)
+        #define DEBUG_INFO_A3(X,A1,A2,A3)       xa_print_3(X, A1, A2, A3)
+        #define DEBUG_INFO_A4(X,A1,A2,A3,A4)    xa_print_4(X, A1, A2, A3, A4)
     #else // ( DEBUG_LEVEL & _DEBUG_INFO_ ) 
         #define DEBUG_INFO(X);
-        #define DEBUG_INFO_A1(X,A1);
-        #define DEBUG_INFO_A2(X,A1,A2);
-        #define DEBUG_INFO_A3(X,A1,A2,A3);
-        #define DEBUG_INFO_A4(X,A1,A2,A3,A4);
+        #define DEBUG_INFO_A1(X,A1)
+        #define DEBUG_INFO_A1_STR(X, A1)
+        #define DEBUG_INFO_A2(X,A1,A2)
+        #define DEBUG_INFO_A2_STR(X, A1, A2)
+        #define DEBUG_INFO_A3(X,A1,A2,A3)
+        #define DEBUG_INFO_A4(X,A1,A2,A3,A4)
     #endif // ( DEBUG_LEVEL & _DEBUG_INFO_ )
 
 #else 
 
         #define DEBUG_API(X)
         #define DEBUG_API_A1(X,A1)
+        #define DEBUG_API_A1_STR(X, A1)
         #define DEBUG_API_A2(X,A1,A2)
+        #define DEBUG_API_A2_STR(X, A1, A2)
         #define DEBUG_API_A3(X,A1,A2,A3)
         #define DEBUG_API_A4(X,A1,A2,A3,A4)
 
+        #define DEBUG_CPP_API(X)
+        #define DEBUG_CPP_API_A1(X,A1)
+        #define DEBUG_CPP_API_A2(X,A1,A2)
+
         #define DEBUG_ERR(X)
         #define DEBUG_ERR_A1(X,A1)
+        #define DEBUG_ERR_A1_STR(X,A1)
         #define DEBUG_ERR_A2(X,A1,A2)
         #define DEBUG_ERR_A3(X,A1,A2,A3)
 
         #define DEBUG_INFO(X)
         #define DEBUG_INFO_A1(X,A1)
+        #define DEBUG_INFO_A1_STR(X, A1)
         #define DEBUG_INFO_A2(X,A1,A2)
+        #define DEBUG_INFO_A2_STR(X, A1, A2)
         #define DEBUG_INFO_A3(X,A1,A2,A3)
-        #define DEBUG_INFO_A4(X,A1,A2,A3,A4);
+        #define DEBUG_INFO_A4(X,A1,A2,A3,A4)
 #endif /* _DEBUG */
 
 #endif /* XADEBUG_H */

--- a/khronosfws/openmax_al/src/common/xadynamicsourceitf.c	Fri Sep 17 08:33:15 2010 +0300
+++ b/khronosfws/openmax_al/src/common/xadynamicsourceitf.c	Mon Oct 04 00:51:56 2010 +0300
@@ -17,7 +17,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
 #include "xadynamicsourceitf.h"
 
 #include "xadynamicsourceitfadaptationmmf.h"
@@ -99,7 +98,6 @@
 void XADynamicSourceItfImpl_Free(XADynamicSourceItfImpl* self)
     {
     DEBUG_API("->XADynamicSourceItfImpl_Free");
-    assert( self==self->self );
     free(self);
     DEBUG_API("<-XADynamicSourceItfImpl_Free");
     }

--- a/khronosfws/openmax_al/src/common/xadynintmgmtitf.c	Fri Sep 17 08:33:15 2010 +0300
+++ b/khronosfws/openmax_al/src/common/xadynintmgmtitf.c	Mon Oct 04 00:51:56 2010 +0300
@@ -16,8 +16,6 @@
  */
 
 #include <stdlib.h>
-#include <assert.h>
-
 #include "openmaxalwrapper.h"
 #include "xadynintmgmtitf.h"
 #include "xadebug.h"
@@ -256,7 +254,6 @@
 void XADIMItfImpl_Free(XADIMItfImpl* self)
     {
     DEBUG_API("->XADIMItfImpl_Free");
-    assert(self==self->self);
     XAImpl_DeleteThreadHandle(self->asyncThr);
     free(self);
     DEBUG_API("<-XADIMItfImpl_Free");
@@ -271,8 +268,6 @@
         xaDoRemoveItfImpl doRemove)
     {
     DEBUG_API("->XADIMItfImpl_Init");
-
-    assert(self==self->self && parent && doAdd && doResume && doRemove);
     self->parent = parent;
     self->DoAddItfImpl = doAdd;
     self->DoResumeItfImpl = doResume;

--- a/khronosfws/openmax_al/src/common/xaglobals.h	Fri Sep 17 08:33:15 2010 +0300
+++ b/khronosfws/openmax_al/src/common/xaglobals.h	Mon Oct 04 00:51:56 2010 +0300
@@ -44,7 +44,8 @@
     XA_VOLUMEITFEVENTS = 0x400,
     XA_NOKIALINEARVOLITFEVENTS = 0x800,
     XA_NOKIAEXTVOLITFEVENTS = 0x1000,
-    XA_ADDMORETYPES = 0x2000
+    XA_STREAMINFOEVENTS = 0x2000,
+    XA_OBJECTITFEVENTS = 0x4000
     } XAAdaptEventTypes;
 
 typedef enum

--- a/khronosfws/openmax_al/src/common/xametadataextractionitf.c	Fri Sep 17 08:33:15 2010 +0300
+++ b/khronosfws/openmax_al/src/common/xametadataextractionitf.c	Mon Oct 04 00:51:56 2010 +0300
@@ -18,13 +18,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 
 #include "xametadataextractionitf.h"
 #include "xadebug.h"
-
-#include "xametadataadaptation.h"
-
 #include "xaadaptationmmf.h"
 #include "xametadataadaptctxmmf.h"
 #include "xamediaplayeradaptctxmmf.h"
@@ -108,15 +104,7 @@
                 }
             else
                 {
-                if (impl->filteringOn)
-                    {
-                    *pItemCount = impl->filteredcount;
-                    }
-                else
-                    {
-                    *pItemCount = impl->currentTags.itemcount;
-                    }
-                res = XA_RESULT_SUCCESS;
+                res = XA_RESULT_PARAMETER_INVALID;
                 }
             }
         else
@@ -144,7 +132,7 @@
     {
     XAMetadataExtractionItfImpl *impl = NULL;
     XAresult res = XA_RESULT_SUCCESS;
-    XAuint32 newidx = 0;
+    
     DEBUG_API("->XAMetadataExtractionItfImpl_GetKeySize");
 
     impl = GetImpl(self);
@@ -171,17 +159,7 @@
         }
     else
         {
-        /* check index and return unfiltered index */
-        if (CheckAndUnfilterIndex(impl, index, &newidx) != XA_RESULT_SUCCESS)
-            {
-            DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
-            DEBUG_API("<-XAMetadataExtractionItfImpl_GetKeySize");
-            return XA_RESULT_PARAMETER_INVALID;
-            }
-
-        /* size = size of struct + size of data - 1 (struct size already includes one char) */
-        *pKeySize = sizeof(XAMetadataInfo)
-                + impl->currentTags.mdeKeys[newidx]->size - 1;
+        res = XA_RESULT_PARAMETER_INVALID;
         }
 
     DEBUG_API_A1("<-XAMetadataExtractionItfImpl_GetKeySize (%d)", (int)res);
@@ -202,11 +180,7 @@
     {
     XAMetadataExtractionItfImpl *impl = NULL;
     XAresult res = XA_RESULT_SUCCESS;
-    XAuint32 newidx = 0;
 
-    XAuint32 neededsize = 0;
-
-    XAuint32 newdatasize = 0;
     DEBUG_API("->XAMetadataExtractionItfImpl_GetKey");
 
     impl = GetImpl(self);
@@ -234,36 +208,7 @@
         }
     else
         {
-
-        /* check index and return unfiltered index */
-        if (CheckAndUnfilterIndex(impl, index, &newidx) != XA_RESULT_SUCCESS)
-            {
-            DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
-            DEBUG_API("<-XAMetadataExtractionItfImpl_GetKey");
-            return XA_RESULT_PARAMETER_INVALID;
-            }
-
-        /* needed size = size of struct + size of data - 1 (struct size already includes one char) */
-        neededsize = sizeof(XAMetadataInfo)
-                + impl->currentTags.mdeKeys[newidx]->size - 1;
-        if (keySize < neededsize)
-            { /* cannot fit all of key data */
-            newdatasize = impl->currentTags.mdeKeys[newidx]->size
-                    - (neededsize - keySize);
-            DEBUG_ERR("XA_RESULT_BUFFER_INSUFFICIENT");
-            res = XA_RESULT_BUFFER_INSUFFICIENT;
-            }
-        else
-            {
-            newdatasize = impl->currentTags.mdeKeys[newidx]->size;
-            res = XA_RESULT_SUCCESS;
-            }
-        /* copy data up to given size */
-        memcpy(pKey, impl->currentTags.mdeKeys[newidx], keySize - 1);
-        /* ensure null-termination */
-
-        memset(pKey->data + newdatasize - 1, 0, 1);
-        pKey->size = newdatasize;
+        res = XA_RESULT_PARAMETER_INVALID;
         }
 
     DEBUG_API_A1("<-XAMetadataExtractionItfImpl_GetKey (%d)", (int)res);
@@ -282,7 +227,7 @@
     {
     XAMetadataExtractionItfImpl *impl = NULL;
     XAresult res = XA_RESULT_SUCCESS;
-    XAuint32 newidx = 0;
+
     DEBUG_API("->XAMetadataExtractionItfImpl_GetValueSize");
 
     impl = GetImpl(self);
@@ -309,17 +254,7 @@
         }
     else
         {
-        /* check index and return unfiltered index */
-        if (CheckAndUnfilterIndex(impl, index, &newidx) != XA_RESULT_SUCCESS)
-            {
-            DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
-            DEBUG_API("<-XAMetadataExtractionItfImpl_GetValueSize");
-            return XA_RESULT_PARAMETER_INVALID;
-            }
-
-        /* size = size of struct + size of data - 1 (struct size already includes one char) */
-        *pValueSize = sizeof(XAMetadataInfo)
-                + impl->currentTags.mdeValues[newidx]->size - 1;
+        res = XA_RESULT_PARAMETER_INVALID;
         }
 
     DEBUG_API_A1("<-XAMetadataExtractionItfImpl_GetValueSize (%d)", (int)res);
@@ -340,11 +275,7 @@
     {
     XAMetadataExtractionItfImpl *impl = NULL;
     XAresult res = XA_RESULT_SUCCESS;
-    XAuint32 newidx = 0;
 
-    XAuint32 neededsize = 0;
-
-    XAuint32 newdatasize = 0;
     DEBUG_API("->XAMetadataExtractionItfImpl_GetValue");
 
     impl = GetImpl(self);
@@ -372,36 +303,7 @@
         }
     else
         {
-        /* check index and return unfiltered index */
-        if (CheckAndUnfilterIndex(impl, index, &newidx) != XA_RESULT_SUCCESS)
-            {
-            DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
-            DEBUG_API("<-XAMetadataExtractionItfImpl_GetValue");
-            return XA_RESULT_PARAMETER_INVALID;
-            }
-
-        /* needed size = size of struct + size of data - 1 (struct size already includes one char) */
-        neededsize = sizeof(XAMetadataInfo)
-                + impl->currentTags.mdeValues[newidx]->size - 1;
-        if (valueSize < neededsize)
-            { /* cannot fit all of key data */
-            newdatasize = impl->currentTags.mdeValues[newidx]->size
-                    - (neededsize - valueSize);
-            DEBUG_ERR("XA_RESULT_BUFFER_INSUFFICIENT");
-            res = XA_RESULT_BUFFER_INSUFFICIENT;
-            }
-        else
-            {
-            newdatasize = impl->currentTags.mdeValues[newidx]->size;
-            res = XA_RESULT_SUCCESS;
-            }
-        /* copy data up to given size */
-        memcpy(pValue, impl->currentTags.mdeValues[newidx], valueSize - 1);
-        /* ensure null-termination */
-
-        memset(pValue->data + newdatasize - 1, 0, 1);
-
-        pValue->size = newdatasize;
+        res = XA_RESULT_PARAMETER_INVALID;
         }
 
     DEBUG_API_A1("<-XAMetadataExtractionItfImpl_GetValue (%d)",(int)res);
@@ -430,11 +332,8 @@
     {
     XAresult res = XA_RESULT_SUCCESS;
 
-    XAuint32 idx = 0;
-    XAuint8 matchMask = 0;
+    XAMetadataExtractionItfImpl *impl = NULL;
 
-    XAMetadataExtractionItfImpl *impl = NULL;
-    const XAchar* parsedkey;
     impl = GetImpl(self);
 
     DEBUG_API("->XAMetadataExtractionItfImpl_AddKeyFilter");
@@ -455,54 +354,8 @@
             }
         else
             {
-            impl->filteringOn = XA_BOOLEAN_TRUE;
-            for (idx = 0; idx < impl->currentTags.itemcount; idx++)
-                {
-                if ((filterMask & XA_METADATA_FILTER_KEY) && pKey)
-                    {
-                    parsedkey = XAMetadataAdapt_ParseKhronosKey(pKey);
-                    if (strcmp((char*) parsedkey,
-                            (char*) impl->currentTags.mdeKeys[idx]->data)
-                            == 0)
-                        {
-                        matchMask |= XA_METADATA_FILTER_KEY;
-                        }
-                    }
-                if (filterMask & XA_METADATA_FILTER_LANG && pValueLangCountry)
-                    {
-                    if (strcmp(
-                            (char*) pValueLangCountry,
-                            (char*) impl->currentTags.mdeKeys[idx]->langCountry)
-                            == 0)
-                        {
-                        matchMask |= XA_METADATA_FILTER_LANG;
-                        }
-                    }
-                if (filterMask & XA_METADATA_FILTER_ENCODING)
-                    {
-                    if (keyEncoding
-                            == impl->currentTags.mdeKeys[idx]->encoding)
-                        {
-                        matchMask |= XA_METADATA_FILTER_ENCODING;
-                        }
-                    if (valueEncoding
-                            == impl->currentTags.mdeValues[idx]->encoding)
-                        {
-                        matchMask |= XA_METADATA_FILTER_ENCODING;
-                        }
-                    }
-                /* check if all filters apply */
-                if (filterMask == matchMask)
-                    {
-                    if (impl->tagmatchesfilter[idx] == XA_BOOLEAN_FALSE)
-                        {
-                        impl->tagmatchesfilter[idx] = XA_BOOLEAN_TRUE;
-                        impl->filteredcount++;
-                        }
-                    }
-                /*reset matchmask*/
-                matchMask = 0;
-                }
+            DEBUG_API("<-XAMetadataExtractionItfImpl_AddKeyFilter Not Supported in GST");
+            res = XA_RESULT_PARAMETER_INVALID;
             }
         }
     DEBUG_API_A1("<-XAMetadataExtractionItfImpl_AddKeyFilter (%d)", (int)res);
@@ -518,8 +371,6 @@
     XAMetadataExtractionItfImpl *impl = NULL;
     XAresult res = XA_RESULT_SUCCESS;
 
-    XAuint32 idx = 0;
-
     DEBUG_API("->XAMetadataExtractionItfImpl_ClearKeyFilter");
     impl = GetImpl(self);
     if (!impl)
@@ -537,17 +388,8 @@
             }
         else
             {
-            if (impl->tagmatchesfilter)
-                {
-
-                for (idx = 0; idx < impl->currentTags.itemcount; idx++)
-                    {
-                    impl->tagmatchesfilter[idx] = XA_BOOLEAN_FALSE;
-                    }
-
-                }
-            impl->filteredcount = 0;
-            impl->filteringOn = XA_BOOLEAN_FALSE;
+            DEBUG_API("<-XAMetadataExtractionItfImpl_ClearKeyFilter Not Supported in GST");
+            res = XA_RESULT_PARAMETER_INVALID;
             }
         }
 
@@ -583,9 +425,6 @@
         self->itf.ClearKeyFilter = XAMetadataExtractionItfImpl_ClearKeyFilter;
 
         /* init variables */
-        self->filteredcount = 0;
-        self->filteringOn = XA_BOOLEAN_FALSE;
-
         self->adaptCtx = adaptCtx;
 
         if (self->adaptCtx->fwtype != FWMgrFWMMF)
@@ -608,18 +447,11 @@
 void XAMetadataExtractionItfImpl_Free(XAMetadataExtractionItfImpl* self)
     {
     DEBUG_API("->XAMetadataExtractionItfImpl_Free");
-    assert(self==self->self);
 
     if (self->adaptCtx->fwtype != FWMgrFWMMF)
         {
         XAAdaptationBase_RemoveEventHandler(self->adaptCtx,
                 &XAMetadataExtractionItfImp_AdaptCb);
-        XAMetadataAdapt_FreeImplTagList(&(self->currentTags), XA_BOOLEAN_TRUE);
-
-        if (self->tagmatchesfilter)
-            {
-            free(self->tagmatchesfilter);
-            }
         }
 
     free(self);
@@ -641,73 +473,8 @@
         DEBUG_API("<-XAMetadataExtractionItfImp_AdaptCb");
         return;
         }
-    if (event && event->eventid == XA_ADAPT_MDE_TAGS_AVAILABLE)
-        {
-        /* get the tag list */
-        XAMetadataExtractionItfAdapt_FillTagList(
-                (XAAdaptationGstCtx*) impl->adaptCtx, &(impl->currentTags));
-        if (impl->tagmatchesfilter)
-            {
-            free(impl->tagmatchesfilter);
-            }
-        impl->tagmatchesfilter = calloc(impl->currentTags.itemcount,
-                sizeof(XAboolean));
-        impl->filteredcount = 0;
-        }
-    else
-        {
-        DEBUG_INFO("unhandled");
-        }
+    DEBUG_INFO("unhandled");
     DEBUG_API("<-XAMetadataExtractionItfImp_AdaptCb");
     }
 
-/* For given index over filtered array, return index over whole array
- */
-XAresult CheckAndUnfilterIndex(XAMetadataExtractionItfImpl *impl,
-        XAuint32 oldidx, XAuint32 *newidx)
-    {
-    DEBUG_API("->CheckAndUnfilterIndex");
 
-    if (impl->filteringOn)
-        {
-        XAint16 i = -1;
-        if (oldidx >= impl->filteredcount)
-            {
-            DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
-            DEBUG_API("<-CheckAndUnfilterIndex");
-            return XA_RESULT_PARAMETER_INVALID;
-            }
-        *newidx = 0;
-        while (*newidx < impl->currentTags.itemcount)
-            {
-            if (impl->tagmatchesfilter[*newidx])
-                i++;
-            if (i < oldidx)
-                (*newidx)++;
-            else
-                break;
-            }
-        if (*newidx == impl->currentTags.itemcount)
-            {
-            /* should not end up here */
-            *newidx = 0;
-            DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
-            DEBUG_API("<-CheckAndUnfilterIndex");
-            return XA_RESULT_PARAMETER_INVALID;
-            }
-        }
-    else
-        {
-        if (oldidx >= impl->currentTags.itemcount)
-            {
-            DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
-            DEBUG_API("<-CheckAndUnfilterIndex");
-            return XA_RESULT_PARAMETER_INVALID;
-            }
-        *newidx = oldidx;
-        }
-
-    DEBUG_API("<-CheckAndUnfilterIndex");
-    return XA_RESULT_SUCCESS;
-    }
-

--- a/khronosfws/openmax_al/src/common/xametadataextractionitf.h	Fri Sep 17 08:33:15 2010 +0300
+++ b/khronosfws/openmax_al/src/common/xametadataextractionitf.h	Mon Oct 04 00:51:56 2010 +0300
@@ -19,7 +19,6 @@
 #define XAMETADATAEXTRACTIONITF_H
 
 #include "xaadptbasectx.h"
-#include "xametadataadaptation.h"
 
 /** MACROS **/
 
@@ -37,12 +36,6 @@
     struct XAMetadataExtractionItfImpl_* self;
 
     /* variables */
-    XAuint32 filteredcount;
-    XAboolean* tagmatchesfilter;
-    XAboolean filteringOn;
-
-    XAMetadataImplTagList currentTags;
-
     XAAdaptationBaseCtx *adaptCtx;
 
     } XAMetadataExtractionItfImpl;
@@ -81,7 +74,7 @@
 void XAMetadataExtractionItfImpl_Free(XAMetadataExtractionItfImpl* self);
 
 /* internal methods */
-XAresult CheckAndUnfilterIndex(XAMetadataExtractionItfImpl *impl,
-        XAuint32 oldidx, XAuint32 *newidx);
+/*XAresult CheckAndUnfilterIndex(XAMetadataExtractionItfImpl *impl,
+        XAuint32 oldidx, XAuint32 *newidx);*/
 
 #endif /* XAMETADATAEXTRACTIONITF_H */

--- a/khronosfws/openmax_al/src/common/xanokialinearvolumeitf.c	Fri Sep 17 08:33:15 2010 +0300
+++ b/khronosfws/openmax_al/src/common/xanokialinearvolumeitf.c	Mon Oct 04 00:51:56 2010 +0300
@@ -17,7 +17,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
 
 #include "xanlinearvolumeitf.h"
 #include "xanokialinearvolumeitfadaptationmmf.h"
@@ -277,7 +276,6 @@
 void XANokiaLinearVolumeItfImpl_Free(XANokiaLinearVolumeItfImpl* self)
     {
     DEBUG_API("->XANokiaLinearVolumeItfImpl_Free");
-    assert(self==self->self);
     free(self);
     DEBUG_API("<-XANokiaLinearVolumeItfImpl_Free");
     }
@@ -310,5 +308,9 @@
                     XA_NOKIALINEARVOLUME_EVENT_VOLUME_CHANGED, eventBoolean);
             }
         }
+    else
+        {
+        /* do nothing */
+        }
     DEBUG_API("<-XANokiaLinearVolumeItfimpl_AdaptCb");
     }

--- a/khronosfws/openmax_al/src/common/xanokiavolumeextitf.c	Fri Sep 17 08:33:15 2010 +0300
+++ b/khronosfws/openmax_al/src/common/xanokiavolumeextitf.c	Mon Oct 04 00:51:56 2010 +0300
@@ -17,7 +17,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
 
 #include "xanvolumeextitf.h"
 #include "xanokiavolumeextitfadaptationmmf.h"
@@ -479,7 +478,6 @@
 void XANokiaVolumeExtItfImpl_Free(XANokiaVolumeExtItfImpl* self)
     {
     DEBUG_API("->XANokiaVolumeExtItfImpl_Free");
-    assert(self==self->self);
     free(self);
     DEBUG_API("<-XANokiaVolumeExtItfImpl_Free");
     }
@@ -500,7 +498,6 @@
         DEBUG_API("<-XANokiaVolumeExtItfImpl_AdaptCb");
         return;
         }
-    assert(event);
 
     if (event->eventid == XA_ADAPT_VOLUME_MUTE_CHANGED && impl->callback)
         {