2.0. flash_producer: Fixed NTSC support.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@923 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/video_format.cpp b/core/video_format.cpp
index bad1125f520b4ad3569ecab33466d1947c32061b..e9a62d36e88a7bf1c135e9bb48a685cc9f45db54 100644 (file)
--- a/core/video_format.cpp
+++ b/core/video_format.cpp
@@ -58,8 +58,8 @@ const video_format_desc format_descs[video_format::count] =
        DEFINE_VIDEOFORMATDESC(video_format::x1080p2397 ,1920, 1080, video_mode::progressive,   24000,  1001,   TEXT("1080p2398")),\r
        DEFINE_VIDEOFORMATDESC(video_format::x1080p2400 ,1920, 1080, video_mode::progressive,   24,             1,              TEXT("1080p2400")),\r
        DEFINE_VIDEOFORMATDESC(video_format::x1080i5000 ,1920, 1080, video_mode::upper,                 25,             1,              TEXT("1080i5000")),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x1080i5994 ,1920, 1080, video_mode::upper,                 60000,  1001,   TEXT("1080i5994")),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x1080i6000 ,1920, 1080, video_mode::upper,                 60,             1,              TEXT("1080i6000")),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x1080i5994 ,1920, 1080, video_mode::upper,                 30000,  1001,   TEXT("1080i5994")),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x1080i6000 ,1920, 1080, video_mode::upper,                 30,             1,              TEXT("1080i6000")),\r
        DEFINE_VIDEOFORMATDESC(video_format::x1080p2500 ,1920, 1080, video_mode::progressive,   25,             1,              TEXT("1080p2500")),\r
        DEFINE_VIDEOFORMATDESC(video_format::x1080p2997 ,1920, 1080, video_mode::progressive,   30000,  1001,   TEXT("1080p2997")),\r
        DEFINE_VIDEOFORMATDESC(video_format::x1080p3000 ,1920, 1080, video_mode::progressive,   30,             1,              TEXT("1080p3000")),\r

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index abce789a0e4ac538f51480b47f75708de084e13e..e0ee5f3863ed4c6d34e7d613fe3e2e1a7e02feb5 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -307,13 +307,13 @@ public:
                        {               \r
                                const auto& format_desc = frame_factory_->get_video_format_desc();\r
 \r
-                               if(abs(context_->fps()/2.0 - format_desc.fps) < 0.01) // flash == 2 * format -> interlace\r
+                               if(abs(context_->fps()/2.0 - format_desc.fps) < 2.0) // flash == 2 * format -> interlace\r
                                {\r
                                        auto frame1 = context_->render_frame(frame_buffer_.size() < frame_buffer_.capacity());\r
                                        auto frame2 = context_->render_frame(frame_buffer_.size() < frame_buffer_.capacity());\r
                                        frame_buffer_.push(core::basic_frame::interlace(frame1, frame2, format_desc.mode));\r
                                }\r
-                               else if(abs(context_->fps()- format_desc.fps/2.0) < 0.01) // format == 2 * flash -> duplicate\r
+                               else if(abs(context_->fps()- format_desc.fps/2.0) < 2.0) // format == 2 * flash -> duplicate\r
                                {\r
                                        auto frame = context_->render_frame(frame_buffer_.size() < frame_buffer_.capacity());\r
                                        frame_buffer_.push(frame);\r