[scene] Added missing mixer features

[casparcg] / core / producer / scene / scene_producer.h

diff --git a/core/producer/scene/scene_producer.h b/core/producer/scene/scene_producer.h
index f08a550de000c49b2383db104e970b83b084d6fc..08b2e7fb6f704d0608ef996846facac3c2445954 100644 (file)
--- a/core/producer/scene/scene_producer.h
+++ b/core/producer/scene/scene_producer.h
@@ -24,15 +24,12 @@
 #include <common/log.h>
 
 #include "../frame_producer.h"
+#include "../../fwd.h"
 
 #include "../binding.h"
 #include "../variable.h"
 
-namespace caspar { namespace core {
-
-class frame_factory;
-
-namespace scene {
+namespace caspar { namespace core { namespace scene {
 
 struct coord
 {
@@ -57,16 +54,34 @@ struct corners
 struct adjustments
 {
        binding<double> opacity;
+       binding<double> contrast;
+       binding<double> saturation;
+       binding<double> brightness;
 
        adjustments();
 };
 
+struct levels
+{
+       binding<double> min_input;
+       binding<double> max_input;
+       binding<double> gamma;
+       binding<double> min_output;
+       binding<double> max_output;
+
+       levels();
+};
+
 struct chroma_key
 {
-       binding<core::chroma::type>     key;
-       binding<double>                         threshold;
-       binding<double>                         softness;
-       binding<double>                         spill;
+       binding<bool>   enable;
+       binding<double> target_hue;
+       binding<double> hue_width;
+       binding<double> min_saturation;
+       binding<double> min_brightness;
+       binding<double> softness;
+       binding<double> spill_suppress;
+       binding<double> spill_suppress_saturation;
 };
 
 struct layer
@@ -76,14 +91,17 @@ struct layer
        scene::coord                                                            position;
        scene::rect                                                                     crop;
        scene::corners                                                          perspective;
+       scene::rect                                                                     clip;
        binding<double>                                                         rotation;
        scene::adjustments                                                      adjustments;
+       scene::levels                                                           levels;
        binding<spl::shared_ptr<frame_producer>>        producer;
        binding<bool>                                                           hidden;
        binding<bool>                                                           is_key;
        binding<bool>                                                           use_mipmap;
        binding<core::blend_mode>                                       blend_mode;
        scene::chroma_key                                                       chroma_key;
+       binding<double>                                                         volume;
 
        explicit layer(const std::wstring& name, const spl::shared_ptr<frame_producer>& producer);
 };
@@ -101,19 +119,29 @@ public:
        }
 };
 
+enum class mark_action
+{
+       start,
+       stop,
+       jump_to,
+       remove
+};
+
+mark_action get_mark_action(const std::wstring& name);
+
 class scene_producer : public frame_producer_base
 {
 public:
-       scene_producer(int width, int height);
+       scene_producer(std::wstring producer_name, std::wstring template_name, int width, int height, const video_format_desc& format_desc);
        ~scene_producer();
 
-       class draw_frame receive_impl() override;
+       draw_frame receive_impl() override;
        constraints& pixel_constraints() override;
        void on_interaction(const interaction_event::ptr& event) override;
        bool collides(double x, double y) const override;
        std::wstring print() const override;
        std::wstring name() const override;
-       std::future<std::wstring>       call(const std::vector<std::wstring>& params) override;
+       std::future<std::wstring> call(const std::vector<std::wstring>& params) override;
        boost::property_tree::wptree info() const override;
        monitor::subject& monitor_output();
 
@@ -121,7 +149,10 @@ public:
                        const spl::shared_ptr<frame_producer>& producer, int x, int y, const std::wstring& name);
        layer& create_layer(
                        const spl::shared_ptr<frame_producer>& producer, const std::wstring& name);
-       binding<int64_t> frame();
+       void reverse_layers();
+       layer& get_layer(const std::wstring& name);
+
+       binding<int64_t> timeline_frame();
        binding<double> speed();
 
        template<typename T> binding<T>& create_variable(
@@ -186,7 +217,7 @@ public:
                                                        static_cast<double>(duration)));
 
                                        to_affect.set(tweened);
-                                       
+
                                        //CASPAR_LOG(info) << relative_frame << L" " << *start_value << L" " << duration << L" " << tweened;
                                };
 
@@ -212,6 +243,9 @@ public:
                store_keyframe(to_affect.identity(), k);
        }
 
+       void add_mark(int64_t at_frame, mark_action action, const std::wstring& label);
+       void add_task(binding<bool> when, std::function<void ()> task);
+
        core::variable& get_variable(const std::wstring& name) override;
        const std::vector<std::wstring>& get_variables() const override;
 private:
@@ -223,6 +257,4 @@ private:
        std::unique_ptr<impl> impl_;
 };
 
-spl::shared_ptr<frame_producer> create_dummy_scene_producer(const spl::shared_ptr<frame_factory>& frame_factory, const video_format_desc& format_desc, const std::vector<std::wstring>& params);
-
 }}}