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

diff --git a/core/core.vcxproj b/core/core.vcxproj
index 7d45ded8e8cbc9387e733611364b73e2575808cf..9bd7a8e1c6384447ee7b2f1da58a2eb626b137df 100644 (file)
--- a/core/core.vcxproj
+++ b/core/core.vcxproj
@@ -247,6 +247,7 @@
     <Lib />\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
+    <ClInclude Include="mixer\audio\audio_util.h" />\r
     <ClInclude Include="mixer\gpu\fence.h" />\r
     <ClInclude Include="mixer\gpu\shader.h" />\r
     <ClInclude Include="mixer\image\blending_glsl.h" />\r

diff --git a/core/core.vcxproj.filters b/core/core.vcxproj.filters
index 5103014d7533c07cadd3ed7e014df629687c188f..83f07372ce192f365dd244464e57fd9f3efc94d1 100644 (file)
--- a/core/core.vcxproj.filters
+++ b/core/core.vcxproj.filters
@@ -127,6 +127,9 @@
     <ClInclude Include="producer\frame\frame_transform.h">\r
       <Filter>source\producer\frame</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="mixer\audio\audio_util.h">\r
+      <Filter>source\mixer\audio</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="producer\transition\transition_producer.cpp">\r

diff --git a/core/mixer/audio/audio_util.h b/core/mixer/audio/audio_util.h
new file mode 100644 (file)
index 0000000..ff756cb
--- /dev/null
+++ b/core/mixer/audio/audio_util.h
@@ -0,0 +1,22 @@
+#pragma once\r
+\r
+#include <vector>\r
+\r
+#include <stdint.h>\r
+\r
+#include <boost/range/iterator_range.hpp>\r
+\r
+namespace caspar { namespace core {\r
+\r
+static std::vector<int16_t> audio_32_to_16(const boost::iterator_range<int32_t*>& input)\r
+{      \r
+       std::vector<int16_t> audio16(input.size());\r
+       auto audio32_ptr = reinterpret_cast<const uint32_t*>(input.begin());\r
+       auto audio16_ptr = reinterpret_cast<uint32_t*>(audio16.data());\r
+       auto size                = input.size();\r
+       for(int n = 0; n < size; ++n)           \r
+               audio16_ptr[n] = (audio32_ptr[n*2+1] & 0xffff0000) | ((audio32_ptr[n*2+0] >> 16) & 0x0000ffff); \r
+       return audio16;\r
+}\r
+\r
+}}
\ No newline at end of file

diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp
index 04636b21630561998bfeaf5b3b92341426ebec38..4f5c9baf77dbdd97a1f54f187fe87b807e9cfe60 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.cpp
+++ b/modules/bluefish/consumer/bluefish_consumer.cpp
@@ -34,6 +34,7 @@
 #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
@@ -207,7 +208,7 @@ public:
        \r
        void schedule_next_video(const safe_ptr<core::read_frame>& frame)\r
        {\r
-               static std::vector<int32_t> silence(MAX_HANC_BUFFER_SIZE, 0);\r
+               static std::vector<int16_t> silence(MAX_HANC_BUFFER_SIZE, 0);\r
                \r
                executor_.begin_invoke([=]\r
                {\r
@@ -241,13 +242,10 @@ public:
 \r
                                if(embedded_audio_)\r
                                {               \r
-                                       auto frame_audio_data = frame->audio_data().empty() ? silence.data() : const_cast<int32_t*>(frame->audio_data().begin());\r
-                                       \r
-                                       std::vector<int16_t> frame_audio_data16(audio_samples);\r
-                                       for(size_t n = 0; n < frame_audio_data16.size(); ++n)           \r
-                                               frame_audio_data16[n] = (frame_audio_data[n] >> 16) & 0xffff;   \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_data16.data(), audio_samples, audio_nchannels);\r
+                                       encode_hanc(reinterpret_cast<BLUE_UINT32*>(reserved_frames_.front()->hanc_data()), frame_audio_data, audio_samples, audio_nchannels);\r
                                                                \r
                                        blue_->system_buffer_write_async(const_cast<uint8_t*>(reserved_frames_.front()->image_data()), \r
                                                                                                        reserved_frames_.front()->image_size(), \r

diff --git a/modules/oal/consumer/oal_consumer.cpp b/modules/oal/consumer/oal_consumer.cpp
index cb727f62905b54c5189abdbcd2066b8543fd2926..6fb766cfe7102aaaf7580eb8cafe795b401c6f4b 100644 (file)
--- a/modules/oal/consumer/oal_consumer.cpp
+++ b/modules/oal/consumer/oal_consumer.cpp
@@ -27,6 +27,7 @@
 #include <common/utility/string.h>\r
 \r
 #include <core/consumer/frame_consumer.h>\r
+#include <core/mixer/audio/audio_util.h>\r
 #include <core/video_format.h>\r
 \r
 #include <core/mixer/read_frame.h>\r
@@ -91,11 +92,7 @@ public:
                        Play();         \r
                }\r
 \r
-               std::vector<int16_t> audio16(frame->audio_data().size());\r
-               for(size_t n = 0; n < audio16.size(); ++n)              \r
-                       audio16[n] = (frame->audio_data()[n] >> 16) & 0xffff;           \r
-\r
-               input_.push(std::make_shared<std::vector<int16_t>>(std::move(audio16)));\r
+               input_.push(std::make_shared<std::vector<int16_t>>(core::audio_32_to_16(frame->audio_data())));\r
 \r
                return true;\r
        }\r