2.0. ffmpeg_producer: Refactored meta data fix.

[casparcg] / modules / ffmpeg / producer / ffmpeg_producer.cpp

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index 97d95dd17866c5df3c81efe113e32062fab8b86d..d6ec0d8994eeb82a6c2a708d1666a23a585b6cbc 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -46,19 +46,7 @@
 #include <tbb/parallel_invoke.h>\r
 \r
 namespace caspar {\r
-\r
-double validate_fps(double fps, int64_t nb_frames, double duration_sec)\r
-{\r
-       if(fps > 20.0 && fps < 80.0)\r
-               return fps;\r
-       \r
-       auto est_fps = nb_frames/duration_sec;\r
-\r
-       CASPAR_LOG(warning) << L"Invalid framerate detected, trying to estimate, fps: " << fps << L" nb_frames: " << nb_frames << L" duration_sec: " << duration_sec << L" => " << est_fps << L" fps.";\r
-\r
-       return est_fps;\r
-}\r
-                       \r
+                               \r
 struct ffmpeg_producer : public core::frame_producer\r
 {\r
        const std::wstring                                                              filename_;\r
@@ -97,7 +85,7 @@ public:
                , input_(graph_, filename_, loop, start, length)\r
                , video_decoder_(input_.context(), frame_factory, filter)\r
                , audio_decoder_(input_.context(), frame_factory->get_video_format_desc())\r
-               , fps_(validate_fps(video_decoder_.fps(), video_decoder_.nb_frames(), audio_decoder_.duration()))\r
+               , fps_(video_decoder_.fps())\r
                , muxer_(fps_, frame_factory)\r
                , late_frames_(0)\r
                , start_(start)\r
@@ -212,8 +200,9 @@ public:
        virtual std::wstring print() const\r
        {\r
                return L"ffmpeg[" + boost::filesystem::wpath(filename_).filename() + L"|" \r
-                                                 + boost::lexical_cast<std::wstring>(fps_) + (is_progressive_ ? L"p" : L"i") +L"|"\r
-                                                 + boost::lexical_cast<std::wstring>(width_) + L"x" + boost::lexical_cast<std::wstring>(height_) + L"]";\r
+                                                 + boost::lexical_cast<std::wstring>(width_) + L"x" + boost::lexical_cast<std::wstring>(height_)\r
+                                                 + (is_progressive_ ? L"p" : L"i")  + boost::lexical_cast<std::wstring>(fps_)\r
+                                                 + L"]";\r
        }\r
 };\r
 \r