X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Foal%2Fconsumer%2Foal_consumer.cpp;h=cd0130a5fedac3dbdd001b8eb5d809f58ad8e90b;hb=7dd8bdd6999be5bf21f6963a7b4ed312806244e4;hp=7186dc74c3db129e6432a822b059b2e922d033e4;hpb=6bcdfba1ea33057080acacc283ad765fc7938a0e;p=casparcg

diff --git a/modules/oal/consumer/oal_consumer.cpp b/modules/oal/consumer/oal_consumer.cpp
index 7186dc74c..cd0130a5f 100644
--- a/modules/oal/consumer/oal_consumer.cpp
+++ b/modules/oal/consumer/oal_consumer.cpp
@@ -46,8 +46,8 @@ struct oal_consumer : public core::frame_consumer,  public sf::SoundStream
 	safe_ptr<diagnostics::graph>						graph_;
 	boost::timer										perf_timer_;
 
-	tbb::concurrent_bounded_queue<std::shared_ptr<std::vector<short>>>	input_;
-	boost::circular_buffer<std::vector<short>>			container_;
+	tbb::concurrent_bounded_queue<std::shared_ptr<std::vector<int16_t, tbb::cache_aligned_allocator<int16_t>>>>	input_;
+	boost::circular_buffer<std::vector<int16_t, tbb::cache_aligned_allocator<int16_t>>>			container_;
 	tbb::atomic<bool>									is_running_;
 
 	core::video_format_desc								format_desc_;
@@ -70,8 +70,8 @@ public:
 	~oal_consumer()
 	{
 		is_running_ = false;
-		input_.try_push(std::make_shared<std::vector<short>>());
-		input_.try_push(std::make_shared<std::vector<short>>());
+		input_.try_push(std::make_shared<std::vector<int16_t, tbb::cache_aligned_allocator<int16_t>>>());
+		input_.try_push(std::make_shared<std::vector<int16_t, tbb::cache_aligned_allocator<int16_t>>>());
 		Stop();
 		CASPAR_LOG(info) << print() << L" Shutting down.";	
 	}
@@ -87,19 +87,19 @@ public:
 	{			
 		if(preroll_count_ < input_.capacity())
 		{
-			while(input_.try_push(std::make_shared<std::vector<int16_t>>(format_desc_.audio_samples_per_frame, 0)))
+			while(input_.try_push(std::make_shared<std::vector<int16_t, tbb::cache_aligned_allocator<int16_t>>>(format_desc_.audio_samples_per_frame, 0)))
 				++preroll_count_;
 			Play();		
 		}
 
-		input_.push(std::make_shared<std::vector<int16_t>>(core::audio_32_to_16(frame->audio_data())));
+		input_.push(std::make_shared<std::vector<int16_t, tbb::cache_aligned_allocator<int16_t>>>(core::audio_32_to_16_sse(frame->audio_data())));
 
 		return true;
 	}
 	
 	virtual bool OnGetData(sf::SoundStream::Chunk& data)
 	{		
-		std::shared_ptr<std::vector<short>> audio_data;		
+		std::shared_ptr<std::vector<int16_t, tbb::cache_aligned_allocator<int16_t>>> audio_data;		
 		input_.pop(audio_data);
 				
 		container_.push_back(std::move(*audio_data));