#include <common/utility/string.h>\r
\r
#include <core/consumer/frame_consumer.h>\r
+#include <core/mixer/audio/audio_util.h>\r
#include <core/video_format.h>\r
\r
#include <core/mixer/read_frame.h>\r
safe_ptr<diagnostics::graph> graph_;\r
boost::timer perf_timer_;\r
\r
- tbb::concurrent_bounded_queue<std::shared_ptr<std::vector<short>>> input_;\r
- boost::circular_buffer<std::vector<short>> container_;\r
+ tbb::concurrent_bounded_queue<std::shared_ptr<std::vector<int16_t, tbb::cache_aligned_allocator<int16_t>>>> input_;\r
+ boost::circular_buffer<std::vector<int16_t, tbb::cache_aligned_allocator<int16_t>>> container_;\r
tbb::atomic<bool> is_running_;\r
\r
core::video_format_desc format_desc_;\r
~oal_consumer()\r
{\r
is_running_ = false;\r
- input_.try_push(std::make_shared<std::vector<short>>());\r
- input_.try_push(std::make_shared<std::vector<short>>());\r
+ input_.try_push(std::make_shared<std::vector<int16_t, tbb::cache_aligned_allocator<int16_t>>>());\r
+ input_.try_push(std::make_shared<std::vector<int16_t, tbb::cache_aligned_allocator<int16_t>>>());\r
Stop();\r
CASPAR_LOG(info) << print() << L" Shutting down."; \r
}\r
{ \r
if(preroll_count_ < input_.capacity())\r
{\r
- while(input_.try_push(std::make_shared<std::vector<int16_t>>(format_desc_.audio_samples_per_frame, 0)))\r
+ while(input_.try_push(std::make_shared<std::vector<int16_t, tbb::cache_aligned_allocator<int16_t>>>(format_desc_.audio_samples_per_frame, 0)))\r
++preroll_count_;\r
Play(); \r
}\r
\r
- std::vector<int16_t> audio16(frame->audio_data().size());\r
- for(size_t n = 0; n < audio16.size(); ++n) \r
- audio16[n] = (frame->audio_data()[n] >> 16) & 0xffff; \r
-\r
- input_.push(std::make_shared<std::vector<int16_t>>(std::move(audio16)));\r
+ input_.push(std::make_shared<std::vector<int16_t, tbb::cache_aligned_allocator<int16_t>>>(core::audio_32_to_16_sse(frame->audio_data())));\r
\r
return true;\r
}\r
\r
virtual bool OnGetData(sf::SoundStream::Chunk& data)\r
{ \r
- std::shared_ptr<std::vector<short>> audio_data; \r
+ std::shared_ptr<std::vector<int16_t, tbb::cache_aligned_allocator<int16_t>>> audio_data; \r
input_.pop(audio_data);\r
\r
container_.push_back(std::move(*audio_data));\r
\r
safe_ptr<core::frame_consumer> create_oal_consumer(const std::vector<std::wstring>& params)\r
{\r
- if(params.size() < 1 || params[0] != L"OAL")\r
+ if(params.size() < 1 || params[0] != L"AUDIO")\r
return core::frame_consumer::empty();\r
\r
return make_safe<oal_consumer>();\r