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

diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp
index 95ff25d06bf7bf99f93b44df689b3380e3dddf72..5a695e61c4e79a456c93df2e71600fc1a67e1f76 100644 (file)
--- a/core/mixer/audio/audio_mixer.cpp
+++ b/core/mixer/audio/audio_mixer.cpp
@@ -24,7 +24,7 @@
 #include <core/mixer/write_frame.h>\r
 #include <core/producer/frame/frame_transform.h>\r
 \r
-#include <ppl.h>\r
+#include <tbb/parallel_for.h>\r
 \r
 #include <safeint.h>\r
 \r
@@ -98,6 +98,8 @@ public:
 \r
                std::map<const void*, core::frame_transform> next_frame_transforms;\r
                \r
+               tbb::affinity_partitioner ap;\r
+\r
                BOOST_FOREACH(auto& item, items)\r
                {                       \r
                        const auto next = item.transform;\r
@@ -108,7 +110,7 @@ public:
                                prev = it->second;\r
                                \r
                        next_frame_transforms[item.tag] = next; // Store all active tags, inactive tags will be removed at the end.\r
-                               \r
+\r
                        if(next.volume < 0.001 && prev.volume < 0.001)\r
                                continue;\r
                                                                        \r
@@ -121,15 +123,14 @@ public:
                        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/format_desc_.audio_channels);\r
-                       \r
+                                               \r
                        auto alpha_ps   = _mm_setr_ps(delta, delta, 0.0f, 0.0f);\r
                        auto delta2_ps  = _mm_set_ps1(delta*2.0f);\r
                        auto prev_ps    = _mm_set_ps1(prev_volume);\r
                        auto next_ps    = _mm_set_ps1(next_volume);     \r
 \r
-                       Concurrency::parallel_for<int>(0, format_desc_.audio_samples_per_frame/4,\r
-                       [&](int n)\r
-                       {                       \r
+                       for(size_t n = 0; n < format_desc_.audio_samples_per_frame/4; ++n)\r
+                       {               \r
                                auto next2_ps           = _mm_mul_ps(next_ps, alpha_ps);\r
                                auto prev2_ps           = _mm_sub_ps(prev_ps, _mm_mul_ps(prev_ps, alpha_ps));\r
                                auto volume_ps          = _mm_add_ps(next2_ps, prev2_ps);\r
@@ -142,17 +143,16 @@ public:
                                alpha_ps                        = _mm_add_ps(alpha_ps, delta2_ps);\r
 \r
                                _mm_store_ps(&intermediate[n*4], res_sample_ps);\r
-                       });\r
+                       }\r
                }\r
                \r
-               auto result = audio_buffer(format_desc_.audio_samples_per_frame+128, 0);        \r
-               \r
-               Concurrency::parallel_for<int>(0, format_desc_.audio_samples_per_frame/32,              \r
-               [&](int n)\r
-               {               \r
-                       auto intermediate_128 = reinterpret_cast<__m128i*>(intermediate.data()+n*32);\r
-                       auto result_128           = reinterpret_cast<__m128i*>(result.data()+n*32);\r
+               auto result = audio_buffer(format_desc_.audio_samples_per_frame+128);   \r
+                       \r
+               auto intermediate_128 = reinterpret_cast<__m128i*>(intermediate.data());\r
+               auto result_128           = reinterpret_cast<__m128i*>(result.data());\r
                                \r
+               for(size_t n = 0; n < format_desc_.audio_samples_per_frame/32; ++n)\r
+               {       \r
                        auto xmm0 = _mm_load_ps(reinterpret_cast<float*>(intermediate_128++));\r
                        auto xmm1 = _mm_load_ps(reinterpret_cast<float*>(intermediate_128++));\r
                        auto xmm2 = _mm_load_ps(reinterpret_cast<float*>(intermediate_128++));\r
@@ -170,7 +170,7 @@ public:
                        _mm_stream_si128(result_128++, _mm_cvtps_epi32(xmm5));\r
                        _mm_stream_si128(result_128++, _mm_cvtps_epi32(xmm6));\r
                        _mm_stream_si128(result_128++, _mm_cvtps_epi32(xmm7));\r
-               });\r
+               }\r
 \r
                items.clear();\r
                prev_frame_transforms_ = std::move(next_frame_transforms);      \r