2.1.0: Moved gpu stuff into gpu folder.

[casparcg] / core / mixer / audio / audio_mixer.cpp

diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp
index 86303f09939e2791acb56bb2a02ffa7d4adc5a8b..a660743e4ea0d171d9e905cce5adb2c9e8c2c1e0 100644 (file)
--- a/core/mixer/audio/audio_mixer.cpp
+++ b/core/mixer/audio/audio_mixer.cpp
@@ -23,10 +23,9 @@
 \r
 #include "audio_mixer.h"\r
 \r
-#include <core/mixer/write_frame.h>\r
-#include <core/producer/frame/frame_transform.h>\r
-\r
-#include <tbb/cache_aligned_allocator.h>\r
+#include <core/mixer/gpu/write_frame.h>\r
+#include <core/frame/frame_transform.h>\r
+#include <common/diagnostics/graph.h>\r
 \r
 #include <boost/range/adaptors.hpp>\r
 #include <boost/range/distance.hpp>\r
@@ -63,22 +62,21 @@ struct audio_stream
        audio_buffer_ps         audio_data;\r
 };\r
 \r
-struct audio_mixer::implementation\r
+struct audio_mixer::impl : boost::noncopyable\r
 {\r
        std::stack<core::frame_transform>       transform_stack_;\r
        std::map<const void*, audio_stream>     audio_streams_;\r
        std::vector<audio_item>                         items_;\r
-       std::vector<size_t>                                     audio_cadence_;\r
+       std::vector<int>                                        audio_cadence_;\r
        video_format_desc                                       format_desc_;\r
        \r
 public:\r
-       implementation()\r
-               : format_desc_(video_format_desc::get(video_format::invalid))\r
+       impl()\r
        {\r
                transform_stack_.push(core::frame_transform());\r
        }\r
        \r
-       void begin(core::basic_frame& frame)\r
+       void begin(core::draw_frame& frame)\r
        {\r
                transform_stack_.push(transform_stack_.top()*frame.get_frame_transform());\r
        }\r
@@ -130,10 +128,7 @@ public:
                                prev_transform  = it->second.prev_transform;\r
                                next_audio              = std::move(it->second.audio_data);\r
                        }\r
-\r
-                       if(prev_transform.volume < 0.001 && next_transform.volume < 0.001)\r
-                               continue;\r
-                       \r
+                                               \r
                        const float prev_volume = static_cast<float>(prev_transform.volume);\r
                        const float next_volume = static_cast<float>(next_transform.volume);\r
                                                                        \r
@@ -167,6 +162,14 @@ public:
                std::vector<float> result_ps(audio_cadence_.front(), 0.0f);\r
                BOOST_FOREACH(auto& stream, audio_streams_ | boost::adaptors::map_values)\r
                {\r
+                       //CASPAR_LOG(debug) << stream.audio_data.size() << L" : " << result_ps.size();\r
+\r
+                       if(stream.audio_data.size() < result_ps.size())\r
+                       {\r
+                               stream.audio_data.resize(result_ps.size(), 0.0f);\r
+                               CASPAR_LOG(trace) << L"[audio_mixer] Appended zero samples";\r
+                       }\r
+\r
                        auto out = boost::range::transform(result_ps, stream.audio_data, std::begin(result_ps), std::plus<float>());\r
                        stream.audio_data.erase(std::begin(stream.audio_data), std::begin(stream.audio_data) + std::distance(std::begin(result_ps), out));\r
                }               \r
@@ -175,13 +178,14 @@ public:
                \r
                audio_buffer result;\r
                result.reserve(result_ps.size());\r
-               boost::range::transform(result_ps, std::back_inserter(result), [](float sample){return static_cast<int32_t>(sample);});                                         \r
+               boost::range::transform(result_ps, std::back_inserter(result), [](float sample){return static_cast<int32_t>(sample);});         \r
+               \r
                return result;\r
        }\r
 };\r
 \r
-audio_mixer::audio_mixer() : impl_(new implementation()){}\r
-void audio_mixer::begin(core::basic_frame& frame){impl_->begin(frame);}\r
+audio_mixer::audio_mixer() : impl_(new impl()){}\r
+void audio_mixer::begin(core::draw_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
 audio_buffer audio_mixer::operator()(const video_format_desc& format_desc){return impl_->mix(format_desc);}\r