2.0 image_mixer: Refactored, core: Fixed destruction proxy usage.

[casparcg] / core / producer / frame_producer.h

diff --git a/core/producer/frame_producer.h b/core/producer/frame_producer.h
index b6aa43b493f290f071bc0f6fd4c16f03feab4fbe..830461d5b9841ca7a31c73bc28e0285033b1c88a 100644 (file)
--- a/core/producer/frame_producer.h
+++ b/core/producer/frame_producer.h
@@ -19,64 +19,57 @@
 */\r
 #pragma once\r
 \r
-#include "../processor/draw_frame.h"\r
-#include "../processor/frame_processor_device.h"\r
-#include "../../common/utility/safe_ptr.h"\r
+#include <common/memory/safe_ptr.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r
-#include <memory>\r
+#include <functional>\r
+#include <string>\r
+#include <vector>\r
+#include <stdint.h>\r
+#include <numeric>\r
 \r
-namespace caspar { namespace core {\r
+namespace caspar { \r
        \r
-class frame_producer : boost::noncopyable\r
+class executor;\r
+       \r
+namespace core {\r
+\r
+class basic_frame;\r
+struct frame_factory;\r
+\r
+struct frame_producer : boost::noncopyable\r
 {\r
 public:\r
+       enum hints\r
+       {\r
+               NO_HINT = 0,\r
+               ALPHA_HINT = 1\r
+       };\r
+\r
        virtual ~frame_producer(){}     \r
 \r
-       ////////////////////////////////////////////////////////////////////////////////////////////////////\r
-       /// \fn virtual draw_frame :::receive() = 0;\r
-       ///\r
-       /// \brief      Renders a frame.\r
-       ///             \r
-       /// \note       This function is run in through the tbb task_schedular and shall be *non blocking*.\r
-       ///\r
-       /// \return     The frame. \r
-       ////////////////////////////////////////////////////////////////////////////////////////////////////\r
-       virtual safe_ptr<draw_frame> receive() = 0;\r
-\r
-       ////////////////////////////////////////////////////////////////////////////////////////////////////\r
-       /// \fn virtual std::shared_ptr<frame_producer> :::get_following_producer() const\r
-       ///\r
-       /// \brief      Gets the producer which will replace the current producer on EOF. \r
-       ///\r
-       /// \return     The following producer, or nullptr if there is no following producer. \r
-       ////////////////////////////////////////////////////////////////////////////////////////////////////\r
-       virtual safe_ptr<frame_producer> get_following_producer() const {return frame_producer::empty();}\r
-       \r
-       ////////////////////////////////////////////////////////////////////////////////////////////////////\r
-       /// \fn virtual void :::set_leading_producer(const std::shared_ptr<frame_producer>& producer)\r
-       ///\r
-       /// \brief      Sets the producer which was run before the current producer. \r
-       ///\r
-       /// \param      producer        The leading producer.\r
-       ////////////////////////////////////////////////////////////////////////////////////////////////////\r
-       virtual void set_leading_producer(const safe_ptr<frame_producer>& /*producer*/) {}\r
+       virtual std::wstring print() const = 0; // nothrow\r
+\r
+       virtual void param(const std::wstring&){}\r
+\r
+       virtual safe_ptr<frame_producer> get_following_producer() const {return frame_producer::empty();}  // nothrow\r
+       virtual void set_leading_producer(const safe_ptr<frame_producer>&) {}  // nothrow\r
+               \r
+       virtual int64_t nb_frames() const {return std::numeric_limits<int>::max();}\r
        \r
-       ////////////////////////////////////////////////////////////////////////////////////////////////////\r
-       /// \fn virtual void :::initialize(const frame_processor_device_ptr& frame_processor) = 0;\r
-       ///\r
-       /// \brief      Provides the frame frame_processor used to create frames and initializes the producer. \r
-       ///\r
-       /// \param      frame_processor The frame frame_processor. \r
-       ////////////////////////////////////////////////////////////////////////////////////////////////////\r
-       virtual void initialize(const frame_processor_device_ptr& frame_processor) = 0;\r
-\r
-       static safe_ptr<frame_producer> empty();\r
-\r
-       virtual std::wstring print() const = 0;\r
+       virtual safe_ptr<basic_frame> receive(int hints) = 0;\r
+       virtual safe_ptr<core::basic_frame> last_frame() const = 0;\r
+\r
+       static const safe_ptr<frame_producer>& empty(); // nothrow\r
 };\r
 \r
-inline std::wostream& operator<<(std::wostream& out, const frame_producer& producer);\r
+safe_ptr<basic_frame> receive_and_follow(safe_ptr<frame_producer>& producer, int hints);\r
+\r
+typedef std::function<safe_ptr<core::frame_producer>(const safe_ptr<frame_factory>&, const std::vector<std::wstring>&)> producer_factory_t;\r
+void register_producer_factory(const producer_factory_t& factory); // Not thread-safe.\r
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>&, const std::vector<std::wstring>& params);\r
+\r
+safe_ptr<core::frame_producer> create_destroy_producer_proxy(executor& destroy_context, const safe_ptr<frame_producer>& producer);\r
 \r
 }}\r