\r
#include <tbb/parallel_for.h>\r
\r
+#include <safeint.h>\r
+\r
#include <stack>\r
#include <deque>\r
\r
{\r
const void* tag;\r
frame_transform transform;\r
- std::vector<int16_t> audio_data;\r
+ std::vector<int32_t> audio_data;\r
};\r
\r
struct audio_mixer::implementation\r
{\r
- std::stack<core::frame_transform> transform_stack_;\r
-\r
- std::map<const void*, core::frame_transform> prev_frame_transforms_;\r
- std::map<const void*, core::frame_transform> next_frame_transforms_;\r
-\r
- const core::video_format_desc format_desc_;\r
-\r
- std::vector<audio_item> items;\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(const core::video_format_desc& format_desc)\r
audio_item item;\r
item.tag = frame.tag();\r
item.transform = transform_stack_.top();\r
- item.audio_data = std::vector<int16_t>(frame.audio_data().begin(), frame.audio_data().end());\r
+ item.audio_data = std::vector<int32_t>(frame.audio_data().begin(), frame.audio_data().end());\r
\r
items.push_back(item); \r
}\r
transform_stack_.pop();\r
}\r
\r
- std::vector<int16_t> mix()\r
+ audio_buffer mix()\r
{\r
- auto result = std::vector<int16_t>(format_desc_.audio_samples_per_frame);\r
+ auto result = audio_buffer(format_desc_.audio_samples_per_frame, 0);\r
+\r
+ std::map<const void*, core::frame_transform> next_frame_transforms;\r
\r
BOOST_FOREACH(auto& item, items)\r
{ \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
+ 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
- static const int BASE = 1<<15;\r
-\r
- const auto next_volume = static_cast<int>(next.volume*BASE);\r
- const auto prev_volume = static_cast<int>(prev.volume*BASE);\r
- \r
- const int n_samples = result.size();\r
- \r
- const auto in_size = static_cast<size_t>(item.audio_data.size());\r
- CASPAR_VERIFY(in_size == 0 || in_size == result.size());\r
-\r
- if(in_size > result.size())\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
+ \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, item.audio_data.size()),\r
+ tbb::blocked_range<size_t>(0, format_desc_.audio_samples_per_frame/2),\r
[&](const tbb::blocked_range<size_t>& r)\r
{\r
for(size_t n = r.begin(); n < r.end(); ++n)\r
{\r
- const int sample_volume = (prev_volume - (prev_volume * n)/n_samples) + (next_volume * n)/n_samples;\r
- const int sample = (static_cast<int>(item.audio_data[n])*sample_volume)/BASE;\r
- result[n] = static_cast<int16_t>((static_cast<int>(result[n]) + sample) & 0xFFFF);\r
+ const float alpha = n * delta;\r
+ const float volume = prev_volume * (1.0f - alpha) + next_volume * alpha;\r
+\r
+ auto sample_epi32 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(&item.audio_data[n*2]));\r
+\r
+ auto sample_ps = _mm_cvtepi32_ps(sample_epi32); \r
+ sample_ps = _mm_mul_ps(sample_ps, _mm_set1_ps(volume)); \r
+\r
+ auto res_sample_epi32 = _mm_loadl_epi64(reinterpret_cast<__m128i*>(&result[n*2]));\r
+ auto res_sample_ps = _mm_cvtepi32_ps(res_sample_epi32); \r
+\r
+ res_sample_ps = _mm_add_ps(sample_ps, res_sample_ps);\r
+ res_sample_epi32 = _mm_cvtps_epi32(res_sample_ps);\r
+ \r
+ _mm_storel_epi64(reinterpret_cast<__m128i*>(&result[n*2]), res_sample_epi32);\r
}\r
}\r
);\r
}\r
\r
items.clear();\r
- prev_frame_transforms_ = std::move(next_frame_transforms_); \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
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<int16_t> audio_mixer::mix(){return impl_->mix();}\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