From 90a3cf6ac8ce86767a2084662d193f43ee237370 Mon Sep 17 00:00:00 2001 From: ronag Date: Sun, 27 Nov 2011 20:57:12 +0000 Subject: [PATCH 1/1] 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 --- modules/ffmpeg/producer/ffmpeg_producer.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp index 88914ac28..bc8963fe8 100644 --- a/modules/ffmpeg/producer/ffmpeg_producer.cpp +++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp @@ -218,9 +218,12 @@ public: { if(video_decoder_) { + std::wostringstream fps_ss; + fps_ss << std::fixed << std::setprecision(2) << (video_decoder_->is_progressive() ? video_decoder_->fps() : 2.0 * video_decoder_->fps()); + return L"ffmpeg[" + boost::filesystem::wpath(filename_).filename() + L"|" + boost::lexical_cast(video_decoder_->width()) + L"x" + boost::lexical_cast(video_decoder_->height()) - + (video_decoder_->is_progressive() ? L"p" : L"i") + boost::lexical_cast(video_decoder_->is_progressive() ? video_decoder_->fps() : 2.0 * video_decoder_->fps()) + + (video_decoder_->is_progressive() ? L"p" : L"i") + fps_ss.str() + L"|" + boost::lexical_cast(file_frame_number()) + L"/" + boost::lexical_cast(file_nb_frames()) + L"]"; } -- 2.39.2