From 5d6fcadfc396ff73baa6b5fd094f1cbf7ba2477b Mon Sep 17 00:00:00 2001 From: Ronag Date: Wed, 17 Aug 2011 16:01:38 +0000 Subject: [PATCH] git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1211 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d --- modules/ffmpeg/producer/ffmpeg_producer.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp index 038ce5b9f..cd438f93d 100644 --- a/modules/ffmpeg/producer/ffmpeg_producer.cpp +++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp @@ -85,7 +85,7 @@ struct ffmpeg_producer : public core::frame_producer const size_t width_; const size_t height_; - bool progressive_; + bool is_progressive_; public: explicit ffmpeg_producer(const safe_ptr& frame_factory, const std::wstring& filename, const std::wstring& filter, bool loop, int start, int length) @@ -104,7 +104,7 @@ public: , last_frame_(core::basic_frame::empty()) , width_(video_decoder_.width()) , height_(video_decoder_.height()) - , progressive_(true) + , is_progressive_(true) { graph_->add_guide("frame-time", 0.5); graph_->set_color("frame-time", diagnostics::color(0.1f, 1.0f, 0.1f)); @@ -167,8 +167,7 @@ public: auto video_frames = video_decoder_.poll(); BOOST_FOREACH(auto& video, video_frames) { - if(video) - progressive_ &= video->interlaced_frame != 0; + is_progressive_ = video ? video->interlaced_frame == 0 : is_progressive_; muxer_.push(video, hints); } }, @@ -211,7 +210,7 @@ public: virtual std::wstring print() const { return L"ffmpeg[" + boost::filesystem::wpath(filename_).filename() + L"|" - + boost::lexical_cast(fps_) + (progressive_ ? L"p" : L"i") +L"|" + + boost::lexical_cast(fps_) + (is_progressive_ ? L"p" : L"i") +L"|" + boost::lexical_cast(width_) + L"x" + boost::lexical_cast(height_) + L"]"; } }; -- 2.39.2