2.0.1: ffmpeg: Replaced TBB implementation with better Concurrency Runtime based...

[casparcg] / core / mixer / mixer.h

diff --git a/core/mixer/mixer.h b/core/mixer/mixer.h
index f0f1c47965ce1f6af5fedeb3f4d3c7a5ade6dd89..a2948c02519b22780d462f9fbe98dcf3a24827c7 100644 (file)
--- a/core/mixer/mixer.h
+++ b/core/mixer/mixer.h
@@ -19,6 +19,8 @@
 */\r
 #pragma once\r
 \r
+#include "image/blend_modes.h"\r
+\r
 #include "../producer/frame/frame_factory.h"\r
 \r
 #include <common/memory/safe_ptr.h>\r
@@ -34,29 +36,30 @@ namespace core {
 class read_frame;\r
 class write_frame;\r
 class basic_frame;\r
-class audio_transform;\r
-class image_transform;\r
+struct frame_transform;\r
+struct frame_transform;\r
 class video_channel_context;;\r
 struct pixel_format;\r
 \r
 class mixer : public core::frame_factory\r
 {\r
 public:        \r
+\r
        explicit mixer(video_channel_context& video_channel);\r
                \r
        safe_ptr<core::read_frame> execute(const std::map<int, safe_ptr<core::basic_frame>>& frames); // nothrow\r
                \r
-       safe_ptr<core::write_frame> create_frame(const void* tag, const core::pixel_format_desc& desc);         \r
-       safe_ptr<core::write_frame> create_frame(const void* tag, size_t width, size_t height, core::pixel_format::type pix_fmt = core::pixel_format::bgra);            \r
-       \r
+       safe_ptr<core::write_frame> create_frame(const void* tag, const core::pixel_format_desc& desc);                 \r
+       boost::unique_future<safe_ptr<write_frame>> create_frame2(const void* video_stream_tag, const pixel_format_desc& desc);\r
+\r
        core::video_format_desc get_video_format_desc() const; // nothrow\r
 \r
-       void reset_transforms();\r
 \r
-       void set_image_transform(int index, const core::image_transform& transform, unsigned int mix_duration = 0, const std::wstring& tween = L"linear");\r
-       void set_audio_transform(int index, const core::audio_transform& transform, unsigned int mix_duration = 0, const std::wstring& tween = L"linear");\r
-       void apply_image_transform(int index, const std::function<core::image_transform(core::image_transform)>& transform, unsigned int mix_duration = 0, const std::wstring& tween = L"linear");\r
-       void apply_audio_transform(int index, const std::function<core::audio_transform(core::audio_transform)>& transform, unsigned int mix_duration = 0, const std::wstring& tween = L"linear");\r
+       void set_frame_transform(int index, const core::frame_transform& transform, unsigned int mix_duration = 0, const std::wstring& tween = L"linear");\r
+       void apply_frame_transform(int index, const std::function<core::frame_transform(core::frame_transform)>& transform, unsigned int mix_duration = 0, const std::wstring& tween = L"linear");\r
+       void clear_transforms();\r
+\r
+       void set_blend_mode(int index, blend_mode::type value);\r
 \r
 private:\r
        struct implementation;\r