diff -r fb1bbf85a302 -r f40c1a748eb9 multimediacommscontroller/mmccsubcontroller/src/mcccodecconfigurator.cpp --- a/multimediacommscontroller/mmccsubcontroller/src/mcccodecconfigurator.cpp Wed Jun 09 10:06:41 2010 +0300 +++ b/multimediacommscontroller/mmccsubcontroller/src/mcccodecconfigurator.cpp Mon Jun 21 16:05:57 2010 +0300 @@ -667,14 +667,19 @@ __SUBCONTROLLER( "AVC" ) setting.iVideoFourCC = TFourCC( KMccFourCCIdAVC ); } - // Round to have zero decimals for clearness sake - User::LeaveIfError( Math::Round( setting.iVideoFrameRate, frameRate, 0 ) ); + + MccConversionUtility::FrameRateSanitizeL( + setting.iVideoFrameRate, frameRate, videoType ); + setting.iVideoFrameSize.iWidth = videoWidth; setting.iVideoFrameSize.iHeight = videoHeight; // Average bitrate is for the whole stream, // subtract audio average to get video average setting.iVideoBitRate = videoAverageBitRate - audioAverageBitRate; + + MccConversionUtility::BitRateSanitize( + setting.iVideoBitRate, setting.iVideoBitRate, videoType ); } else {