X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fffmpeg%2Fproducer%2Fframe_muxer.cpp;h=807b86e82adf601ea96bd2678888c2ba5f408cde;hb=ac7b3acb915f90de6b224e54a2240023fc221e5a;hp=683b059ed545dd4b1abc1954e2ef60349f3085a0;hpb=0a7376d664da4edaeba44562ecaeffef59b025d5;p=casparcg

diff --git a/modules/ffmpeg/producer/frame_muxer.cpp b/modules/ffmpeg/producer/frame_muxer.cpp
index 683b059ed..807b86e82 100644
--- a/modules/ffmpeg/producer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/frame_muxer.cpp
@@ -41,7 +41,7 @@ extern "C"
 
 using namespace caspar::core;
 
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 
 struct display_mode
 {
@@ -136,7 +136,7 @@ display_mode::type get_display_mode(const core::field_mode::type in_mode, double
 struct frame_muxer::implementation : boost::noncopyable
 {	
 	std::deque<std::queue<safe_ptr<write_frame>>>	video_streams_;
-	std::deque<std::vector<int16_t>>				audio_streams_;
+	std::deque<core::audio_buffer>					audio_streams_;
 	std::deque<safe_ptr<basic_frame>>				frame_buffer_;
 	display_mode::type								display_mode_;
 	const double									in_fps_;
@@ -226,9 +226,9 @@ struct frame_muxer::implementation : boost::noncopyable
 
 			// Fix field-order if needed
 			if(frame->get_type() == core::field_mode::lower && format_desc_.field_mode == core::field_mode::upper)
-				frame->get_frame_transform().fill_translation[1] += 0.5/static_cast<double>(frame->get_pixel_format_desc().planes[0].height);
+				frame->get_frame_transform().fill_translation[1] += 1.0/static_cast<double>(format_desc_.height);
 			else if(frame->get_type() == core::field_mode::upper && format_desc_.field_mode == core::field_mode::lower)
-				frame->get_frame_transform().fill_translation[1] -= 0.5/static_cast<double>(frame->get_pixel_format_desc().planes[0].height);
+				frame->get_frame_transform().fill_translation[1] -= 1.0/static_cast<double>(format_desc_.height);
 
 			video_streams_.back().push(frame);
 			++video_frame_count_;
@@ -238,12 +238,12 @@ struct frame_muxer::implementation : boost::noncopyable
 			BOOST_THROW_EXCEPTION(invalid_operation() << source_info("frame_muxer") << msg_info("video-stream overflow. This can be caused by incorrect frame-rate. Check clip meta-data."));
 	}
 
-	void push(const std::shared_ptr<std::vector<int16_t>>& audio_samples)
+	void push(const std::shared_ptr<core::audio_buffer>& audio_samples)
 	{
 		if(!audio_samples)	
 		{
 			CASPAR_LOG(debug) << L"audio-chunk-count: " << audio_sample_count_/format_desc_.audio_samples_per_frame;
-			audio_streams_.push_back(std::vector<int16_t>());
+			audio_streams_.push_back(core::audio_buffer());
 			audio_sample_count_ = 0;
 			return;
 		}
@@ -276,14 +276,14 @@ struct frame_muxer::implementation : boost::noncopyable
 		return frame;
 	}
 
-	std::vector<int16_t> pop_audio()
+	core::audio_buffer pop_audio()
 	{
 		CASPAR_VERIFY(audio_streams_.front().size() >= format_desc_.audio_samples_per_frame);
 
 		auto begin = audio_streams_.front().begin();
 		auto end   = begin + format_desc_.audio_samples_per_frame;
 
-		auto samples = std::vector<int16_t>(begin, end);
+		auto samples = core::audio_buffer(begin, end);
 		audio_streams_.front().erase(begin, end);
 
 		return samples;
@@ -410,7 +410,7 @@ struct frame_muxer::implementation : boost::noncopyable
 frame_muxer::frame_muxer(double in_fps, const safe_ptr<core::frame_factory>& frame_factory)
 	: impl_(new implementation(in_fps, frame_factory)){}
 void frame_muxer::push(const std::shared_ptr<AVFrame>& video_frame, int hints){impl_->push(video_frame, hints);}
-void frame_muxer::push(const std::shared_ptr<std::vector<int16_t>>& audio_samples){return impl_->push(audio_samples);}
+void frame_muxer::push(const std::shared_ptr<core::audio_buffer>& audio_samples){return impl_->push(audio_samples);}
 void frame_muxer::commit(){impl_->commit();}
 safe_ptr<basic_frame> frame_muxer::pop(){return impl_->pop();}
 size_t frame_muxer::size() const {return impl_->size();}
@@ -419,4 +419,4 @@ bool frame_muxer::video_ready() const{return impl_->video_ready();}
 bool frame_muxer::audio_ready() const{return impl_->audio_ready();}
 int64_t frame_muxer::calc_nb_frames(int64_t nb_frames) const {return impl_->calc_nb_frames(nb_frames);}
 
-}
\ No newline at end of file
+}}
\ No newline at end of file