2.0 image_mixer: Removed "gain" in favor of "brightness".

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

diff --git a/core/mixer/image/image_kernel.cpp b/core/mixer/image/image_kernel.cpp
index 4db822a480045a0e2ba9cde4480f178341d5a1fc..dae98a0e0bec41535e52591fadd939d63536ed55 100644 (file)
--- a/core/mixer/image/image_kernel.cpp
+++ b/core/mixer/image/image_kernel.cpp
@@ -191,9 +191,7 @@ struct image_kernel::implementation : boost::noncopyable
                // Setup drawing area\r
                \r
                ogl.viewport(0, 0, background->width(), background->height());\r
-\r
-               GL(glColor4d(item.transform.get_gain(), item.transform.get_gain(), item.transform.get_gain(), item.transform.get_opacity()));\r
-                                               \r
+                                                               \r
                auto m_p = item.transform.get_clip_translation();\r
                auto m_s = item.transform.get_clip_scale();\r
 \r

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index ee84d8806be722d224ce8cff1f66c7601f77883d..61920dbd586c7eff13538fc1c3ab5224c79ec38a 100644 (file)
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -218,50 +218,50 @@ public:
                }\r
        }\r
 \r
-       // TODO: Optimize\r
-       bool has_overlapping_items(const layer& layer, image_transform::blend_mode::type blend_mode)\r
-       {\r
-               if(layer.size() < 2)\r
-                       return false;   \r
-               \r
-               implementation::layer fill;\r
-\r
-               std::copy_if(layer.begin(), layer.end(), std::back_inserter(fill), [&](const render_item& item)\r
-               {\r
-                       return !item.transform.get_is_key();\r
-               });\r
-                       \r
-               if(blend_mode == image_transform::blend_mode::normal) // Only overlap if opacity\r
-               {\r
-                       return std::any_of(fill.begin(), fill.end(), [&](const render_item& item)\r
-                       {\r
-                               return item.transform.get_opacity() < 1.0 - 0.001;\r
-                       });\r
-               }\r
-\r
-               // Simple solution, just check if we have differnt video streams / tags.\r
-               return std::any_of(fill.begin(), fill.end(), [&](const render_item& item)\r
-               {\r
-                       return item.tag != fill.front().tag;\r
-               });\r
-       }                       \r
-                       \r
-       render_item create_render_item(const safe_ptr<device_buffer>& buffer, image_transform::blend_mode::type blend_mode)\r
-       {\r
-               CASPAR_ASSERT(buffer->stride() == 4 && "Only used for bgra textures");\r
-\r
-               pixel_format_desc desc;\r
-               desc.pix_fmt = pixel_format::bgra;\r
-               desc.planes.push_back(pixel_format_desc::plane(channel_.get_format_desc().width, channel_.get_format_desc().height, 4));\r
-\r
-               std::vector<safe_ptr<device_buffer>> textures;\r
-               textures.push_back(buffer);\r
-                               \r
-               image_transform transform;\r
-               transform.set_blend_mode(blend_mode);\r
-\r
-               return render_item(desc, std::move(textures), transform, video_mode::progressive, nullptr);              \r
-       }\r
+       //// TODO: Optimize\r
+       //bool has_overlapping_items(const layer& layer, image_transform::blend_mode::type blend_mode)\r
+       //{\r
+       //      if(layer.size() < 2)\r
+       //              return false;   \r
+       //      \r
+       //      implementation::layer fill;\r
+\r
+       //      std::copy_if(layer.begin(), layer.end(), std::back_inserter(fill), [&](const render_item& item)\r
+       //      {\r
+       //              return !item.transform.get_is_key();\r
+       //      });\r
+       //              \r
+       //      if(blend_mode == image_transform::blend_mode::normal) // Only overlap if opacity\r
+       //      {\r
+       //              return std::any_of(fill.begin(), fill.end(), [&](const render_item& item)\r
+       //              {\r
+       //                      return item.transform.get_opacity() < 1.0 - 0.001;\r
+       //              });\r
+       //      }\r
+\r
+       //      // Simple solution, just check if we have differnt video streams / tags.\r
+       //      return std::any_of(fill.begin(), fill.end(), [&](const render_item& item)\r
+       //      {\r
+       //              return item.tag != fill.front().tag;\r
+       //      });\r
+       //}                     \r
+       //              \r
+       //render_item create_render_item(const safe_ptr<device_buffer>& buffer, image_transform::blend_mode::type blend_mode)\r
+       //{\r
+       //      CASPAR_ASSERT(buffer->stride() == 4 && "Only used for bgra textures");\r
+\r
+       //      pixel_format_desc desc;\r
+       //      desc.pix_fmt = pixel_format::bgra;\r
+       //      desc.planes.push_back(pixel_format_desc::plane(channel_.get_format_desc().width, channel_.get_format_desc().height, 4));\r
+\r
+       //      std::vector<safe_ptr<device_buffer>> textures;\r
+       //      textures.push_back(buffer);\r
+       //                      \r
+       //      image_transform transform;\r
+       //      transform.set_blend_mode(blend_mode);\r
+\r
+       //      return render_item(desc, std::move(textures), transform, video_mode::progressive, nullptr);              \r
+       //}\r
 \r
        safe_ptr<device_buffer> create_device_buffer(size_t stride)\r
        {\r

diff --git a/core/producer/frame/image_transform.cpp b/core/producer/frame/image_transform.cpp
index 6c3d6eb90a52372752375417535df73e7cb20860..7ca46e75c047576d01cc170dbddbe59a8a4c917b 100644 (file)
--- a/core/producer/frame/image_transform.cpp
+++ b/core/producer/frame/image_transform.cpp
@@ -30,7 +30,6 @@ namespace caspar { namespace core {
                \r
 image_transform::image_transform() \r
        : opacity_(1.0)\r
-       , gain_(1.0)\r
        , brightness_(1.0)\r
        , contrast_(1.0)\r
        , saturation_(1.0)\r
@@ -53,16 +52,6 @@ double image_transform::get_opacity() const
        return opacity_;\r
 }\r
 \r
-void image_transform::set_gain(double value)\r
-{\r
-       gain_ = std::max(0.0, value);\r
-}\r
-\r
-double image_transform::get_gain() const\r
-{\r
-       return gain_;\r
-}\r
-\r
 void image_transform::set_brightness(double value)\r
 {\r
        brightness_ = std::max(0.0, value);\r
@@ -162,7 +151,6 @@ image_transform& image_transform::operator*=(const image_transform &other)
 {\r
        opacity_                                *= other.opacity_;      \r
        blend_mode_                              = std::max(blend_mode_, other.blend_mode_);\r
-       gain_                                   *= other.gain_;\r
        brightness_                             *= other.brightness_;\r
        contrast_                               *= other.contrast_;\r
        saturation_                             *= other.saturation_;\r
@@ -205,7 +193,6 @@ image_transform tween(double time, const image_transform& source, const image_tr
        image_transform result; \r
        result.set_blend_mode           (std::max(source.get_blend_mode(), dest.get_blend_mode()));\r
        result.set_is_key                       (source.get_is_key() | dest.get_is_key());\r
-       result.set_gain                         (do_tween(time, source.get_gain(), dest.get_gain(), duration, tweener));\r
        result.set_brightness           (do_tween(time, source.get_brightness(), dest.get_brightness(), duration, tweener));\r
        result.set_contrast                     (do_tween(time, source.get_contrast(), dest.get_contrast(), duration, tweener));\r
        result.set_saturation           (do_tween(time, source.get_saturation(), dest.get_saturation(), duration, tweener));\r

diff --git a/core/producer/frame/image_transform.h b/core/producer/frame/image_transform.h
index df24a689db393c7fdba666b64c646b7ad4dab149..97b34d37d6c8caa2a0da74fd1f147fc4c33f8a8f 100644 (file)
--- a/core/producer/frame/image_transform.h
+++ b/core/producer/frame/image_transform.h
@@ -92,10 +92,7 @@ public:
 \r
        void set_opacity(double value);\r
        double get_opacity() const;\r
-\r
-       void set_gain(double value);\r
-       double get_gain() const;\r
-\r
+       \r
        void set_brightness(double value);\r
        double get_brightness() const;\r
 \r

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index ccf4fa0f11b6cc6101de4fe79bebc343cb516deb..51a7aadeeaae09feaaa67bb6bcbe18ee194a0d5b 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -251,21 +251,6 @@ bool MixerCommand::DoExecute()
                                int layer = GetLayerIndex();\r
                                GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
                        }\r
-                       else if(_parameters[1] == L"GAIN")\r
-                       {\r
-                               int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0;\r
-                               std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear";\r
-                               double value = boost::lexical_cast<double>(_parameters.at(2));\r
-                               \r
-                               auto transform = [=](image_transform transform) -> image_transform\r
-                               {\r
-                                       transform.set_gain(value);\r
-                                       return transform;                                       \r
-                               };\r
-\r
-                               int layer = GetLayerIndex();\r
-                               GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween);\r
-                       }\r
                        else if(_parameters[1] == L"FILL_RECT")\r
                        {\r
                                int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0;\r