git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

[casparcg] / modules / bluefish / consumer / bluefish_consumer.cpp

diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp
index 989470a8438d26ed57e45bda0613662109e6e131..4f5c9baf77dbdd97a1f54f187fe87b807e9cfe60 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.cpp
+++ b/modules/bluefish/consumer/bluefish_consumer.cpp
@@ -28,10 +28,14 @@
 \r
 #include <common/concurrency/executor.h>\r
 #include <common/diagnostics/graph.h>\r
-#include <common/memory/memcpy.h>\r
 #include <common/memory/memclr.h>\r
+#include <common/memory/memcpy.h>\r
+#include <common/memory/memshfl.h>\r
 #include <common/utility/timer.h>\r
 \r
+#include <core/consumer/frame_consumer.h>\r
+#include <core/mixer/audio/audio_util.h>\r
+\r
 #include <tbb/concurrent_queue.h>\r
 \r
 #include <boost/timer.hpp>\r
@@ -62,10 +66,11 @@ struct bluefish_consumer : boost::noncopyable
        int                                                                     preroll_count_;\r
 \r
        const bool                                                      embedded_audio_;\r
+       const bool                                                      key_only_;\r
        \r
        executor                                                        executor_;\r
 public:\r
-       bluefish_consumer(const core::video_format_desc& format_desc, unsigned int device_index, bool embedded_audio) \r
+       bluefish_consumer(const core::video_format_desc& format_desc, unsigned int device_index, bool embedded_audio, bool key_only) \r
                : blue_(create_blue(device_index))\r
                , device_index_(device_index)\r
                , format_desc_(format_desc) \r
@@ -73,13 +78,14 @@ public:
                , vid_fmt_(get_video_mode(*blue_, format_desc))\r
                , preroll_count_(0)\r
                , embedded_audio_(embedded_audio)\r
+               , key_only_(key_only)\r
                , executor_(print())\r
        {\r
                executor_.set_capacity(core::consumer_buffer_depth());\r
 \r
                graph_ = diagnostics::create_graph(narrow(print()));\r
                graph_->add_guide("tick-time", 0.5);\r
-               graph_->set_color("tick-time", diagnostics::color(0.1f, 0.7f, 0.8f));\r
+               graph_->set_color("tick-time", diagnostics::color(0.0f, 0.6f, 0.9f));   \r
                graph_->add_guide("frame-time", 0.5f);  \r
                graph_->set_color("frame-time", diagnostics::color(1.0f, 0.0f, 0.0f));\r
                graph_->set_color("sync-time", diagnostics::color(0.5f, 1.0f, 0.2f));\r
@@ -156,18 +162,18 @@ public:
 \r
        ~bluefish_consumer()\r
        {\r
-               //try\r
-               //{\r
-               //      executor_.invoke([&]\r
-               //      {\r
-               //              disable_video_output();\r
-               //              blue_->device_detach();         \r
-               //      });\r
-               //}\r
-               //catch(...)\r
-               //{\r
-               //      CASPAR_LOG_CURRENT_EXCEPTION();\r
-               //}\r
+               try\r
+               {\r
+                       executor_.invoke([&]\r
+                       {\r
+                               disable_video_output();\r
+                               blue_->device_detach();         \r
+                       });\r
+               }\r
+               catch(...)\r
+               {\r
+                       CASPAR_LOG_CURRENT_EXCEPTION();\r
+               }\r
                \r
                CASPAR_LOG(info) << print() << L" Shutting down.";      \r
        }\r
@@ -216,10 +222,15 @@ public:
                                // Copy to local buffers\r
 \r
                                if(!frame->image_data().empty())\r
-                                       fast_memcpy(reserved_frames_.front()->image_data(), frame->image_data().begin(), frame->image_data().size());\r
+                               {\r
+                                       if(key_only_)                                           \r
+                                               fast_memshfl(reserved_frames_.front()->image_data(), frame->image_data().begin(), frame->image_data().size(), 0x0F0F0F0F, 0x0B0B0B0B, 0x07070707, 0x03030303);\r
+                                       else\r
+                                               fast_memcpy(reserved_frames_.front()->image_data(), frame->image_data().begin(), frame->image_data().size());\r
+                               }\r
                                else\r
                                        fast_memclr(reserved_frames_.front()->image_data(), reserved_frames_.front()->image_size());\r
-\r
+                                                               \r
                                // Sync\r
 \r
                                sync_timer_.restart();\r
@@ -231,7 +242,8 @@ public:
 \r
                                if(embedded_audio_)\r
                                {               \r
-                                       auto frame_audio_data = frame->audio_data().empty() ? silence.data() : const_cast<int16_t*>(frame->audio_data().begin());\r
+                                       auto frame_audio          = core::audio_32_to_16(frame->audio_data());\r
+                                       auto frame_audio_data = frame_audio.size() != audio_samples ? silence.data() : frame_audio.data();      \r
 \r
                                        encode_hanc(reinterpret_cast<BLUE_UINT32*>(reserved_frames_.front()->hanc_data()), frame_audio_data, audio_samples, audio_nchannels);\r
                                                                \r
@@ -308,22 +320,26 @@ struct bluefish_consumer_proxy : public core::frame_consumer
        const size_t                                            device_index_;\r
        const bool                                                      embedded_audio_;\r
        const bool                                                      key_only_;\r
+       core::video_format_desc                         format_desc_;\r
 public:\r
 \r
        bluefish_consumer_proxy(size_t device_index, bool embedded_audio, bool key_only)\r
                : device_index_(device_index)\r
                , embedded_audio_(embedded_audio)\r
-               , key_only_(key_only){}\r
+               , key_only_(key_only)\r
+       {\r
+       }\r
        \r
        virtual void initialize(const core::video_format_desc& format_desc)\r
        {\r
-               consumer_.reset();\r
-               consumer_.reset(new bluefish_consumer(format_desc, device_index_, embedded_audio_));\r
+               format_desc_ = format_desc;\r
+               consumer_.reset(new bluefish_consumer(format_desc, device_index_, embedded_audio_, key_only_));\r
        }\r
        \r
-       virtual void send(const safe_ptr<core::read_frame>& frame)\r
+       virtual bool send(const safe_ptr<core::read_frame>& frame)\r
        {\r
                consumer_->send(frame);\r
+               return true;\r
        }\r
 \r
        virtual const core::video_format_desc& get_video_format_desc() const\r
@@ -338,11 +354,6 @@ public:
 \r
                return L"bluefish [" + boost::lexical_cast<std::wstring>(device_index_) + L"]";\r
        }\r
-\r
-       virtual bool key_only() const\r
-       {\r
-               return key_only_;\r
-       }\r
 };     \r
 \r
 safe_ptr<core::frame_consumer> create_bluefish_consumer(const std::vector<std::wstring>& params)\r