# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1265062852 -7200
# Node ID c7e61a0077eb87ae8d6feb2a25bbc6c2eac7db21
# Parent  2d3e1993fb028bbb5028e90a8825dbe7039bffb4
Revision: 201003
Kit: 201005

diff -r 2d3e1993fb02 -r c7e61a0077eb camcordermmfplugin/filecomposer/Src/CamC3GPDataSinkImp.cpp
--- a/camcordermmfplugin/filecomposer/Src/CamC3GPDataSinkImp.cpp	Tue Jan 26 12:06:59 2010 +0200
+++ b/camcordermmfplugin/filecomposer/Src/CamC3GPDataSinkImp.cpp	Tue Feb 02 00:20:52 2010 +0200
@@ -2207,7 +2207,7 @@
 //
 void CCamC3GPDataSinkImp::M3GPMP4LibDeleteTempFileName( MP4FileName tempFileName )
     {
-    PRINT((_L("CCamC3GPDataSinkImp::M3GPMP4LibDeleteTempFileName entering, tempFileName=%x, file count=%d"),tempFileName, iDeleteFileQueue->Count()));
+    PRINT((_L("CCamC3GPDataSinkImp::M3GPMP4LibDeleteTempFileName entering")));
     MP4FileName* tempFileNamePtr = NULL;
     TInt result = KErrNoMemory;
 
@@ -2216,6 +2216,8 @@
     PRINT((_L("CCamC3GPDataSinkImp::M3GPMP4LibDeleteTempFileName tempFileName=%x, tempFileNamePtr=%x"), tempFileName, tempFileNamePtr));
     if ( tempFileNamePtr && iDeleteFileQueue )
         {
+        PRINT((_L("CCamC3GPDataSinkImp::M3GPMP4LibDeleteTempFileName file count=%d"), iDeleteFileQueue->Count()));
+        
         *tempFileNamePtr = tempFileName;
         result = iDeleteFileQueue->Append( tempFileNamePtr );
         }
@@ -2264,7 +2266,7 @@
 //
 TInt CCamC3GPDataSinkImp::DoIdleDelete()
     {
-    PRINT((_L("CCamC3GPDataSinkImp::DoIdleDelete() in, file count=%d"), iDeleteFileQueue->Count()));
+    PRINT((_L("CCamC3GPDataSinkImp::DoIdleDelete() in")));
     TInt err = KErrNone;
     MP4FileName tempFileName;
     TInt filesLeft = EFalse;
@@ -2272,6 +2274,7 @@
     // Delete one file from queue
     if ( iDeleteFileQueue )
         {
+        PRINT((_L("CCamC3GPDataSinkImp::DoIdleDelete() file count=%d"), iDeleteFileQueue->Count()));    
         if ( iDeleteFileQueue->Count() )
             {
             tempFileName = *(*iDeleteFileQueue)[0];
diff -r 2d3e1993fb02 -r c7e61a0077eb camcordermmfplugin/mediarecorder/Src/CCMRMDFVideoRecorder.cpp
--- a/camcordermmfplugin/mediarecorder/Src/CCMRMDFVideoRecorder.cpp	Tue Jan 26 12:06:59 2010 +0200
+++ b/camcordermmfplugin/mediarecorder/Src/CCMRMDFVideoRecorder.cpp	Tue Feb 02 00:20:52 2010 +0200
@@ -3479,8 +3479,11 @@
         iOutputVideoBuffer = iVideoOutputBufferInputQue.First();
 
         // Remove the picture from the list
-        iOutputVideoBuffer->iLink.Deque();
-        iNumberOfVideoOutputBuffers--;
+        if ( iOutputVideoBuffer != NULL )
+            {
+            iOutputVideoBuffer->iLink.Deque();
+            iNumberOfVideoOutputBuffers--;
+            }
         // leave restricted area
         iMutexObj.Signal();
         }
diff -r 2d3e1993fb02 -r c7e61a0077eb camcordermmfplugin/mediarecorder/Src/CCMRMediaRecorderImp.cpp
--- a/camcordermmfplugin/mediarecorder/Src/CCMRMediaRecorderImp.cpp	Tue Jan 26 12:06:59 2010 +0200
+++ b/camcordermmfplugin/mediarecorder/Src/CCMRMediaRecorderImp.cpp	Tue Feb 02 00:20:52 2010 +0200
@@ -399,7 +399,10 @@
     // this can't be changed while recording; video recorder is supposed to notice if in wrong state
     // state is changed based on mvroStateChange()
     iVideoRecorder->SetFrameSizeL(aSize);
-    iConfig->SetVideoFrameSize(aSize);
+    if ( iConfig != NULL )
+        {
+        iConfig->SetVideoFrameSize(aSize);
+        }
 
     // Change audio samplerate based on framesize
     TSize framesize;
@@ -494,12 +497,15 @@
         {
         TInt abr;
         // check that the total bit-rate (audio+video) does not exceed a given limit
-        iAudioRecorder->TargetBitRateL(abr);
-        if ( iAudioRecorder && iAudioEnabled && ( abr > 0 ) &&
-             ( abr + aBitRate > iMaxTargetBitRate ) )
+        if ( iAudioRecorder != NULL )
             {
-            PRINT((_L("CCMRMediaRecorderImp::SetVideoBitRateL() too high combined bitrate")));
-            User::Leave(KErrArgument);
+            iAudioRecorder->TargetBitRateL(abr);
+            if ( iAudioEnabled && ( abr > 0 ) &&
+                 ( abr + aBitRate > iMaxTargetBitRate ) )
+                {
+                PRINT((_L("CCMRMediaRecorderImp::SetVideoBitRateL() too high combined bitrate")));
+                User::Leave(KErrArgument);
+                }
             }
         }
 
diff -r 2d3e1993fb02 -r c7e61a0077eb camcordermmfplugin/mediarecorder/Src/CCMRVideoCodecDataH263.cpp
--- a/camcordermmfplugin/mediarecorder/Src/CCMRVideoCodecDataH263.cpp	Tue Jan 26 12:06:59 2010 +0200
+++ b/camcordermmfplugin/mediarecorder/Src/CCMRVideoCodecDataH263.cpp	Tue Feb 02 00:20:52 2010 +0200
@@ -141,7 +141,10 @@
         case 30 :
         case 40 :
             arbitrarySizeAllowed = EFalse;
-        case 50 : 
+            maxSize.SetSize(KCMRCIFWidth,KCMRCIFHeight);
+            break;
+        case 50 :
+            arbitrarySizeAllowed = ETrue;
             maxSize.SetSize(KCMRCIFWidth,KCMRCIFHeight);
             break;
         case 45 :
diff -r 2d3e1993fb02 -r c7e61a0077eb configmanagers/imagingconfigmanager/conf/imagingconfigmanager.confml
Binary file configmanagers/imagingconfigmanager/conf/imagingconfigmanager.confml has changed