--- a/package_definition.xml	Mon Nov 23 14:47:47 2009 +0200
+++ b/package_definition.xml	Thu Dec 17 08:46:53 2009 +0200
@@ -18,10 +18,10 @@
       </component>
     </collection>
     <collection id="vtprotocolplugins" name="VT Protocol Plugins" level="plugin">
-      <component id="displaysink" filter="s60" name="Display Sink" introduced="tb91">
+      <component id="displaysink" filter="s60" name="Display Sink" introduced="^2">
         <unit bldFile="vtprotocolplugins/displaysink/group"/>
       </component>
-      <component id="videosource" filter="s60" name="Video Source" introduced="tb91">
+      <component id="videosource" filter="s60" name="Video Source" introduced="^2">
         <unit bldFile="vtprotocolplugins/videosource/group"/>
       </component>
     </collection>

--- a/vtengines/videoteleng/Inc/Media/CVtEngDrawNGA.h	Mon Nov 23 14:47:47 2009 +0200
+++ b/vtengines/videoteleng/Inc/Media/CVtEngDrawNGA.h	Thu Dec 17 08:46:53 2009 +0200
@@ -445,9 +445,11 @@
         TSglQue<TVtEngBuffer> iWaitingBuffers; // buffers waiting to be submitted
         TBool iSubmitPending;
 
-        //configuration
+        // Configuration
         TVtEngRenderConfigNGA iConfig;
         
+        // Time stamp for surface update
+        TTimeStamp iTimeStamp;
     };
 
 #endif // CVTENGDRAWDSA_H

--- a/vtengines/videoteleng/Src/Media/CVtEngDrawNGA.cpp	Mon Nov 23 14:47:47 2009 +0200
+++ b/vtengines/videoteleng/Src/Media/CVtEngDrawNGA.cpp	Thu Dec 17 08:46:53 2009 +0200
@@ -426,8 +426,7 @@
         {
         iCallBackTable[surfaceno]->iStatus = KRequestPending;
         iCallBackTable[surfaceno]->SetActive();
-        TTimeStamp timeStamp;
-        iSurfaceUpdateSession.NotifyWhenDisplayed(iCallBackTable[surfaceno]->iStatus, timeStamp);
+        iSurfaceUpdateSession.NotifyWhenDisplayed(iCallBackTable[surfaceno]->iStatus, iTimeStamp);
         iSubmitPending = ETrue;
         iSurfaceUpdateSession.SubmitUpdate(0, iSurfaceId, surfaceno, NULL); 
         buffer.UnSet();
@@ -761,8 +760,7 @@
         __VTPRINT2( DEBUG_MEDIA, "RVD(NGA).DoSurfaceBuffer0Ready, surface buffer %d is in waitingqueue", surfaceno )
         iCallBackTable[surfaceno]->iStatus = KRequestPending;
         iCallBackTable[surfaceno]->SetActive();
-        TTimeStamp  timeStamp;
-        iSurfaceUpdateSession.NotifyWhenDisplayed(iCallBackTable[surfaceno]->iStatus, timeStamp);
+        iSurfaceUpdateSession.NotifyWhenDisplayed(iCallBackTable[surfaceno]->iStatus, iTimeStamp);
         iSubmitPending = ETrue;
         iSurfaceUpdateSession.SubmitUpdate(0, iSurfaceId, surfaceno, NULL); 
         iWaitingBuffers.Remove(*buffer);
@@ -795,8 +793,7 @@
         __VTPRINT2( DEBUG_MEDIA, "RVD(NGA).DoSurfaceBuffer0Ready, surface buffer %d is in waitingqueue", surfaceno )
         iCallBackTable[surfaceno]->iStatus = KRequestPending;
         iCallBackTable[surfaceno]->SetActive();
-        TTimeStamp  timeStamp;
-        iSurfaceUpdateSession.NotifyWhenDisplayed(iCallBackTable[surfaceno]->iStatus, timeStamp);
+        iSurfaceUpdateSession.NotifyWhenDisplayed(iCallBackTable[surfaceno]->iStatus, iTimeStamp);
         iSubmitPending = ETrue;
         iSurfaceUpdateSession.SubmitUpdate(0, iSurfaceId, surfaceno, NULL); 
         iWaitingBuffers.Remove(*buffer);

--- a/vtengines/vtmediatorplugin/data/vtmediatorplugin.rss	Mon Nov 23 14:47:47 2009 +0200
+++ b/vtengines/vtmediatorplugin/data/vtmediatorplugin.rss	Thu Dec 17 08:46:53 2009 +0200
@@ -21,7 +21,7 @@
 
 // INCLUDES
 #include <registryinfov2.rh>
-#include <mediatoruids.hrh>
+#include <MediatorUids.hrh>
 
 
 // -----------------------------------------------------------------------------

Binary file vtuis/videotelui/conf/s60videotelephony.confml has changed

--- a/vtuis/videotelui/src/CVtUiAppUi.cpp	Mon Nov 23 14:47:47 2009 +0200
+++ b/vtuis/videotelui/src/CVtUiAppUi.cpp	Thu Dec 17 08:46:53 2009 +0200
@@ -1886,6 +1886,18 @@
         TInt aCommand )
     {
     __VTPRINTENTER( "VtUi.ProcessCommandL" )
+    
+    // delay mute cmd received during layout change
+    if ( aCommand == EAknSoftkeyOptions )
+        {
+        if ( iLayoutChg )
+            {
+            iDelayedCmd = EAknSoftkeyOptions;
+            __VTPRINTEXIT( "VtUi.ProcessCommandL mute delayed due to LayoutChange" )
+            return;
+            }
+        }
+    
     MVtEngCommandHandler& command = Model().CommandHandler();
     command.ExecuteL( KVtEngRequestLastRemoteFrame, NULL );
     
@@ -2186,6 +2198,15 @@
             CleanupPushEnableBlindL();
             iUiStates->SetDisableBlindSetting( ETrue );
             CmdSwapImagesPlacesL();
+            
+                        
+            MVtEngMedia& media = Model().Media();
+            if ( VtUiUtility::GetFreezeState( media ) )
+                {
+                TBool isViewFinderInContextPane = IsViewFinderInContextPane();
+                iUiStates->SetViewFindersInitialPlaceContextPane( isViewFinderInContextPane );
+                }
+                
             CleanupStack::PopAndDestroy(); // CleanupPushEnableBlindL
             break;
 
@@ -4891,7 +4912,14 @@
     if ( iDelayedCmd != 0 )
         {
         __VTPRINT2( DEBUG_GEN, "VtUi.DoLayoutChg reexecute the delayed cmd=%d", iDelayedCmd);
-        HandleCommandL( iDelayedCmd );
+        if( iDelayedCmd == EAknSoftkeyOptions )
+            {
+            ProcessCommandL( iDelayedCmd );
+            }
+        else
+            {
+            HandleCommandL( iDelayedCmd );
+            }
         iDelayedCmd = 0;
         }
     __VTPRINTEXIT( "VtUi.DoLayoutChg" )