\r
#include "audio_mixer.h"\r
\r
-#include "../gpu/gpu_write_frame.h"\r
+#include <core/mixer/write_frame.h>\r
+#include <core/producer/frame/frame_transform.h>\r
\r
-#include <core/producer/frame/audio_transform.h>\r
+#include <tbb/parallel_for.h>\r
\r
-namespace caspar { namespace mixer {\r
+#include <safeint.h>\r
+\r
+#include <stack>\r
+#include <deque>\r
+\r
+namespace caspar { namespace core {\r
+\r
+struct audio_item\r
+{\r
+ const void* tag;\r
+ frame_transform transform;\r
+ audio_buffer audio_data;\r
+};\r
\r
struct audio_mixer::implementation\r
{\r
- std::deque<std::vector<short>> audio_data_;\r
- std::stack<core::audio_transform> transform_stack_;\r
-\r
- std::map<int, core::audio_transform> prev_audio_transforms_;\r
- std::map<int, core::audio_transform> next_audio_transforms_;\r
+ std::stack<core::frame_transform> transform_stack_;\r
+ std::map<const void*, core::frame_transform> prev_frame_transforms_;\r
+ const core::video_format_desc format_desc_;\r
+ std::vector<audio_item> items;\r
\r
public:\r
- implementation()\r
+ implementation(const core::video_format_desc& format_desc)\r
+ : format_desc_(format_desc)\r
{\r
- transform_stack_.push(core::audio_transform());\r
-\r
- // 2 frames delay\r
- audio_data_.push_back(std::vector<short>());\r
- audio_data_.push_back(std::vector<short>());\r
+ transform_stack_.push(core::frame_transform());\r
}\r
\r
- void begin(const core::basic_frame& frame)\r
+ void begin(core::basic_frame& frame)\r
{\r
- transform_stack_.push(transform_stack_.top()*frame.get_audio_transform());\r
+ transform_stack_.push(transform_stack_.top()*frame.get_frame_transform());\r
}\r
\r
- void visit(const core::write_frame& frame)\r
+ void visit(core::write_frame& frame)\r
{\r
- if(!transform_stack_.top().get_has_audio())\r
+ // We only care about the last field.\r
+ if(format_desc_.field_mode == field_mode::upper && transform_stack_.top().field_mode == field_mode::upper)\r
return;\r
\r
- auto& audio_data = frame.audio_data();\r
- auto tag = frame.tag(); // Get the identifier for the audio-stream.\r
-\r
- if(audio_data_.back().empty())\r
- audio_data_.back().resize(audio_data.size(), 0);\r
- \r
- auto next = transform_stack_.top();\r
- auto prev = next;\r
+ if(format_desc_.field_mode == field_mode::lower && transform_stack_.top().field_mode == field_mode::lower)\r
+ return;\r
\r
- auto it = prev_audio_transforms_.find(tag);\r
- if(it != prev_audio_transforms_.end())\r
- prev = it->second;\r
- \r
- next_audio_transforms_[tag] = next; // Store all active tags, inactive tags will be removed in end_pass.\r
- \r
- auto next_gain = next.get_gain();\r
- auto prev_gain = prev.get_gain();\r
- \r
- if(next_gain < 0.001 && prev_gain < 0.001)\r
+ // Skip empty audio.\r
+ if(transform_stack_.top().volume < 0.002 || frame.audio_data().empty())\r
return;\r
\r
- tbb::parallel_for\r
- (\r
- tbb::blocked_range<size_t>(0, audio_data.size()),\r
- [&](const tbb::blocked_range<size_t>& r)\r
- {\r
- for(size_t n = r.begin(); n < r.end(); ++n)\r
- {\r
- double alpha = static_cast<double>(n)/static_cast<double>(audio_data_.back().size());\r
- double sample_gain = prev_gain * (1.0 - alpha) + next_gain * alpha;\r
- int sample = static_cast<int>(audio_data[n]);\r
- sample = (static_cast<int>(sample_gain*static_cast<double>(1<<15))*sample)>>15;\r
- audio_data_.back()[n] = static_cast<short>((static_cast<int>(audio_data_.back()[n]) + sample) & 0xFFFF);\r
- }\r
- }\r
- );\r
- }\r
+ audio_item item;\r
+ item.tag = frame.tag();\r
+ item.transform = transform_stack_.top();\r
+ item.audio_data = std::move(frame.audio_data());\r
\r
+ items.push_back(item); \r
+ }\r
\r
- void begin(const core::audio_transform& transform)\r
+ void begin(const core::frame_transform& transform)\r
{\r
transform_stack_.push(transform_stack_.top()*transform);\r
}\r
{\r
transform_stack_.pop();\r
}\r
+ \r
+ audio_buffer mix()\r
+ { \r
+ auto intermediate = std::vector<float, tbb::cache_aligned_allocator<float>>(format_desc_.audio_samples_per_frame+128, 0.0f);\r
\r
- std::vector<short> begin_pass()\r
- {\r
- auto result = std::move(audio_data_.front());\r
- audio_data_.pop_front();\r
- \r
- audio_data_.push_back(std::vector<short>());\r
+ std::map<const void*, core::frame_transform> next_frame_transforms;\r
\r
- return result;\r
- }\r
+ BOOST_FOREACH(auto& item, items)\r
+ { \r
+ const auto next = item.transform;\r
+ auto prev = next;\r
\r
- void end_pass()\r
- {\r
- prev_audio_transforms_ = std::move(next_audio_transforms_);\r
+ const auto it = prev_frame_transforms_.find(item.tag);\r
+ if(it != prev_frame_transforms_.end())\r
+ 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
+ if(next.volume < 0.001 && prev.volume < 0.001)\r
+ continue;\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
+ CASPAR_ASSERT(format_desc_.audio_samples_per_frame % 4 == 0);\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, format_desc_.audio_samples_per_frame/4),\r
+ [&](const tbb::blocked_range<size_t>& r)\r
+ {\r
+ for(size_t n = r.begin(); n < r.end(); ++n)\r
+ {\r
+ const float alpha0 = (n*2+0) * delta;\r
+ const float alpha1 = (n*2+1) * delta;\r
+ const float volume0 = (prev_volume * (1.0f - alpha0)) + (next_volume * alpha0);\r
+ const float volume1 = (prev_volume * (1.0f - alpha1)) + (next_volume * alpha1);\r
+\r
+ auto sample_ps = _mm_cvtepi32_ps(_mm_load_si128(reinterpret_cast<__m128i*>(&item.audio_data[n*4])));\r
+ auto res_sample_ps = _mm_load_ps(&intermediate[n*4]); \r
+ sample_ps = _mm_mul_ps(sample_ps, _mm_setr_ps(volume1, volume1, volume0, volume0)); \r
+ res_sample_ps = _mm_add_ps(sample_ps, res_sample_ps); \r
+\r
+ _mm_store_ps(&intermediate[n*4], res_sample_ps);\r
+ }\r
+ }\r
+ );\r
+ }\r
+ \r
+ auto result = audio_buffer(format_desc_.audio_samples_per_frame+128, 0); \r
+\r
+ auto intermediate_128 = reinterpret_cast<__m128i*>(intermediate.data());\r
+ auto result_128 = reinterpret_cast<__m128i*>(result.data());\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
+ auto xmm3 = _mm_load_ps(reinterpret_cast<float*>(intermediate_128++));\r
+ auto xmm4 = _mm_load_ps(reinterpret_cast<float*>(intermediate_128++));\r
+ auto xmm5 = _mm_load_ps(reinterpret_cast<float*>(intermediate_128++));\r
+ auto xmm6 = _mm_load_ps(reinterpret_cast<float*>(intermediate_128++));\r
+ auto xmm7 = _mm_load_ps(reinterpret_cast<float*>(intermediate_128++));\r
+ \r
+ _mm_stream_si128(result_128++, _mm_cvtps_epi32(xmm0));\r
+ _mm_stream_si128(result_128++, _mm_cvtps_epi32(xmm1));\r
+ _mm_stream_si128(result_128++, _mm_cvtps_epi32(xmm2));\r
+ _mm_stream_si128(result_128++, _mm_cvtps_epi32(xmm3));\r
+ _mm_stream_si128(result_128++, _mm_cvtps_epi32(xmm4));\r
+ _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
+ 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
\r
-audio_mixer::audio_mixer() : impl_(new implementation()){}\r
-void audio_mixer::begin(const core::basic_frame& frame){impl_->begin(frame);}\r
+audio_mixer::audio_mixer(const core::video_format_desc& format_desc) : impl_(new implementation(format_desc)){}\r
+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<short> audio_mixer::begin_pass(){return impl_->begin_pass();} \r
-void audio_mixer::end_pass(){impl_->end_pass();}\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
+ return *this;\r
+}\r
\r
}}
\ No newline at end of file