--- a/multimediacommscontroller/mmccfilesourcesink/src/mccfilevideo.cpp Fri Jun 11 14:03:38 2010 +0300
+++ b/multimediacommscontroller/mmccfilesourcesink/src/mccfilevideo.cpp Wed Jun 23 18:38:47 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::FrameRateSanitize( modFrameRate, iFrameRate, iType );
+ return modFrameRate;
}
// -----------------------------------------------------------------------------