2.0. video_format: Renamed video_mode to field_mode. image_mixer: Refactored field...

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

diff --git a/modules/ffmpeg/producer/frame_muxer.cpp b/modules/ffmpeg/producer/frame_muxer.cpp
index 89c51a68bc5ff1264f8c0a15cea0c7a592d35c49..ff32adb44f5604994d8aab4ac5eedb039d10e35a 100644 (file)
--- a/modules/ffmpeg/producer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/frame_muxer.cpp
@@ -82,16 +82,16 @@ 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::video_mode::progressive && in_mode == core::video_mode::progressive)\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::video_mode::progressive && in_mode != core::video_mode::progressive)\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
@@ -102,29 +102,29 @@ display_mode::type get_display_mode(const core::video_mode::type in_mode, double
 \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
@@ -190,7 +190,7 @@ struct frame_muxer::implementation : boost::noncopyable
                                auto in_mode = get_mode(*video_frame);\r
                                display_mode_ = get_display_mode(in_mode, in_fps_, format_desc_.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_.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
@@ -225,9 +225,9 @@ 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
+                       if(frame->get_type() == core::field_mode::lower && format_desc_.mode == core::field_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
+                       else if(frame->get_type() == core::field_mode::upper && format_desc_.mode == core::field_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
 \r
                        video_streams_.back().push(frame);\r