2.0. audio: Audio pipeline is now in 32 bit.

[casparcg] / core / mixer / write_frame.h

diff --git a/core/mixer/write_frame.h b/core/mixer/write_frame.h
index 05f0204ace40a716d209934436e031f7aa93c9e9..9f295f819fc4f7c3f84d5b4f4bba165455bf2e8d 100644 (file)
--- a/core/mixer/write_frame.h
+++ b/core/mixer/write_frame.h
@@ -22,17 +22,16 @@
 #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
-class host_buffer;\r
 class device_buffer;\r
 struct frame_visitor;\r
 struct pixel_format_desc;\r
@@ -41,32 +40,47 @@ class ogl_device;
 class write_frame : public core::basic_frame, boost::noncopyable\r
 {\r
 public:        \r
-       explicit write_frame(ogl_device& ogl, int tag, const core::pixel_format_desc& desc);\r
+       explicit write_frame(const void* tag);\r
+       explicit write_frame(ogl_device& ogl, const void* tag, const core::pixel_format_desc& desc);\r
+\r
+       write_frame(const write_frame& other);\r
+       write_frame(write_frame&& other);\r
+\r
+       write_frame& operator=(const write_frame& other);\r
+       write_frame& operator=(write_frame&& other);\r
+               \r
+       void swap(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
-       \r
-       virtual const boost::iterator_range<const uint8_t*> image_data(size_t plane_index = 0) const;\r
-       virtual const boost::iterator_range<const int16_t*> audio_data() const;\r
+       boost::iterator_range<uint8_t*> image_data(size_t plane_index = 0);     \r
+       const boost::iterator_range<const uint8_t*> image_data(size_t plane_index = 0) const;\r
 \r
+       std::vector<int32_t>& audio_data();\r
+       const boost::iterator_range<const int32_t*> audio_data() const;\r
+       \r
        void commit(uint32_t plane_index);\r
        void commit();\r
+       \r
+       void set_type(const core::field_mode::type& mode);\r
+       core::field_mode::type get_type() const;\r
+       \r
+       const void* tag() const;\r
+\r
+       const core::pixel_format_desc& get_pixel_format_desc() const;\r
+       \r
+       // basic_frame\r
 \r
        virtual void accept(core::frame_visitor& visitor);\r
 \r
-       virtual int tag() const;\r
+       virtual std::wstring print() 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
-       const std::vector<safe_ptr<host_buffer>>& get_buffers() 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