X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fmixer%2Faudio%2Faudio_mixer.cpp;h=dafa6e4dd0991c81a3310d407d4c61daceca954a;hb=ffcb75eabba1d77eab8d83447136261462e3e088;hp=b9e9b0b59224807723a9dd1671a9ab11ad72fe79;hpb=4a121732f562b1a45b5d5fe0c921a8345508e7d6;p=casparcg diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp index b9e9b0b59..dafa6e4dd 100644 --- a/core/mixer/audio/audio_mixer.cpp +++ b/core/mixer/audio/audio_mixer.cpp @@ -22,82 +22,65 @@ #include "audio_mixer.h" #include -#include +#include + +#include + +#include + +#include +#include namespace caspar { namespace core { + +struct audio_item +{ + const void* tag; + frame_transform transform; + std::vector audio_data; +}; struct audio_mixer::implementation { - std::deque> audio_data_; - std::stack transform_stack_; - - std::map prev_audio_transforms_; - std::map next_audio_transforms_; - - const core::video_format_desc format_desc_; + std::stack transform_stack_; + std::map prev_frame_transforms_; + const core::video_format_desc format_desc_; + std::vector items; public: implementation(const core::video_format_desc& format_desc) : format_desc_(format_desc) { - transform_stack_.push(core::audio_transform()); - audio_data_.push_back(std::vector()); // One frame delay + transform_stack_.push(core::frame_transform()); } void begin(core::basic_frame& frame) { - transform_stack_.push(transform_stack_.top()*frame.get_audio_transform()); + transform_stack_.push(transform_stack_.top()*frame.get_frame_transform()); } void visit(const core::write_frame& frame) { - if(!transform_stack_.top().get_has_audio() || frame.audio_data().empty()) + // We only care about the last field. + if(format_desc_.field_mode == field_mode::upper && transform_stack_.top().field_mode == field_mode::upper) return; - const auto& audio_data = frame.audio_data(); - const auto tag = frame.tag(); // Get the identifier for the audio-stream. - - const auto next = transform_stack_.top(); - auto prev = next; - - const auto it = prev_audio_transforms_.find(tag); - if(it != prev_audio_transforms_.end()) - prev = it->second; - - next_audio_transforms_[tag] = next; // Store all active tags, inactive tags will be removed in end_pass. - - if(next.get_gain() < 0.001 && prev.get_gain() < 0.001) + if(format_desc_.field_mode == field_mode::lower && transform_stack_.top().field_mode == field_mode::lower) return; - - static const int BASE = 1<<15; - - const auto next_gain = static_cast(next.get_gain()*BASE); - const auto prev_gain = static_cast(prev.get_gain()*BASE); - - const int n_samples = audio_data_.back().size(); - - const auto in_size = static_cast(audio_data.size()); - CASPAR_VERIFY(in_size == 0 || in_size == audio_data_.back().size()); - if(in_size > audio_data_.back().size()) + // Skip empty audio. + if(transform_stack_.top().volume < 0.002 || frame.audio_data().empty()) return; - tbb::parallel_for - ( - tbb::blocked_range(0, audio_data.size()), - [&](const tbb::blocked_range& r) - { - for(size_t n = r.begin(); n < r.end(); ++n) - { - const int sample_gain = (prev_gain - (prev_gain * n)/n_samples) + (next_gain * n)/n_samples; - const int sample = (static_cast(audio_data[n])*sample_gain)/BASE; - audio_data_.back()[n] = static_cast((static_cast(audio_data_.back()[n]) + sample) & 0xFFFF); - } - } - ); + audio_item item; + item.tag = frame.tag(); + item.transform = transform_stack_.top(); + item.audio_data = std::vector(frame.audio_data().begin(), frame.audio_data().end()); + + items.push_back(item); } - void begin(const core::audio_transform& transform) + void begin(const core::frame_transform& transform) { transform_stack_.push(transform_stack_.top()*transform); } @@ -107,12 +90,66 @@ public: transform_stack_.pop(); } - std::vector mix() + audio_buffer mix() { - prev_audio_transforms_ = std::move(next_audio_transforms_); - auto result = std::move(audio_data_.front()); - audio_data_.pop_front(); - audio_data_.push_back(std::vector(format_desc_.audio_samples_per_frame)); + auto result = audio_buffer(format_desc_.audio_samples_per_frame, 0); + + std::map next_frame_transforms; + + BOOST_FOREACH(auto& item, items) + { + const auto next = item.transform; + auto prev = next; + + const auto it = prev_frame_transforms_.find(item.tag); + if(it != prev_frame_transforms_.end()) + prev = it->second; + + next_frame_transforms[item.tag] = next; // Store all active tags, inactive tags will be removed at the end. + + if(next.volume < 0.001 && prev.volume < 0.001) + continue; + + if(static_cast(item.audio_data.size()) != format_desc_.audio_samples_per_frame) + continue; + + CASPAR_ASSERT(format_desc_.audio_channels == 2); + + const float prev_volume = static_cast(prev.volume); + const float next_volume = static_cast(next.volume); + const float delta = 1.0f/static_cast(format_desc_.audio_samples_per_frame/2); + + tbb::parallel_for + ( + tbb::blocked_range(0, format_desc_.audio_samples_per_frame/2), + [&](const tbb::blocked_range& r) + { + for(size_t n = r.begin(); n < r.end(); ++n) + { + const float alpha = n * delta; + const float volume = prev_volume * (1.0f - alpha) + next_volume * alpha; + + auto sample_epi32 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(&item.audio_data[n*2])); + + auto sample_ps = _mm_cvtepi32_ps(sample_epi32); + sample_ps = _mm_mul_ps(sample_ps, _mm_set1_ps(volume)); + + auto res_sample_epi32 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(&result[n*2])); + auto res_sample_ps = _mm_cvtepi32_ps(res_sample_epi32); + + res_sample_ps = _mm_add_ps(sample_ps, res_sample_ps); + res_sample_epi32 = _mm_cvtps_epi32(res_sample_ps); + + _mm_storel_epi64(reinterpret_cast<__m128i*>(&result[n*2]), res_sample_epi32); + } + } + ); + } + + items.clear(); + prev_frame_transforms_ = std::move(next_frame_transforms); + + result.resize(format_desc_.audio_samples_per_frame); return std::move(result); } }; @@ -121,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);} void audio_mixer::visit(core::write_frame& frame){impl_->visit(frame);} void audio_mixer::end(){impl_->end();} -std::vector audio_mixer::mix(){return impl_->mix();} +audio_buffer audio_mixer::mix(){return impl_->mix();} audio_mixer& audio_mixer::operator=(audio_mixer&& other) { impl_ = std::move(other.impl_);