--- a/audio/ARM_CMMF_codecs/FrameTable/Src/FrameTable.cpp	Tue May 11 17:37:08 2010 +0300
+++ b/audio/ARM_CMMF_codecs/FrameTable/Src/FrameTable.cpp	Tue May 25 14:20:15 2010 +0300
@@ -46,11 +46,9 @@
 
 // CONSTANTS
 
-const TInt KBuffersToKeep = 3;
-
 const TInt KLowResPeriodMs = 1000; // approximate interval for entries stored in low res table is 1 sec
 
-
+const TInt KHighResLengthMs = 5000; // approximate cummulative Length of the enteries stored in the high res table is 5 sec
 
 // ============================ MEMBER FUNCTIONS ===============================
 
@@ -300,14 +298,17 @@
 
             ASSERT(status == KErrNone);
 
-            if (iOkToShrink)
-
+            if(!iOkToShrink)
                 {
-
-                DP0(_L("CFrameTable::SubmitTableEntry removing an entry "));
-
+                if( iFrameTable.Count() >= ( KHighResLengthMs / iMsecPerFrame ) )
+                    {
+                    DP0(_L("CFrameTable::SubmitTableEntry iOkToShrink = ETrue now"));
+                    iOkToShrink = ETrue;
+                    }
+                }
+            else
+                {
                 iFrameTable.Remove(0);
-
                 }
 
             }
@@ -1080,8 +1081,6 @@
 
     iFrameTable.Reset();
 
-    iBufCnt = 0;
-
     iOkToShrink = EFalse;
 
     }
@@ -1099,27 +1098,9 @@
 EXPORT_C void CFrameTable::ShrinkTable()
 
     { // gets called from controller decoder when switching to next buffer
-
-    DP0(_L("CFrameTable::ShrinkTable"));
-
-    if (iBufCnt < KBuffersToKeep)
-
-        {
-
-        iBufCnt++;
-
-        }
-
-    else
-
-        {
-
-        iOkToShrink = ETrue;
-
-        DP0(_L("CFrameTable::ShrinkTable ok to shrink"));
-
-        }
-
+	//function is no longer required
+	//decision to start shrinking is now part of CFrameTable itself.
+	//Not removing this function as it may be needed later on.
     }
 
 

--- a/devsoundextensions/drmaudioplayer/DRMPlayServer/inc/DRMCustomCommandAsyncAO.h	Tue May 11 17:37:08 2010 +0300
+++ b/devsoundextensions/drmaudioplayer/DRMPlayServer/inc/DRMCustomCommandAsyncAO.h	Tue May 25 14:20:15 2010 +0300
@@ -23,7 +23,7 @@
 
 #include <e32base.h>
 #include "DRMPlaySession.h"
-// #include <MdaAudioSamplePlayer.h>
+// #include <mdaaudiosampleplayer.h>
 
 class CDRMPlayServerSession;
 

--- a/imagingandcamerafws/camerafw/Include/distribution.policy	Tue May 11 17:37:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD:	Optional Replaceable	Multimedia Camera API

--- a/imagingandcamerafws/imagingfws/inc/icl/distribution.policy	Tue May 11 17:37:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category D
-OSD:	Common Symbian	Image Conversion Library framework

--- a/mdfdevvideoextensions/nga_mdf_postprocessor/src/NGAPostProcHwDevice.cpp	Tue May 11 17:37:08 2010 +0300
+++ b/mdfdevvideoextensions/nga_mdf_postprocessor/src/NGAPostProcHwDevice.cpp	Tue May 25 14:20:15 2010 +0300
@@ -1426,7 +1426,7 @@
 	if(!aSurfaceId.IsNull())
 	{
 		PP_DEBUG(_L("CNGAPostProcHwDevice[%x]:MmvssSurfaceRemovedL(): UnregisterSurface ID = 0x%x"), this, aSurfaceId );
-		iWsSession.UnregisterSurface(0, iSurfaceId);
+		iWsSession.UnregisterSurface(0, aSurfaceId);
 		iSurfaceHandler->DestroySurface(aSurfaceId);
 	}
 		

--- a/mm_plat/frametable_api/inc/FrameTable.h	Tue May 11 17:37:08 2010 +0300
+++ b/mm_plat/frametable_api/inc/FrameTable.h	Tue May 25 14:20:15 2010 +0300
@@ -113,7 +113,6 @@
     TUint iAvgBitrate;
     TUint iOffset;
     TUint iTimeRefMs;
-    TUint iBufCnt;
     TUint iPosEventMs;
     TUint iPlayWindowEndPosEventMs;
     TInt iIntervalRef;

--- a/mm_pub/audio_effects_presets_api/tsrc/EffectPresetsTest/src/EffectPresetTestCore.cpp	Tue May 11 17:37:08 2010 +0300
+++ b/mm_pub/audio_effects_presets_api/tsrc/EffectPresetsTest/src/EffectPresetTestCore.cpp	Tue May 25 14:20:15 2010 +0300
@@ -353,7 +353,7 @@
 TUint32 CTestAudioEqualizerUtility::NumberOfPreDefinePresets(TTestResult & aResult)
 	{
 		TInt err=KErrNone;
-		TUint32 aPredefinedPreset;
+		TUint32 aPredefinedPreset = 0;
 
 		TRAP(err, aPredefinedPreset=iAudioEqualizerUtility->NumberOfPreDefinedPresets());
 		aResult.iResult = err;

--- a/mm_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/DRMAudioPlay_core.cpp	Tue May 11 17:37:08 2010 +0300
+++ b/mm_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/DRMAudioPlay_core.cpp	Tue May 25 14:20:15 2010 +0300
@@ -21,7 +21,7 @@
 #include <caf/caf.h>
 #include <caf/supplier.h>
 #include <caf/importfile.h>
-#include <oma2agent.h>
+#include <Oma2Agent.h>
 #include <BAUTILS.H>
 
 using namespace ContentAccess;

--- a/mm_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/SimpleSoundPlayer.cpp	Tue May 11 17:37:08 2010 +0300
+++ b/mm_pub/drm_audio_player_api/tsrc/DRMAudioPlay/src/SimpleSoundPlayer.cpp	Tue May 25 14:20:15 2010 +0300
@@ -249,7 +249,7 @@
 				if (iMetaInfoTest)
 				    {	//No error yet
 					TInt currMetaDataIndex = 0;
-					CMMFMetaDataEntry* currMetaData;
+					CMMFMetaDataEntry* currMetaData = NULL;
 					for ( currMetaDataIndex=0 ; currMetaDataIndex < NumMetaDatas ; currMetaDataIndex++)
 					    {
 					    currMetaData = iMdaPlayer->GetMetaDataEntryL(currMetaDataIndex);
@@ -783,7 +783,8 @@
 			return ETrue;
 			//break;
 		case KPlayerActionStopPlayUrl:
-			CUrlParameters *p = static_cast<CUrlParameters *>(aParams);
+			CUrlParameters *p ;
+			p = static_cast<CUrlParameters *>(aParams);
 			OpenUrlL(p->GetUrl() , p->GetIapId() , p->GetMimeType() );
 			break;
 		case KPlayerActionStopPlayFileHandler:

--- a/mmlibs/mmfw/tsrc/mmfunittest/Recogniser/Data/common/distribution.policy	Tue May 11 17:37:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD:	Reference/Test	Multimedia Test

--- a/mmlibs/mmfw/tsrc/mmfunittest/Recogniser/Data/distribution.policy	Tue May 11 17:37:08 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD:	Reference/Test	Multimedia Test