2.0.0.2: ffmpeg_producer: Fixed audio-only playback.

[casparcg] / core / mixer / write_frame.h

diff --git a/core/mixer/write_frame.h b/core/mixer/write_frame.h
index 06cdde00d04c28afa48b2dc6e9333947cd409dde..0b2b2090ed0812a9b2acd3d4612c01fe02f73409 100644 (file)
--- a/core/mixer/write_frame.h
+++ b/core/mixer/write_frame.h
@@ -22,13 +22,13 @@
 #include <common/memory/safe_ptr.h>\r
 \r
 #include <core/producer/frame/basic_frame.h>\r
+#include <core/video_format.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 #include <boost/range/iterator_range.hpp>\r
 \r
-#include <memory>\r
-#include <vector>\r
 #include <cstdint>\r
+#include <vector>\r
 \r
 namespace caspar { namespace core {\r
 \r
@@ -41,7 +41,9 @@ class ogl_device;
 class write_frame : public core::basic_frame, boost::noncopyable\r
 {\r
 public:        \r
+       write_frame(int tag);\r
        explicit write_frame(ogl_device& ogl, int tag, const core::pixel_format_desc& desc);\r
+       write_frame(const write_frame& other);\r
                        \r
        virtual boost::iterator_range<uint8_t*> image_data(size_t plane_index = 0);     \r
        virtual std::vector<int16_t>& audio_data();\r
@@ -51,21 +53,24 @@ public:
 \r
        void commit(uint32_t plane_index);\r
        void commit();\r
-\r
+       \r
+       void set_type(const core::video_mode::type& mode);\r
+       core::video_mode::type get_type() const;\r
+       \r
        virtual void accept(core::frame_visitor& visitor);\r
 \r
        virtual int tag() const;\r
+\r
+       const core::pixel_format_desc& get_pixel_format_desc() const;\r
        \r
 private:\r
        friend class image_mixer;\r
-\r
-       const core::pixel_format_desc& get_pixel_format_desc() const;\r
+       \r
        const std::vector<safe_ptr<device_buffer>>& get_textures() const;\r
 \r
        struct implementation;\r
-       std::shared_ptr<implementation> impl_;\r
+       safe_ptr<implementation> impl_;\r
 };\r
-typedef std::shared_ptr<write_frame> write_frame_impl_ptr;\r
 \r
 \r
 }}
\ No newline at end of file