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 4647707e784097ee1eafc334442f98ae80c0f6ed..89c51a68bc5ff1264f8c0a15cea0c7a592d35c49 100644 (file)
--- a/modules/ffmpeg/producer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/frame_muxer.cpp
@@ -86,6 +86,20 @@ display_mode::type get_display_mode(const core::video_mode::type in_mode, double
 {              \r
        static const auto epsilon = 2.0;\r
 \r
+       if(in_fps < 20.0 || in_fps > 80.0)\r
+       {\r
+               //if(out_mode != core::video_mode::progressive && in_mode == core::video_mode::progressive)\r
+               //      return display_mode::interlace;\r
+               \r
+               if(out_mode == core::video_mode::progressive && in_mode != core::video_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
@@ -195,12 +209,19 @@ struct frame_muxer::implementation : boost::noncopyable
 \r
                        CASPAR_LOG(info) << "[frame_muxer] " << display_mode::print(display_mode_);\r
                }\r
+\r
                                \r
                if(hints & core::frame_producer::ALPHA_HINT)\r
-                       try_make_gray(make_safe(video_frame));\r
+                       video_frame->format = make_alpha_format(video_frame->format);\r
+               \r
+               auto format = video_frame->format;\r
+               if(video_frame->format == CASPAR_PIX_FMT_LUMA) // CASPAR_PIX_FMT_LUMA is not valid for filter, change it to GRAY8\r
+                       video_frame->format = PIX_FMT_GRAY8;\r
 \r
                BOOST_FOREACH(auto& av_frame, filter_.execute(video_frame))\r
                {\r
+                       av_frame->format = format;\r
+\r
                        auto frame = make_write_frame(this, av_frame, frame_factory_, hints);\r
 \r
                        // Fix field-order if needed\r
@@ -212,6 +233,9 @@ struct frame_muxer::implementation : boost::noncopyable
                        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("audio-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
@@ -227,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