diff -r fb1bbf85a302 -r f40c1a748eb9 multimediacommscontroller/mmccfilesourcesink/src/mccfilevideo.cpp --- a/multimediacommscontroller/mmccfilesourcesink/src/mccfilevideo.cpp Wed Jun 09 10:06:41 2010 +0300 +++ b/multimediacommscontroller/mmccfilesourcesink/src/mccfilevideo.cpp Mon Jun 21 16:05:57 2010 +0300 @@ -231,7 +231,16 @@ ExtractH264ParameterSetNALUsL( &configKey, ETrue ); return configKey; } - + +// ----------------------------------------------------------------------------- +// CMccFileVideo::VideoType +// ----------------------------------------------------------------------------- +// +TUint32 CMccFileVideo::VideoType() const + { + return iType; + } + // ----------------------------------------------------------------------------- // CMccFileVideo::Position // ----------------------------------------------------------------------------- @@ -279,10 +288,9 @@ // TReal CMccFileVideo::VideoFrameRateL() { - // Round to have zero decimals for clearness sake - TReal roundedFrameRate; - User::LeaveIfError( Math::Round( roundedFrameRate, iFrameRate, 0 ) ); - return roundedFrameRate; + TReal modFrameRate; + MccConversionUtility::FrameRateSanitizeL( modFrameRate, iFrameRate, iType ); + return modFrameRate; } // -----------------------------------------------------------------------------