2.0. audio:

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

diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp
index e356844d1b4962afcc7a6fd2cb57d5ec446ce13b..dafa6e4dd0991c81a3310d407d4c61daceca954a 100644 (file)
--- a/core/mixer/audio/audio_mixer.cpp
+++ b/core/mixer/audio/audio_mixer.cpp
@@ -90,9 +90,9 @@ public:
                transform_stack_.pop();\r
        }\r
        \r
-       std::vector<int32_t> mix()\r
+       audio_buffer mix()\r
        {\r
-               auto result = std::vector<int32_t>(format_desc_.audio_samples_per_frame, 0);\r
+               auto result = audio_buffer(format_desc_.audio_samples_per_frame, 0);\r
 \r
                std::map<const void*, core::frame_transform> next_frame_transforms;\r
 \r
@@ -109,30 +109,38 @@ public:
                                \r
                        if(next.volume < 0.001 && prev.volume < 0.001)\r
                                continue;\r
-               \r
-                       static const int BASE = 1<<31;\r
-\r
-                       const auto next_volume = static_cast<int64_t>(next.volume*BASE);\r
-                       const auto prev_volume = static_cast<int64_t>(prev.volume*BASE);\r
-               \r
-                       const int n_samples = result.size();\r
-               \r
-                       const auto in_size = static_cast<size_t>(item.audio_data.size());\r
-                       CASPAR_VERIFY(in_size == 0 || in_size == result.size());\r
-\r
-                       if(in_size > result.size())\r
+                                                                       \r
+                       if(static_cast<size_t>(item.audio_data.size()) != format_desc_.audio_samples_per_frame)\r
                                continue;\r
 \r
+                       CASPAR_ASSERT(format_desc_.audio_channels == 2);\r
+                                               \r
+                       const float prev_volume = static_cast<float>(prev.volume);\r
+                       const float next_volume = static_cast<float>(next.volume);\r
+                       const float delta               = 1.0f/static_cast<float>(format_desc_.audio_samples_per_frame/2);\r
+                       \r
                        tbb::parallel_for\r
                        (\r
-                               tbb::blocked_range<size_t>(0, item.audio_data.size()),\r
+                               tbb::blocked_range<size_t>(0, format_desc_.audio_samples_per_frame/2),\r
                                [&](const tbb::blocked_range<size_t>& r)\r
                                {\r
                                        for(size_t n = r.begin(); n < r.end(); ++n)\r
                                        {\r
-                                               const auto sample_volume = (prev_volume - (prev_volume * n)/n_samples) + (next_volume * n)/n_samples;\r
-                                               const auto sample = static_cast<int32_t>((static_cast<int64_t>(item.audio_data[n])*sample_volume)/BASE);\r
-                                               result[n] = result[n] + sample;\r
+                                               const float alpha               = n * delta;\r
+                                               const float volume              = prev_volume * (1.0f - alpha) + next_volume * alpha;\r
+\r
+                                               auto sample_epi32               = _mm_loadl_epi64(reinterpret_cast<__m128i*>(&item.audio_data[n*2]));\r
+\r
+                                               auto sample_ps                  = _mm_cvtepi32_ps(sample_epi32);                                                                                                \r
+                                               sample_ps                               = _mm_mul_ps(sample_ps, _mm_set1_ps(volume));   \r
+\r
+                                               auto res_sample_epi32   = _mm_loadl_epi64(reinterpret_cast<__m128i*>(&result[n*2]));\r
+                                               auto res_sample_ps              = _mm_cvtepi32_ps(res_sample_epi32);    \r
+\r
+                                               res_sample_ps                   = _mm_add_ps(sample_ps, res_sample_ps);\r
+                                               res_sample_epi32                = _mm_cvtps_epi32(res_sample_ps);\r
+                                               \r
+                                               _mm_storel_epi64(reinterpret_cast<__m128i*>(&result[n*2]), res_sample_epi32);\r
                                        }\r
                                }\r
                        );\r
@@ -141,6 +149,7 @@ public:
                items.clear();\r
                prev_frame_transforms_ = std::move(next_frame_transforms);      \r
 \r
+               result.resize(format_desc_.audio_samples_per_frame);\r
                return std::move(result);\r
        }\r
 };\r
@@ -149,7 +158,7 @@ audio_mixer::audio_mixer(const core::video_format_desc& format_desc) : impl_(new
 void audio_mixer::begin(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<int32_t> audio_mixer::mix(){return impl_->mix();}\r
+audio_buffer audio_mixer::mix(){return impl_->mix();}\r
 audio_mixer& audio_mixer::operator=(audio_mixer&& other)\r
 {\r
        impl_ = std::move(other.impl_);\r