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

diff --git a/accelerator/cpu/image/image_mixer.cpp b/accelerator/cpu/image/image_mixer.cpp
index c4722b37cfcf6cd22c4baf7c6f085185baee3c12..b7d36a8773f7fde186de2a63734c0beaeb0b4aa6 100644 (file)
--- a/accelerator/cpu/image/image_mixer.cpp
+++ b/accelerator/cpu/image/image_mixer.cpp
@@ -196,6 +196,13 @@ private:
                {\r
                        return item.transform.is_still && item.transform.field_mode == field_mode; // only us last field for stills.\r
                });\r
+               \r
+               // Stills are progressive, TODO: deinterlace.\r
+               BOOST_FOREACH(auto item, items)\r
+               {\r
+                       if(item.transform.is_still)\r
+                               item.transform.field_mode = core::field_mode::progressive;\r
+               }\r
 \r
                if(items.empty())\r
                        return;\r

diff --git a/accelerator/ogl/image/image_mixer.cpp b/accelerator/ogl/image/image_mixer.cpp
index 8ae687f1f3d94fd353345964b0acd2eb332a6ec1..4ddb607732937c4d642166fcc9cf938f4f1b053a 100644 (file)
--- a/accelerator/ogl/image/image_mixer.cpp
+++ b/accelerator/ogl/image/image_mixer.cpp
@@ -181,6 +181,13 @@ private:
                        });\r
                }\r
 \r
+               // Stills are progressive, TODO: deinterlace.\r
+               BOOST_FOREACH(auto& item, layer.items)\r
+               {\r
+                       if(item.transform.is_still)\r
+                               item.transform.field_mode = core::field_mode::progressive;\r
+               }\r
+\r
                if(layer.items.empty())\r
                        return;\r
 \r
@@ -217,8 +224,6 @@ private:
                draw_params draw_params;\r
                draw_params.pix_desc    = std::move(item.pix_desc);\r
                draw_params.transform   = std::move(item.transform);\r
-               if(item.transform.is_still)\r
-                       draw_params.transform.field_mode = core::field_mode::progressive;\r
 \r
                BOOST_FOREACH(auto& future_texture, item.textures)\r
                        draw_params.textures.push_back(future_texture.get());\r