2.0.2: ffmpeg_producer: Nicer printing of NTSC frame-rates.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.2@1691 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index 88914ac28d4c936f36ae46c14d778ac36ee11e0b..bc8963fe8a08d1af0d71b099f8b013c05a07d300 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -218,9 +218,12 @@ public:
        {\r
                if(video_decoder_)\r
                {\r
+                       std::wostringstream fps_ss;\r
+                       fps_ss << std::fixed << std::setprecision(2) << (video_decoder_->is_progressive() ? video_decoder_->fps() : 2.0 * video_decoder_->fps());\r
+\r
                        return L"ffmpeg[" + boost::filesystem::wpath(filename_).filename() + L"|" \r
                                                          + boost::lexical_cast<std::wstring>(video_decoder_->width()) + L"x" + boost::lexical_cast<std::wstring>(video_decoder_->height())\r
-                                                         + (video_decoder_->is_progressive() ? L"p" : L"i")  + boost::lexical_cast<std::wstring>(video_decoder_->is_progressive() ? video_decoder_->fps() : 2.0 * video_decoder_->fps())\r
+                                                         + (video_decoder_->is_progressive() ? L"p" : L"i") + fps_ss.str()\r
                                                          + L"|" + boost::lexical_cast<std::wstring>(file_frame_number()) + L"/" + boost::lexical_cast<std::wstring>(file_nb_frames()) + L"]";\r
                }\r
                \r