git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

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

diff --git a/modules/ffmpeg/producer/frame_muxer.cpp b/modules/ffmpeg/producer/frame_muxer.cpp
index a6218f6f47a31960e1874f73be18971ef7ec3c5f..d478c9fa4144a43a7b553f585119a1aab63b2524 100644 (file)
--- a/modules/ffmpeg/producer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/frame_muxer.cpp
@@ -8,7 +8,7 @@
 \r
 #include <core/producer/frame_producer.h>\r
 #include <core/producer/frame/basic_frame.h>\r
-#include <core/producer/frame/image_transform.h>\r
+#include <core/producer/frame/frame_transform.h>\r
 #include <core/producer/frame/pixel_format.h>\r
 #include <core/producer/frame/frame_factory.h>\r
 #include <core/mixer/write_frame.h>\r
@@ -82,35 +82,49 @@ struct display_mode
        }\r
 };\r
 \r
-display_mode::type get_display_mode(const core::video_mode::type in_mode, double in_fps, const core::video_mode::type out_mode, double out_fps)\r
+display_mode::type get_display_mode(const core::field_mode::type in_mode, double in_fps, const core::field_mode::type out_mode, double out_fps)\r
 {              \r
        static const auto epsilon = 2.0;\r
 \r
+       if(in_fps < 20.0 || in_fps > 80.0)\r
+       {\r
+               //if(out_mode != core::field_mode::progressive && in_mode == core::field_mode::progressive)\r
+               //      return display_mode::interlace;\r
+               \r
+               if(out_mode == core::field_mode::progressive && in_mode != core::field_mode::progressive)\r
+               {\r
+                       if(in_fps < 35.0)\r
+                               return display_mode::deinterlace;\r
+                       else\r
+                               return display_mode::deinterlace_bob;\r
+               }\r
+       }\r
+\r
        if(std::abs(in_fps - out_fps) < epsilon)\r
        {\r
-               if(in_mode != core::video_mode::progressive && out_mode == core::video_mode::progressive)\r
+               if(in_mode != core::field_mode::progressive && out_mode == core::field_mode::progressive)\r
                        return display_mode::deinterlace;\r
-               //else if(in_mode == core::video_mode::progressive && out_mode != core::video_mode::progressive)\r
+               //else if(in_mode == core::field_mode::progressive && out_mode != core::field_mode::progressive)\r
                //      simple(); // interlace_duplicate();\r
                else\r
                        return display_mode::simple;\r
        }\r
        else if(std::abs(in_fps/2.0 - out_fps) < epsilon)\r
        {\r
-               if(in_mode != core::video_mode::progressive)\r
+               if(in_mode != core::field_mode::progressive)\r
                        return display_mode::invalid;\r
 \r
-               if(out_mode != core::video_mode::progressive)\r
+               if(out_mode != core::field_mode::progressive)\r
                        return display_mode::interlace;\r
                else\r
                        return display_mode::half;\r
        }\r
        else if(std::abs(in_fps - out_fps/2.0) < epsilon)\r
        {\r
-               if(out_mode != core::video_mode::progressive)\r
+               if(out_mode != core::field_mode::progressive)\r
                        return display_mode::invalid;\r
 \r
-               if(in_mode != core::video_mode::progressive)\r
+               if(in_mode != core::field_mode::progressive)\r
                        return display_mode::deinterlace_bob;\r
                else\r
                        return display_mode::duplicate;\r
@@ -174,9 +188,9 @@ struct frame_muxer::implementation : boost::noncopyable
                        if(auto_transcode_)\r
                        {\r
                                auto in_mode = get_mode(*video_frame);\r
-                               display_mode_ = get_display_mode(in_mode, in_fps_, format_desc_.mode, format_desc_.fps);\r
+                               display_mode_ = get_display_mode(in_mode, in_fps_, format_desc_.field_mode, format_desc_.fps);\r
                        \r
-                               if(display_mode_ == display_mode::simple && in_mode != core::video_mode::progressive && format_desc_.mode != core::video_mode::progressive && video_frame->height != static_cast<int>(format_desc_.height))\r
+                               if(display_mode_ == display_mode::simple && in_mode != core::field_mode::progressive && format_desc_.field_mode != core::field_mode::progressive && video_frame->height != static_cast<int>(format_desc_.height))\r
                                        display_mode_ = display_mode::deinterlace_bob_reinterlace; // The frame will most likely be scaled, we need to deinterlace->reinterlace \r
                                \r
                                if(display_mode_ == display_mode::deinterlace)\r
@@ -211,14 +225,17 @@ struct frame_muxer::implementation : boost::noncopyable
                        auto frame = make_write_frame(this, av_frame, frame_factory_, hints);\r
 \r
                        // Fix field-order if needed\r
-                       if(frame->get_type() == core::video_mode::lower && format_desc_.mode == core::video_mode::upper)\r
-                               frame->get_image_transform().set_fill_translation(0.0f, 0.5/static_cast<double>(frame->get_pixel_format_desc().planes[0].height));\r
-                       else if(frame->get_type() == core::video_mode::upper && format_desc_.mode == core::video_mode::lower)\r
-                               frame->get_image_transform().set_fill_translation(0.0f, -0.5/static_cast<double>(frame->get_pixel_format_desc().planes[0].height));\r
+                       if(frame->get_type() == core::field_mode::lower && format_desc_.field_mode == core::field_mode::upper)\r
+                               frame->get_frame_transform().fill_translation[1] += 1.0/static_cast<double>(format_desc_.height);\r
+                       else if(frame->get_type() == core::field_mode::upper && format_desc_.field_mode == core::field_mode::lower)\r
+                               frame->get_frame_transform().fill_translation[1] -= 1.0/static_cast<double>(format_desc_.height);\r
 \r
                        video_streams_.back().push(frame);\r
                        ++video_frame_count_;\r
                }\r
+\r
+               if(video_streams_.back().size() > 8)\r
+                       BOOST_THROW_EXCEPTION(invalid_operation() << source_info("frame_muxer") << msg_info("video-stream overflow. This can be caused by incorrect frame-rate. Check clip meta-data."));\r
        }\r
 \r
        void push(const std::shared_ptr<std::vector<int16_t>>& audio_samples)\r
@@ -234,6 +251,9 @@ struct frame_muxer::implementation : boost::noncopyable
                audio_sample_count_ += audio_samples->size();\r
 \r
                boost::range::push_back(audio_streams_.back(), *audio_samples);\r
+\r
+               if(audio_streams_.back().size() > 8*format_desc_.audio_samples_per_frame)\r
+                       BOOST_THROW_EXCEPTION(invalid_operation() << source_info("frame_muxer") << msg_info("audio-stream overflow. This can be caused by incorrect frame-rate. Check clip meta-data."));\r
        }\r
 \r
        safe_ptr<basic_frame> pop()\r
@@ -368,7 +388,7 @@ struct frame_muxer::implementation : boost::noncopyable
                                \r
                auto frame2 = pop_video();\r
 \r
-               dest.push_back(core::basic_frame::interlace(frame1, frame2, format_desc_.mode));                \r
+               dest.push_back(core::basic_frame::interlace(frame1, frame2, format_desc_.field_mode));          \r
        }\r
        \r
        int64_t calc_nb_frames(int64_t nb_frames) const\r