diff -r 2ed61feeead6 -r 6f7ceef7b1d1 khronosfws/openmax_al/src/mediaplayer/xaseekitf.c
--- a/khronosfws/openmax_al/src/mediaplayer/xaseekitf.c	Fri May 28 19:26:28 2010 -0500
+++ b/khronosfws/openmax_al/src/mediaplayer/xaseekitf.c	Fri Jun 11 19:59:23 2010 -0500
@@ -1,19 +1,19 @@
 /*
-* 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: 
-*
-*/
+ * 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: Seek Itf Implementation
+ *
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,17 +31,17 @@
  * Description: Validate interface pointer and cast it to implementation pointer.
  */
 static XASeekItfImpl* GetImpl(XASeekItf self)
-{
-    if(self)
     {
-        XASeekItfImpl* impl = (XASeekItfImpl*)(*self);
-        if(impl && impl == impl->self)
+    if (self)
         {
+        XASeekItfImpl* impl = (XASeekItfImpl*) (*self);
+        if (impl && impl == impl->self)
+            {
             return impl;
+            }
         }
+    return NULL;
     }
-    return NULL;
-}
 
 /**
  * Base interface XASeekItf implementation
@@ -53,28 +53,29 @@
  * Description: Sets the position of the playback head.
  **/
 XAresult XASeekItfImpl_SetPosition(XASeekItf self, XAmillisecond pos,
-                                   XAuint32 seekMode)
-{
+        XAuint32 seekMode)
+    {
     XAresult ret = XA_RESULT_SUCCESS;
     XAmillisecond duration = 0;
     XASeekItfImpl* impl = GetImpl(self);
     DEBUG_API("->XASeekItfImpl_SetPosition");
     XA_IMPL_THREAD_SAFETY_ENTRY( XATSMediaPlayer );
 
-    if(!impl)
-    {
+    if (!impl)
+        {
         /* invalid parameter */
         XA_IMPL_THREAD_SAFETY_EXIT( XATSMediaPlayer );
         DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
         DEBUG_API("<-XASeekItfImpl_SetPosition");
         return XA_RESULT_PARAMETER_INVALID;
-    }
+        }
 
-
-    if(impl->adapCtx->fwtype == FWMgrFWMMF)
+    if (impl->adapCtx->fwtype == FWMgrFWMMF)
         {
         /* Get duration of the content */
-        if(XAPlayItfAdaptMMF_GetDuration((XAAdaptationBaseCtx*)impl->adapCtx, &duration) != XA_RESULT_SUCCESS)
+        if (XAPlayItfAdaptMMF_GetDuration(
+                (XAAdaptationBaseCtx*) impl->adapCtx, &duration)
+                != XA_RESULT_SUCCESS)
             {
             /* invalid parameter */
             XA_IMPL_THREAD_SAFETY_EXIT( XATSMediaPlayer );
@@ -82,7 +83,7 @@
             DEBUG_API("<-XASeekItfImpl_SetPosition");
             return XA_RESULT_PARAMETER_INVALID;
             }
-        if(pos > duration)
+        if (pos > duration)
             {
             /* invalid parameter */
             XA_IMPL_THREAD_SAFETY_EXIT( XATSMediaPlayer );
@@ -90,8 +91,8 @@
             DEBUG_API("<-XASeekItfImpl_SetPosition");
             return XA_RESULT_PARAMETER_INVALID;
             }
-    
-        if(seekMode != XA_SEEKMODE_FAST && seekMode != XA_SEEKMODE_ACCURATE)
+
+        if (seekMode != XA_SEEKMODE_FAST && seekMode != XA_SEEKMODE_ACCURATE)
             {
             /* seek mode unsupported */
             XA_IMPL_THREAD_SAFETY_EXIT( XATSMediaPlayer );
@@ -99,9 +100,9 @@
             DEBUG_API("<-XASeekItfImpl_SetPosition");
             return XA_RESULT_FEATURE_UNSUPPORTED;
             }
-    
+
         ret = XASeekItfAdaptMMF_SetPosition(impl->adapCtx, pos, seekMode);
-        if(ret == XA_RESULT_SUCCESS)
+        if (ret == XA_RESULT_SUCCESS)
             {
             impl->playbackPosition = pos;
             impl->seekMode = seekMode;
@@ -110,7 +111,9 @@
     else
         {
         /* Get duration of the content */
-        if(XAPlayItfAdaptGST_GetDuration((XAAdaptationGstCtx*)impl->adapCtx, &duration) != XA_RESULT_SUCCESS)
+        if (XAPlayItfAdaptGST_GetDuration(
+                (XAAdaptationGstCtx*) impl->adapCtx, &duration)
+                != XA_RESULT_SUCCESS)
             {
             /* invalid parameter */
             XA_IMPL_THREAD_SAFETY_EXIT( XATSMediaPlayer );
@@ -118,7 +121,7 @@
             DEBUG_API("<-XASeekItfImpl_SetPosition");
             return XA_RESULT_PARAMETER_INVALID;
             }
-        if(pos > duration)
+        if (pos > duration)
             {
             /* invalid parameter */
             XA_IMPL_THREAD_SAFETY_EXIT( XATSMediaPlayer );
@@ -126,8 +129,8 @@
             DEBUG_API("<-XASeekItfImpl_SetPosition");
             return XA_RESULT_PARAMETER_INVALID;
             }
-    
-        if(seekMode != XA_SEEKMODE_FAST && seekMode != XA_SEEKMODE_ACCURATE)
+
+        if (seekMode != XA_SEEKMODE_FAST && seekMode != XA_SEEKMODE_ACCURATE)
             {
             /* seek mode unsupported */
             XA_IMPL_THREAD_SAFETY_EXIT( XATSMediaPlayer );
@@ -135,20 +138,21 @@
             DEBUG_API("<-XASeekItfImpl_SetPosition");
             return XA_RESULT_FEATURE_UNSUPPORTED;
             }
-    
-        ret = XASeekItfAdapt_SetPosition((XAAdaptationGstCtx*)impl->adapCtx, pos, seekMode);
-        if(ret == XA_RESULT_SUCCESS)
+
+        ret = XASeekItfAdapt_SetPosition((XAAdaptationGstCtx*) impl->adapCtx,
+                pos, seekMode);
+        if (ret == XA_RESULT_SUCCESS)
             {
             impl->playbackPosition = pos;
             impl->seekMode = seekMode;
             }
-    
+
         }
 
     XA_IMPL_THREAD_SAFETY_EXIT( XATSMediaPlayer );
     DEBUG_API("<-XASeekItfImpl_SetPosition");
     return ret;
-}
+    }
 
 /**
  * XAresult XASeekItfImpl_SetLoop(XASeekItf self, XAboolean loopEnable,
@@ -156,27 +160,29 @@
  * Description: Enables or disables looping and sets the start and end points of looping.
  **/
 XAresult XASeekItfImpl_SetLoop(XASeekItf self, XAboolean loopEnable,
-                               XAmillisecond startPos, XAmillisecond endPos)
-{
+        XAmillisecond startPos, XAmillisecond endPos)
+    {
     XAresult ret = XA_RESULT_SUCCESS;
     XAmillisecond duration = 0;
     XASeekItfImpl* impl = GetImpl(self);
     DEBUG_API_A2("->XASeekItfImpl_SetLoop, startPos:%lu, endPos:%lu", startPos, endPos);
     XA_IMPL_THREAD_SAFETY_ENTRY( XATSMediaPlayer );
 
-    if(!impl || (startPos > endPos))
-    {
+    if (!impl || (startPos > endPos))
+        {
         /* invalid parameter */
         XA_IMPL_THREAD_SAFETY_EXIT( XATSMediaPlayer );
         DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
         DEBUG_API("<-XASeekItfImpl_SetLoop");
         return XA_RESULT_PARAMETER_INVALID;
-    }
+        }
 
-    if(impl->adapCtx->fwtype == FWMgrFWMMF)
+    if (impl->adapCtx->fwtype == FWMgrFWMMF)
         {
         /* Get duration of the content */
-        if(XAPlayItfAdaptMMF_GetDuration((XAAdaptationBaseCtx*)impl->adapCtx, &duration) != XA_RESULT_SUCCESS)
+        if (XAPlayItfAdaptMMF_GetDuration(
+                (XAAdaptationBaseCtx*) impl->adapCtx, &duration)
+                != XA_RESULT_SUCCESS)
             {
             /* invalid parameter */
             XA_IMPL_THREAD_SAFETY_EXIT( XATSMediaPlayer );
@@ -184,7 +190,7 @@
             DEBUG_API("<-XASeekItfImpl_SetLoop");
             return XA_RESULT_PARAMETER_INVALID;
             }
-        if(endPos > duration && endPos != XA_TIME_UNKNOWN)
+        if (endPos > duration && endPos != XA_TIME_UNKNOWN)
             {
             /* invalid parameter */
             XA_IMPL_THREAD_SAFETY_EXIT( XATSMediaPlayer );
@@ -192,19 +198,22 @@
             DEBUG_API("<-XASeekItfImpl_SetLoop");
             return XA_RESULT_PARAMETER_INVALID;
             }
-    
-        ret = XASeekItfAdaptMMF_SetLoop(impl->adapCtx, loopEnable, startPos, endPos);
-        if(ret == XA_RESULT_SUCCESS)
+
+        ret = XASeekItfAdaptMMF_SetLoop(impl->adapCtx, loopEnable, startPos,
+                endPos);
+        if (ret == XA_RESULT_SUCCESS)
             {
             impl->loopEnable = loopEnable;
             impl->startPos = startPos;
             impl->endPos = endPos;
-            }    
+            }
         }
     else
         {
         /* Get duration of the content */
-        if(XAPlayItfAdaptGST_GetDuration((XAAdaptationGstCtx*)impl->adapCtx, &duration) != XA_RESULT_SUCCESS)
+        if (XAPlayItfAdaptGST_GetDuration(
+                (XAAdaptationGstCtx*) impl->adapCtx, &duration)
+                != XA_RESULT_SUCCESS)
             {
             /* invalid parameter */
             XA_IMPL_THREAD_SAFETY_EXIT( XATSMediaPlayer );
@@ -212,7 +221,7 @@
             DEBUG_API("<-XASeekItfImpl_SetLoop");
             return XA_RESULT_PARAMETER_INVALID;
             }
-        if(endPos > duration && endPos != XA_TIME_UNKNOWN)
+        if (endPos > duration && endPos != XA_TIME_UNKNOWN)
             {
             /* invalid parameter */
             XA_IMPL_THREAD_SAFETY_EXIT( XATSMediaPlayer );
@@ -220,21 +229,22 @@
             DEBUG_API("<-XASeekItfImpl_SetLoop");
             return XA_RESULT_PARAMETER_INVALID;
             }
-    
-        ret = XASeekItfAdapt_SetLoop((XAAdaptationGstCtx*)impl->adapCtx, loopEnable, startPos, endPos);
-        if(ret == XA_RESULT_SUCCESS)
+
+        ret = XASeekItfAdapt_SetLoop((XAAdaptationGstCtx*) impl->adapCtx,
+                loopEnable, startPos, endPos);
+        if (ret == XA_RESULT_SUCCESS)
             {
             impl->loopEnable = loopEnable;
             impl->startPos = startPos;
             impl->endPos = endPos;
             }
-    
+
         }
 
     XA_IMPL_THREAD_SAFETY_EXIT( XATSMediaPlayer );
     DEBUG_API("<-XASeekItfImpl_SetLoop");
     return ret;
-}
+    }
 
 /**
  * XAresult XASeekItfImpl_GetLoop(XASeekItf self, XAboolean *pLoopEnabled,
@@ -243,21 +253,20 @@
  * Description: Queries whether looping is enabled or disabled, and retrieves loop points.
  **/
 XAresult XASeekItfImpl_GetLoop(XASeekItf self, XAboolean *pLoopEnabled,
-                               XAmillisecond *pStartPos,
-                               XAmillisecond *pEndPos)
-{
+        XAmillisecond *pStartPos, XAmillisecond *pEndPos)
+    {
     XAresult ret = XA_RESULT_SUCCESS;
 
     XASeekItfImpl* impl = GetImpl(self);
     DEBUG_API("->XASeekItfImpl_GetLoop");
 
-    if(!impl || !pLoopEnabled || !pStartPos || !pEndPos)
-    {
+    if (!impl || !pLoopEnabled || !pStartPos || !pEndPos)
+        {
         DEBUG_ERR("XA_RESULT_PARAMETER_INVALID");
         DEBUG_API("<-XASeekItfImpl_GetLoop");
         /* invalid parameter */
         return XA_RESULT_PARAMETER_INVALID;
-    }
+        }
 
     *pLoopEnabled = impl->loopEnable;
     *pStartPos = impl->startPos;
@@ -265,7 +274,7 @@
 
     DEBUG_API("<-XASeekItfImpl_GetLoop");
     return ret;
-}
+    }
 
 /**
  * XASeekItfImpl -specific methods
@@ -275,13 +284,12 @@
  * XASeekItfImpl* XASeekItfImpl_Create()
  * Description: Allocate and initialize SeekItfImpl.
  **/
-XASeekItfImpl* XASeekItfImpl_Create(  XAMediaPlayerImpl* impl )
-{
-    XASeekItfImpl *self = (XASeekItfImpl*)
-        calloc(1,sizeof(XASeekItfImpl));
+XASeekItfImpl* XASeekItfImpl_Create(XAMediaPlayerImpl* impl)
+    {
+    XASeekItfImpl *self = (XASeekItfImpl*) calloc(1, sizeof(XASeekItfImpl));
     DEBUG_API("->XASeekItfImpl_Create");
-    if(self)
-    {
+    if (self)
+        {
         /* init itf default implementation */
         self->itf.GetLoop = XASeekItfImpl_GetLoop;
         self->itf.SetLoop = XASeekItfImpl_SetLoop;
@@ -297,19 +305,21 @@
         self->adapCtx = impl->curAdaptCtx;
 
         self->self = self;
+        }DEBUG_API("<-XASeekItfImpl_Create");
+    return self;
     }
-    DEBUG_API("<-XASeekItfImpl_Create");
-    return self;
-}
 
 /**
  * void XASeekItfImpl_Free(XASeekItfImpl* self)
  * Description: Free all resources reserved at XASeekItfImpl_Create.
  **/
 void XASeekItfImpl_Free(XASeekItfImpl* self)
-{
+    {
     DEBUG_API("->XASeekItfImpl_Free");
     assert(self==self->self);
-    free(self);
+    if(self)
+        {
+        free(self);
+        }
     DEBUG_API("<-XASeekItfImpl_Free");
-}
+    }