X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fmixer%2Faudio%2Faudio_mixer.cpp;h=95c979fa8e9ae7c98f6f939c7bc9907436430487;hb=f7f8b0731e68e8838f19c3381afa2fd7ef407b6a;hp=687812e219fa489acedec765626c04e950e49fb6;hpb=dfbde5d6d0fcff021c60c0240d94fece52481cf5;p=casparcg diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp index 687812e21..95c979fa8 100644 --- a/core/mixer/audio/audio_mixer.cpp +++ b/core/mixer/audio/audio_mixer.cpp @@ -1,132 +1,200 @@ /* -* copyright (c) 2010 Sveriges Television AB +* Copyright (c) 2011 Sveriges Television AB * -* This file is part of CasparCG. +* This file is part of CasparCG (www.casparcg.com). * -* CasparCG is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. +* CasparCG is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. * -* CasparCG is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with CasparCG. If not, see . +* CasparCG is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with CasparCG. If not, see . * +* Author: Robert Nagy, ronag89@gmail.com */ + #include "../../stdafx.h" #include "audio_mixer.h" -#include -#include +#include +#include +#include + +#include +#include + +#include +#include +#include namespace caspar { namespace core { - -struct audio_mixer::implementation + +struct audio_item { - std::deque> audio_data_; - std::stack transform_stack_; + const void* tag; + audio_transform transform; + audio_buffer audio_data; + + audio_item() + { + } + + audio_item(audio_item&& other) + : tag(std::move(other.tag)) + , transform(std::move(other.transform)) + , audio_data(std::move(other.audio_data)) + { + } +}; - std::map prev_audio_transforms_; - std::map next_audio_transforms_; +typedef std::vector> audio_buffer_ps; + +struct audio_stream +{ + audio_transform prev_transform; + audio_buffer_ps audio_data; +}; +struct audio_mixer::impl : boost::noncopyable +{ + std::stack transform_stack_; + std::map audio_streams_; + std::vector items_; + std::vector audio_cadence_; + video_format_desc format_desc_; + public: - implementation() + impl() { transform_stack_.push(core::audio_transform()); - - // frame delay - audio_data_.push_back(std::vector()); } - void begin(const core::basic_frame& frame) + void push(const frame_transform& transform) { - transform_stack_.push(transform_stack_.top()*frame.get_audio_transform()); + transform_stack_.push(transform_stack_.top()*transform.audio_transform); } - void visit(const core::write_frame& frame) + void visit(const const_frame& frame) { - if(!transform_stack_.top().get_has_audio()) - return; - - auto& audio_data = frame.audio_data(); - auto tag = frame.tag(); // Get the identifier for the audio-stream. - - if(audio_data_.back().empty()) - audio_data_.back().resize(audio_data.size(), 0); - - auto next = transform_stack_.top(); - auto prev = next; - - 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. - + audio_item item; + item.tag = frame.tag(); + item.transform = transform_stack_.top(); + item.audio_data = frame.audio_data(); - if(next.get_gain() < 0.001 && prev.get_gain() < 0.001) - return; - - static const int BASE = 1<<15; - - auto next_gain = static_cast(next.get_gain()*BASE); - auto prev_gain = static_cast(prev.get_gain()*BASE); - - int n_samples = audio_data_.back().size(); - - 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) - { - int sample_gain = (prev_gain - (prev_gain * n)/n_samples) + (next_gain * n)/n_samples; - - int sample = (static_cast(audio_data[n])*sample_gain)/BASE; - - audio_data_.back()[n] = static_cast((static_cast(audio_data_.back()[n]) + sample) & 0xFFFF); - } - } - ); + items_.push_back(std::move(item)); } - void begin(const core::audio_transform& transform) { transform_stack_.push(transform_stack_.top()*transform); } - void end() + void pop() { transform_stack_.pop(); } + + audio_buffer mix(const video_format_desc& format_desc) + { + if(format_desc_ != format_desc) + { + audio_streams_.clear(); + audio_cadence_ = format_desc.audio_cadence; + format_desc_ = format_desc; + } + + std::map next_audio_streams; + std::vector used_tags; - void begin_pass() - { - audio_data_.push_back(std::vector()); - } + BOOST_FOREACH(auto& item, items_) + { + audio_buffer_ps next_audio; - std::vector end_pass() - { - prev_audio_transforms_ = std::move(next_audio_transforms_); + auto next_transform = item.transform; + auto prev_transform = next_transform; + + auto tag = item.tag; - auto result = std::move(audio_data_.front()); - audio_data_.pop_front(); + if(boost::range::find(used_tags, tag) != used_tags.end()) + continue; + + used_tags.push_back(tag); + + const auto it = audio_streams_.find(tag); + if(it != audio_streams_.end()) + { + prev_transform = it->second.prev_transform; + next_audio = std::move(it->second.audio_data); + } + + // Skip it if there is no existing audio stream and item has no audio-data. + if(it == audio_streams_.end() && item.audio_data.empty()) + continue; + + const float prev_volume = static_cast(prev_transform.volume); + const float next_volume = static_cast(next_transform.volume); + + // TODO: Move volume mixing into code below, in order to support audio sample counts not corresponding to frame audio samples. + auto alpha = (next_volume-prev_volume)/static_cast(item.audio_data.size()/format_desc.audio_channels); + + for(size_t n = 0; n < item.audio_data.size(); ++n) + next_audio.push_back(item.audio_data[n] * (prev_volume + (n/format_desc_.audio_channels) * alpha)); + + next_audio_streams[tag].prev_transform = std::move(next_transform); // Store all active tags, inactive tags will be removed at the end. + next_audio_streams[tag].audio_data = std::move(next_audio); + } + + items_.clear(); + + audio_streams_ = std::move(next_audio_streams); + + if(audio_streams_.empty()) + audio_streams_[nullptr].audio_data = audio_buffer_ps(audio_cadence_.front(), 0.0f); + + { // sanity check + + auto nb_invalid_streams = boost::count_if(audio_streams_ | boost::adaptors::map_values, [&](const audio_stream& x) + { + return x.audio_data.size() < audio_cadence_.front(); + }); + + if(nb_invalid_streams > 0) + CASPAR_LOG(trace) << "[audio_mixer] Incorrect frame audio cadence detected. Appending empty samples."; + } + + std::vector result_ps(audio_cadence_.front(), 0.0f); + BOOST_FOREACH(auto& stream, audio_streams_ | boost::adaptors::map_values) + { + //CASPAR_LOG(debug) << stream.audio_data.size() << L" : " << result_ps.size(); + + if(stream.audio_data.size() < result_ps.size()) + stream.audio_data.resize(result_ps.size(), 0.0f); + + auto out = boost::range::transform(result_ps, stream.audio_data, std::begin(result_ps), std::plus()); + stream.audio_data.erase(std::begin(stream.audio_data), std::begin(stream.audio_data) + std::distance(std::begin(result_ps), out)); + } + + boost::range::rotate(audio_cadence_, std::begin(audio_cadence_)+1); + + audio_buffer result; + result.reserve(result_ps.size()); + boost::range::transform(result_ps, std::back_inserter(result), [](float sample){return static_cast(sample);}); + return result; } }; -audio_mixer::audio_mixer() : impl_(new implementation()){} -void audio_mixer::begin(const core::basic_frame& frame){impl_->begin(frame);} -void audio_mixer::visit(core::write_frame& frame){impl_->visit(frame);} -void audio_mixer::end(){impl_->end();} -void audio_mixer::begin_pass(){ impl_->begin_pass();} -std::vector audio_mixer::end_pass(){return impl_->end_pass();} +audio_mixer::audio_mixer() : impl_(new impl()){} +void audio_mixer::push(const frame_transform& transform){impl_->push(transform);} +void audio_mixer::visit(const const_frame& frame){impl_->visit(frame);} +void audio_mixer::pop(){impl_->pop();} +audio_buffer audio_mixer::operator()(const video_format_desc& format_desc){return impl_->mix(format_desc);} }} \ No newline at end of file