2.0.0.2: -mixer: Moved device -> host read mapping to consumer_device thus reducing...

         -flash_producer: Added bad_alloc check to avoid potential access violations.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@820 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp
index 598842bd3477da470a74f6aea77dcd20bbec69d3..a42b27cc401cace80a758359fe4b514e63d825e0 100644 (file)
--- a/core/mixer/audio/audio_mixer.cpp
+++ b/core/mixer/audio/audio_mixer.cpp
@@ -64,15 +64,14 @@ public:
                        prev = it->second;\r
                                \r
                next_audio_transforms_[tag] = next; // Store all active tags, inactive tags will be removed in end_pass.\r
-               \r
-               \r
+                               \r
                if(next.get_gain() < 0.001 && prev.get_gain() < 0.001)\r
                        return;\r
                \r
                static const int BASE = 1<<15;\r
 \r
-               auto next_gain = static_cast<int32_t>(next.get_gain()*BASE);\r
-               auto prev_gain = static_cast<int32_t>(prev.get_gain()*BASE);\r
+               auto next_gain = static_cast<int>(next.get_gain()*BASE);\r
+               auto prev_gain = static_cast<int>(prev.get_gain()*BASE);\r
                \r
                int n_samples = audio_data_.size();\r
 \r
@@ -85,9 +84,9 @@ public:
                                {\r
                                        int sample_gain = (prev_gain - (prev_gain * n)/n_samples) + (next_gain * n)/n_samples;\r
                                        \r
-                                       int sample = (static_cast<int32_t>(audio_data[n])*sample_gain)/BASE;\r
+                                       int sample = (static_cast<int>(audio_data[n])*sample_gain)/BASE;\r
                                        \r
-                                       audio_data_[n] = static_cast<int16_t>((static_cast<int32_t>(audio_data_[n]) + sample) & 0xFFFF);\r
+                                       audio_data_[n] = static_cast<int16_t>((static_cast<int>(audio_data_[n]) + sample) & 0xFFFF);\r
                                }\r
                        }\r
                );\r
@@ -105,7 +104,7 @@ public:
        }\r
 \r
 \r
-       std::vector<short> mix()\r
+       std::vector<int16_t> mix()\r
        {\r
                prev_audio_transforms_ = std::move(next_audio_transforms_);     \r
                return std::move(audio_data_);\r
@@ -116,6 +115,6 @@ audio_mixer::audio_mixer() : impl_(new implementation()){}
 void audio_mixer::begin(const core::basic_frame& frame){impl_->begin(frame);}\r
 void audio_mixer::visit(core::write_frame& frame){impl_->visit(frame);}\r
 void audio_mixer::end(){impl_->end();}\r
-std::vector<short> audio_mixer::mix(){return impl_->mix();}\r
+std::vector<int16_t> audio_mixer::mix(){return impl_->mix();}\r
 \r
 }}
\ No newline at end of file

diff --git a/core/mixer/audio/audio_mixer.h b/core/mixer/audio/audio_mixer.h
index 9f524420b151f24b700f94a3f3b569a1ea2dfc80..d45370bb2f0a957ae8aaa5b9bc3750728d9d2628 100644 (file)
--- a/core/mixer/audio/audio_mixer.h
+++ b/core/mixer/audio/audio_mixer.h
@@ -35,7 +35,7 @@ public:
        virtual void visit(core::write_frame& frame);\r
        virtual void end();\r
 \r
-       std::vector<short> mix();\r
+       std::vector<int16_t> mix();\r
 \r
 private:\r
        struct implementation;\r

diff --git a/core/mixer/frame_mixer_device.cpp b/core/mixer/frame_mixer_device.cpp
index 2b07746d83a3c1f3fa2897d71b4009286857a980..88308a346bb45f1f07d010de216eac95863679e1 100644 (file)
--- a/core/mixer/frame_mixer_device.cpp
+++ b/core/mixer/frame_mixer_device.cpp
@@ -127,7 +127,7 @@ public:
                CASPAR_LOG(info) << print() << L" Successfully initialized.";   \r
        }\r
        \r
-       boost::unique_future<safe_ptr<const host_buffer>> mix_image(std::map<int, safe_ptr<core::basic_frame>> frames)\r
+       boost::unique_future<safe_ptr<host_buffer>> mix_image(std::map<int, safe_ptr<core::basic_frame>> frames)\r
        {               \r
                auto& root_image_transform = boost::fusion::at_key<core::image_transform>(root_transforms_);\r
                auto& image_transforms = boost::fusion::at_key<core::image_transform>(transforms_);\r
@@ -162,7 +162,7 @@ public:
                return image_mixer_.render();\r
        }\r
 \r
-       std::vector<short> mix_audio(const std::map<int, safe_ptr<core::basic_frame>>& frames)\r
+       std::vector<int16_t> mix_audio(const std::map<int, safe_ptr<core::basic_frame>>& frames)\r
        {\r
                auto& root_audio_transform = boost::fusion::at_key<core::audio_transform>(root_transforms_);\r
                auto& audio_transforms = boost::fusion::at_key<core::audio_transform>(transforms_);\r

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index bc47e5a6b3ca2948f38251fe8a72e013cec4a269..a492a8aeed7f8fba65910636938c17f6b72a507a 100644 (file)
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -110,19 +110,13 @@ public:
        {\r
        }\r
 \r
-       boost::unique_future<safe_ptr<const host_buffer>> render()\r
+       boost::unique_future<safe_ptr<host_buffer>> render()\r
        {\r
                auto read_buffer = read_buffer_;\r
-\r
-               auto result = ogl_device::begin_invoke([=]() -> safe_ptr<const host_buffer>\r
-               {\r
-                       read_buffer->map(); // Might block.\r
-                       return read_buffer;\r
-               });\r
-\r
+               \r
                auto render_queue = std::move(render_queue_);\r
 \r
-               ogl_device::begin_invoke([=]() mutable\r
+               return ogl_device::begin_invoke([=]() mutable -> safe_ptr<host_buffer>\r
                {\r
                        local_key_ = false;\r
                        layer_key_ = false;\r
@@ -154,15 +148,14 @@ public:
                                std::swap(local_key_buffer_, layer_key_buffer_);\r
                        }\r
 \r
-                       // Start transfer from device to host.\r
+                       std::swap(draw_buffer_, write_buffer_);\r
 \r
-                       read_buffer_ = ogl_device::create_host_buffer(format_desc_.size, host_buffer::read_only);\r
-                       draw_buffer_->write(*read_buffer_);\r
+                       // Start transfer from device to host.  \r
+                       auto result = ogl_device::create_host_buffer(format_desc_.size, host_buffer::read_only);                                        \r
+                       write_buffer_->write(*result);\r
 \r
-                       std::swap(draw_buffer_, write_buffer_);\r
+                       return result;\r
                });\r
-                               \r
-               return std::move(result);\r
        }\r
        \r
        void draw(const render_item& item)\r
@@ -231,7 +224,7 @@ image_mixer::image_mixer(const core::video_format_desc& format_desc) : impl_(new
 void image_mixer::begin(const core::basic_frame& frame){impl_->begin(frame);}\r
 void image_mixer::visit(core::write_frame& frame){impl_->visit(frame);}\r
 void image_mixer::end(){impl_->end();}\r
-boost::unique_future<safe_ptr<const host_buffer>> image_mixer::render(){return impl_->render();}\r
+boost::unique_future<safe_ptr<host_buffer>> image_mixer::render(){return impl_->render();}\r
 safe_ptr<write_frame> image_mixer::create_frame(void* tag, const core::pixel_format_desc& desc){return impl_->create_frame(tag, desc);}\r
 void image_mixer::begin_layer(){impl_->begin_layer();}\r
 void image_mixer::end_layer(){impl_->end_layer();}\r

diff --git a/core/mixer/image/image_mixer.h b/core/mixer/image/image_mixer.h
index aab31eec247d9e00b5fa3f4930f157004ae37600..002e4ffc6b3c6046b9e2089383da33d290b35cf7 100644 (file)
--- a/core/mixer/image/image_mixer.h
+++ b/core/mixer/image/image_mixer.h
@@ -48,7 +48,7 @@ public:
        void begin_layer();\r
        void end_layer();\r
        \r
-       boost::unique_future<safe_ptr<const host_buffer>> render();\r
+       boost::unique_future<safe_ptr<host_buffer>> render();\r
 \r
        safe_ptr<write_frame> create_frame(void* tag, const core::pixel_format_desc& format);\r
 \r

diff --git a/core/mixer/read_frame.cpp b/core/mixer/read_frame.cpp
index 0c0b80fe04a297890f52240c5b38debd18bd890c..ee3f73030412f479160398456c749fff4ded9115 100644 (file)
--- a/core/mixer/read_frame.cpp
+++ b/core/mixer/read_frame.cpp
@@ -22,16 +22,17 @@
 #include "read_frame.h"\r
 \r
 #include "gpu/host_buffer.h"   \r
+#include "gpu/ogl_device.h"\r
 \r
 namespace caspar { namespace core {\r
                                                                                                                                                                                                                                                                                                                        \r
 struct read_frame::implementation : boost::noncopyable\r
 {\r
-       boost::unique_future<safe_ptr<const host_buffer>> image_data_;\r
+       boost::unique_future<safe_ptr<host_buffer>> image_data_;\r
        std::vector<int16_t> audio_data_;\r
 \r
 public:\r
-       implementation(boost::unique_future<safe_ptr<const host_buffer>>&& image_data, std::vector<int16_t>&& audio_data) \r
+       implementation(boost::unique_future<safe_ptr<host_buffer>>&& image_data, std::vector<int16_t>&& audio_data) \r
                : image_data_(std::move(image_data))\r
                , audio_data_(std::move(audio_data)){}  \r
 \r
@@ -39,6 +40,14 @@ public:
        {\r
                try\r
                {\r
+                       if(!image_data_.get()->data())\r
+                       {\r
+                               ogl_device::invoke([&]\r
+                               {\r
+                                       image_data_.get()->map();\r
+                               }, high_priority);\r
+                       }\r
+\r
                        if(!image_data_.get()->data())\r
                                return boost::iterator_range<const uint8_t*>();\r
                        auto ptr = static_cast<const uint8_t*>(image_data_.get()->data());\r
@@ -56,11 +65,11 @@ public:
        }\r
 };\r
 \r
-read_frame::read_frame(boost::unique_future<safe_ptr<const host_buffer>>&& image_data, std::vector<int16_t>&& audio_data) \r
+read_frame::read_frame(boost::unique_future<safe_ptr<host_buffer>>&& image_data, std::vector<int16_t>&& audio_data) \r
        : impl_(new implementation(std::move(image_data), std::move(audio_data))){}\r
-read_frame::read_frame(safe_ptr<const host_buffer>&& image_data, std::vector<int16_t>&& audio_data) \r
+read_frame::read_frame(safe_ptr<host_buffer>&& image_data, std::vector<int16_t>&& audio_data) \r
 {\r
-       boost::promise<safe_ptr<const host_buffer>> p;\r
+       boost::promise<safe_ptr<host_buffer>> p;\r
        p.set_value(std::move(image_data));\r
        impl_.reset(new implementation(std::move(p.get_future()), std::move(audio_data)));\r
 }\r

diff --git a/core/mixer/read_frame.h b/core/mixer/read_frame.h
index 2e3817d09f37dc9a34bf069fecfa993050e9fd8e..9e7b05f273c0078455519255d02f62b940343628 100644 (file)
--- a/core/mixer/read_frame.h
+++ b/core/mixer/read_frame.h
@@ -36,8 +36,8 @@ class read_frame : boost::noncopyable
 {\r
        read_frame(){}\r
 public:\r
-       read_frame(boost::unique_future<safe_ptr<const host_buffer>>&& image_data, std::vector<int16_t>&& audio_data);\r
-       read_frame(safe_ptr<const host_buffer>&& image_data, std::vector<int16_t>&& audio_data);\r
+       read_frame(boost::unique_future<safe_ptr<host_buffer>>&& image_data, std::vector<int16_t>&& audio_data);\r
+       read_frame(safe_ptr<host_buffer>&& image_data, std::vector<int16_t>&& audio_data);\r
 \r
        virtual const boost::iterator_range<const uint8_t*> image_data() const;\r
        virtual const boost::iterator_range<const int16_t*> audio_data() const;\r

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index 69bcd50b04479caf589b346cd64a9c59b0448ff5..a3d4fba5f6fbd44793b7ca6b9a31d4ebbec26f99 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -67,6 +67,9 @@ public:
 \r
                bmp_.reset(CreateDIBSection(static_cast<HDC>(hdc_.get()), &info, DIB_RGB_COLORS, reinterpret_cast<void**>(&bmp_data_), 0, 0), DeleteObject);\r
                SelectObject(static_cast<HDC>(hdc_.get()), bmp_.get()); \r
+\r
+               if(!bmp_data_)\r
+                       BOOST_THROW_EXCEPTION(std::bad_alloc());\r
        }\r
 \r
        operator HDC() {return static_cast<HDC>(hdc_.get());}\r