}
};
-typedef cache_aligned_vector<float> audio_buffer_ps;
-
+typedef cache_aligned_vector<double> audio_buffer_ps;
+
struct audio_stream
{
audio_transform prev_transform;
: graph_(std::move(graph))
{
graph_->set_color("volume", diagnostics::color(1.0f, 0.8f, 0.1f));
+ graph_->set_color("audio-clipping", diagnostics::color(0.3f, 0.6f, 0.3f));
transform_stack_.push(core::audio_transform());
}
-
+
void push(const frame_transform& transform)
{
transform_stack_.push(transform_stack_.top()*transform.audio_transform);
if(item.transform.is_still)
item.transform.volume = 0.0;
-
- items_.push_back(std::move(item));
- }
- void begin(const core::audio_transform& transform)
- {
- transform_stack_.push(transform_stack_.top()*transform);
+ items_.push_back(std::move(item));
}
-
+
void pop()
{
transform_stack_.pop();
}
audio_buffer mix(const video_format_desc& format_desc, const audio_channel_layout& channel_layout)
- {
+ {
if(format_desc_ != format_desc || channel_layout_ != channel_layout)
{
audio_streams_.clear();
audio_cadence_ = format_desc.audio_cadence;
format_desc_ = format_desc;
channel_layout_ = channel_layout;
- }
-
+ }
+
std::map<const void*, audio_stream> next_audio_streams;
- std::vector<const void*> used_tags;
for (auto& item : items_)
- {
+ {
audio_buffer_ps next_audio;
std::unique_ptr<audio_channel_remapper> channel_remapper;
bool remapping_failed = false;
auto tag = item.tag;
- if(boost::range::find(used_tags, tag) != used_tags.end())
- continue;
-
- used_tags.push_back(tag);
+ auto it = next_audio_streams.find(tag);
+ bool found = it != next_audio_streams.end();
+
+ if (!found)
+ {
+ it = audio_streams_.find(tag);
+ found = it != audio_streams_.end();
+ }
- const auto it = audio_streams_.find(tag);
- if (it != audio_streams_.end())
+ if (found)
{
prev_transform = it->second.prev_transform;
next_audio = std::move(it->second.audio_data);
channel_remapper = std::move(it->second.channel_remapper);
remapping_failed = it->second.remapping_failed;
}
-
+
if (remapping_failed)
{
CASPAR_LOG(trace) << "[audio_mixer] audio channel remapping already failed for stream.";
}
// Skip it if there is no existing audio stream and item has no audio-data.
- if(it == audio_streams_.end() && item.audio_data.empty())
+ if(!found && item.audio_data.empty())
continue;
if (item.channel_layout == audio_channel_layout::invalid())
{
- CASPAR_LOG(debug) << "[audio_mixer] invalid audio channel layout for item";
+ CASPAR_LOG(warning) << "[audio_mixer] invalid audio channel layout for item";
+ next_audio_streams[tag].remapping_failed = true;
continue;
}
item.audio_data = channel_remapper->mix_and_rearrange(item.audio_data);
- const float prev_volume = static_cast<float>(prev_transform.volume) * previous_master_volume_;
- const float next_volume = static_cast<float>(next_transform.volume) * master_volume_;
+ const double prev_volume = prev_transform.volume * previous_master_volume_;
+ const double next_volume = next_transform.volume * master_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<float>(item.audio_data.size()/channel_layout_.num_channels);
-
+ auto alpha = (next_volume-prev_volume)/static_cast<double>(item.audio_data.size()/channel_layout_.num_channels);
+
for(size_t n = 0; n < item.audio_data.size(); ++n)
{
auto sample_multiplier = (prev_volume + (n / channel_layout_.num_channels) * alpha);
next_audio.push_back(item.audio_data.data()[n] * sample_multiplier);
- }
-
+ }
+
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);
next_audio_streams[tag].channel_remapper = std::move(channel_remapper);
items_.clear();
audio_streams_ = std::move(next_audio_streams);
-
- if(audio_streams_.empty())
- audio_streams_[nullptr].audio_data = audio_buffer_ps(audio_size(audio_cadence_.front()), 0.0f);
+
+ if(audio_streams_.empty())
+ audio_streams_[nullptr].audio_data = audio_buffer_ps(audio_size(audio_cadence_.front()), 0.0);
{ // sanity check
})
.count();
- if(nb_invalid_streams > 0)
- CASPAR_LOG(trace) << "[audio_mixer] Incorrect frame audio cadence detected.";
+ if(nb_invalid_streams > 0)
+ CASPAR_LOG(trace) << "[audio_mixer] Incorrect frame audio cadence detected.";
}
-
- std::vector<float> result_ps(audio_size(audio_cadence_.front()), 0.0f);
+
+ audio_buffer_ps result_ps(audio_size(audio_cadence_.front()), 0.0);
for (auto& stream : audio_streams_ | boost::adaptors::map_values)
{
- if(stream.audio_data.size() < result_ps.size())
- stream.audio_data.resize(result_ps.size(), 0.0f);
+ if (stream.audio_data.size() < result_ps.size())
+ {
+ auto samples = (result_ps.size() - stream.audio_data.size()) / channel_layout_.num_channels;
+ CASPAR_LOG(trace) << L"[audio_mixer] Appended " << samples << L" zero samples";
+ CASPAR_LOG(trace) << L"[audio_mixer] Actual number of samples " << stream.audio_data.size() / channel_layout_.num_channels;
+ CASPAR_LOG(trace) << L"[audio_mixer] Wanted number of samples " << result_ps.size() / channel_layout_.num_channels;
+ stream.audio_data.resize(result_ps.size(), 0.0);
+ }
- auto out = boost::range::transform(result_ps, stream.audio_data, std::begin(result_ps), std::plus<float>());
+ auto out = boost::range::transform(result_ps, stream.audio_data, std::begin(result_ps), std::plus<double>());
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);
-
+
auto result_owner = spl::make_shared<mutable_audio_buffer>();
auto& result = *result_owner;
result.reserve(result_ps.size());
- boost::range::transform(result_ps, std::back_inserter(result), [](float sample){return static_cast<int32_t>(sample);});
-
+ const int32_t min_amplitude = std::numeric_limits<int32_t>::min();
+ const int32_t max_amplitude = std::numeric_limits<int32_t>::max();
+ bool clipping = false;
+ boost::range::transform(result_ps, std::back_inserter(result), [&](double sample)
+ {
+ if (sample > max_amplitude)
+ {
+ clipping = true;
+ return max_amplitude;
+ }
+ else if (sample < min_amplitude)
+ {
+ clipping = true;
+ return min_amplitude;
+ }
+ else
+ return static_cast<int32_t>(sample);
+ });
+
+ if (clipping)
+ graph_->set_tag(diagnostics::tag_severity::WARNING, "audio-clipping");
+
const int num_channels = channel_layout_.num_channels;
monitor_subject_ << monitor::message("/nb_channels") % num_channels;