X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fffmpeg%2Fproducer%2Fffmpeg_producer.cpp;h=3b62cf40319dd8dcd5da9608260b8b039f39d56b;hb=9f83209c149b6e99e0c8c449b621a2c41df61206;hp=99cf619d4a8287c49b35bbd9adc7f390d7f00f3a;hpb=a46c2bbab800d78ac60caa7da775acf1dcc65332;p=casparcg

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index 99cf619d4..3b62cf403 100644
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -21,189 +21,188 @@
 
 #include "ffmpeg_producer.h"
 
+#include "frame_muxer.h"
 #include "input.h"
+#include "util.h"
 #include "audio/audio_decoder.h"
 #include "video/video_decoder.h"
 
-#include <common/utility/timer.h>
-#include <common/diagnostics/graph.h>
-
-#include <core/producer/frame/basic_frame.h>
-#include <core/producer/frame/write_frame.h>
-#include <core/producer/frame/audio_transform.h>
-#include <core/video_format.h>
-
 #include <common/env.h>
-#include <common/utility/timer.h>
 #include <common/utility/assert.h>
+#include <common/diagnostics/graph.h>
 
-#include <tbb/parallel_invoke.h>
+#include <core/video_format.h>
+#include <core/producer/frame_producer.h>
+#include <core/producer/frame/frame_factory.h>
+#include <core/producer/frame/basic_frame.h>
 
+#include <boost/assign.hpp>
 #include <boost/timer.hpp>
+#include <boost/foreach.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/range/algorithm/find_if.hpp>
+#include <boost/range/algorithm/find.hpp>
 
-#include <deque>
-#include <functional>
+#include <tbb/parallel_invoke.h>
 
 namespace caspar {
-	
+				
 struct ffmpeg_producer : public core::frame_producer
 {
-	const std::wstring					filename_;
-	const bool							loop_;
+	const std::wstring								filename_;
 	
-	std::shared_ptr<diagnostics::graph>	graph_;
-	boost::timer						perf_timer_;
-		
-	std::deque<safe_ptr<core::write_frame>>	video_frame_buffer_;	
-	std::deque<std::vector<short>>			audio_chunk_buffer_;
+	const safe_ptr<diagnostics::graph>				graph_;
+	boost::timer									frame_timer_;
+	boost::timer									video_timer_;
+	boost::timer									audio_timer_;
+					
+	const safe_ptr<core::frame_factory>				frame_factory_;
+	const core::video_format_desc					format_desc_;
 
-	std::queue<safe_ptr<core::basic_frame>>	ouput_channel_;
-		
-	std::shared_ptr<core::frame_factory>	frame_factory_;
+	input											input_;	
+	video_decoder									video_decoder_;
+	audio_decoder									audio_decoder_;	
+	double											fps_;
+	frame_muxer										muxer_;
 
-	input								input_;	
-	std::unique_ptr<video_decoder>		video_decoder_;
-	std::unique_ptr<audio_decoder>		audio_decoder_;
+	int												late_frames_;
+	const int										start_;
+	const bool										loop_;
+	const size_t									length_;
+
+	safe_ptr<core::basic_frame>						last_frame_;
+
+	const size_t									width_;
+	const size_t									height_;
+	bool											is_progressive_;
+	
 public:
-	explicit ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filename, bool loop) 
+	explicit ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filename, const std::wstring& filter, bool loop, int start, size_t length) 
 		: filename_(filename)
-		, loop_(loop) 
-		, graph_(diagnostics::create_graph(narrow(print())))
+		, graph_(diagnostics::create_graph([this]{return print();}))
 		, frame_factory_(frame_factory)		
-		, input_(safe_ptr<diagnostics::graph>(graph_), filename_, loop_)
-		, video_decoder_(input_.get_video_codec_context().get() ? new video_decoder(input_.get_video_codec_context().get(), frame_factory) : nullptr)
-		, audio_decoder_(input_.get_audio_codec_context().get() ? new audio_decoder(input_.get_audio_codec_context().get(), frame_factory->get_video_format_desc().fps) : nullptr)
+		, format_desc_(frame_factory->get_video_format_desc())
+		, input_(graph_, filename_, loop, start, length)
+		, video_decoder_(input_.context(), frame_factory, filter)
+		, audio_decoder_(input_.context(), frame_factory->get_video_format_desc())
+		, fps_(video_decoder_.fps())
+		, muxer_(fps_, frame_factory)
+		, late_frames_(0)
+		, start_(start)
+		, loop_(loop)
+		, length_(length)
+		, last_frame_(core::basic_frame::empty())
+		, width_(video_decoder_.width())
+		, height_(video_decoder_.height())
+		, is_progressive_(true)
 	{
 		graph_->add_guide("frame-time", 0.5);
-		graph_->set_color("frame-time",  diagnostics::color(1.0f, 0.0f, 0.0f));
-		graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f));		
+		graph_->set_color("frame-time", diagnostics::color(0.1f, 1.0f, 0.1f));
+		graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f));	
 		
-		double frame_time = 1.0f/input_.fps();
-		double format_frame_time = 1.0/frame_factory->get_video_format_desc().fps;
-		if(abs(frame_time - format_frame_time) > 0.0001)
-			CASPAR_LOG(warning) << print() << L" Invalid framerate detected. This may cause distorted audio during playback. frame-time: " << frame_time;
+		for(int n = 0; n < 32 && muxer_.empty(); ++n)
+			decode_frame(0);
 	}
-
-	virtual safe_ptr<core::basic_frame> receive()
+			
+	virtual safe_ptr<core::basic_frame> receive(int hints)
 	{
-		perf_timer_.restart();
-
-		for(size_t n = 0; ouput_channel_.size() < 2 && input_.has_packet() && n < 32; ++n) // 32 packets should be enough. Otherwise there probably was an error and we want to avoid infinite recursion.
-		{	
-			tbb::parallel_invoke
-			(
-				[&]
-				{
-					if(video_frame_buffer_.size() < 3)
-						try_decode_video_packet(input_.get_video_packet());
-				}, 
-				[&]
-				{
-					if(audio_chunk_buffer_.size() < 3)
-						try_decode_audio_packet(input_.get_audio_packet());
-				}
-			);			
-
-			merge_audio_and_video();	
+		auto frame = core::basic_frame::late();
+		
+		frame_timer_.restart();
+		
+		for(int n = 0; n < 64 && muxer_.empty(); ++n)
+			decode_frame(hints);
+		
+		graph_->update_value("frame-time", static_cast<float>(frame_timer_.elapsed()*format_desc_.fps*0.5));
+
+		if(!muxer_.empty())
+			frame = last_frame_ = muxer_.pop();	
+		else
+		{
+			if(input_.eof())
+				return core::basic_frame::eof();
+			else
+			{
+				graph_->add_tag("underflow");	
+				++late_frames_;		
+			}
 		}
 		
-		graph_->update_value("frame-time", static_cast<float>(perf_timer_.elapsed()*frame_factory_->get_video_format_desc().fps*0.5));
-					
-		return get_next_frame();
+		return frame;
 	}
 
-	virtual std::wstring print() const
+	virtual safe_ptr<core::basic_frame> last_frame() const
 	{
-		return L"ffmpeg[" + boost::filesystem::wpath(filename_).filename() + L"]";
+		return disable_audio(last_frame_);
 	}
 
-	void try_decode_video_packet(const aligned_buffer& video_packet)
+	void decode_frame(int hints)
 	{
-		if(!video_packet.empty() && video_decoder_) // Video Decoding.
+		for(int n = 0; n < 16 && ((!muxer_.video_ready() && !video_decoder_.ready()) ||	(!muxer_.audio_ready() && !audio_decoder_.ready())); ++n) 
 		{
-			try
-			{
-				auto frame = video_decoder_->execute(this, video_packet);
-				if(frame)
-					video_frame_buffer_.push_back(make_safe(std::move(frame)));
-			}
-			catch(...)
+			std::shared_ptr<AVPacket> pkt;
+			if(input_.try_pop(pkt))
 			{
-				CASPAR_LOG_CURRENT_EXCEPTION();
-				video_decoder_.reset();
-				CASPAR_LOG(warning) << print() << " removed video-stream.";
+				video_decoder_.push(pkt);
+				audio_decoder_.push(pkt);
 			}
 		}
-	}
-
-	void try_decode_audio_packet(const aligned_buffer& audio_packet)
-	{
-		if(audio_chunk_buffer_.size() < 3 && !audio_packet.empty() && audio_decoder_) // Audio Decoding.
+		
+		tbb::parallel_invoke(
+		[&]
 		{
-			try
-			{
-				auto chunks = audio_decoder_->execute(audio_packet);
-				audio_chunk_buffer_.insert(audio_chunk_buffer_.end(), chunks.begin(), chunks.end());
-			}
-			catch(...)
+			if(muxer_.video_ready())
+				return;
+
+			auto video_frames = video_decoder_.poll();
+			BOOST_FOREACH(auto& video, video_frames)	
 			{
-				CASPAR_LOG_CURRENT_EXCEPTION();
-				audio_decoder_.reset();
-				CASPAR_LOG(warning) << print() << " removed audio-stream.";
+				is_progressive_ = video ? video->interlaced_frame == 0 : is_progressive_;
+				muxer_.push(video, hints);	
 			}
-		}
-	}
-
-	void merge_audio_and_video()
-	{		
-		std::shared_ptr<core::write_frame> frame;	
-
-		if(!video_frame_buffer_.empty() && !audio_chunk_buffer_.empty())
-		{
-			frame = video_frame_buffer_.front();				
-			video_frame_buffer_.pop_front();
-				
-			frame->audio_data() = std::move(audio_chunk_buffer_.front());
-			audio_chunk_buffer_.pop_front();	
-		}
-		else if(!video_frame_buffer_.empty() && !audio_decoder_)
-		{
-			frame = video_frame_buffer_.front();				
-			video_frame_buffer_.pop_front();
-			frame->get_audio_transform().set_has_audio(false);	
-		}
-		else if(!audio_chunk_buffer_.empty() && !video_decoder_)
+		},
+		[&]
 		{
-			frame = frame_factory_->create_frame(this, 1, 1);
-			std::fill(frame->image_data().begin(), frame->image_data().end(), 0);
-				
-			frame->audio_data() = std::move(audio_chunk_buffer_.front());
-			audio_chunk_buffer_.pop_front();
-		}
-		
-		if(frame)
-			ouput_channel_.push(make_safe(frame));			
+			if(muxer_.audio_ready())
+				return;
+					
+			auto audio_samples = audio_decoder_.poll();
+			BOOST_FOREACH(auto& audio, audio_samples)
+				muxer_.push(audio);				
+		});
+
+		muxer_.commit();
 	}
-		
-	safe_ptr<core::basic_frame> get_next_frame()
+
+	virtual int64_t nb_frames() const 
 	{
-		if(is_eof())
-			return core::basic_frame::eof();
+		if(loop_)
+			return std::numeric_limits<int64_t>::max();
+
+		// This function estimates nb_frames until input has read all packets for one loop, at which point the count should be accurate.
 
-		if(ouput_channel_.empty())
+		int64_t nb_frames = input_.nb_frames();
+		if(input_.nb_loops() < 1) // input still hasn't counted all frames
 		{
-			graph_->add_tag("underflow");
-			return core::basic_frame::late();			
+			int64_t video_nb_frames = video_decoder_.nb_frames();
+			int64_t audio_nb_frames = audio_decoder_.nb_frames();
+
+			nb_frames = std::min(static_cast<int64_t>(length_), std::max(nb_frames, std::max(video_nb_frames, audio_nb_frames)));
 		}
 
-		auto frame = std::move(ouput_channel_.front());
-		ouput_channel_.pop();		
-		return frame;
-	}
+		nb_frames = muxer_.calc_nb_frames(nb_frames);
 
-	bool is_eof() const
+		// TODO: Might need to scale nb_frames av frame_muxer transformations.
+
+		return nb_frames + late_frames_ - start_;
+	}
+				
+	virtual std::wstring print() const
 	{
-		return ouput_channel_.empty() && (!video_decoder_ && !audio_decoder_) || !input_.is_running();
+		return L"ffmpeg[" + boost::filesystem::wpath(filename_).filename() + L"|" 
+						  + boost::lexical_cast<std::wstring>(width_) + L"x" + boost::lexical_cast<std::wstring>(height_)
+						  + (is_progressive_ ? L"p" : L"i")  + boost::lexical_cast<std::wstring>(fps_)
+						  + L"]";
 	}
 };
 
@@ -213,18 +212,43 @@ safe_ptr<core::frame_producer> create_ffmpeg_producer(const safe_ptr<core::frame
 		(L"mpg")(L"mpeg")(L"avi")(L"mov")(L"qt")(L"webm")(L"dv")(L"mp4")(L"f4v")(L"flv")(L"mkv")(L"mka")(L"wmv")(L"wma")(L"ogg")(L"divx")(L"xvid")(L"wav")(L"mp3")(L"m2v");
 	std::wstring filename = env::media_folder() + L"\\" + params[0];
 	
-	auto ext = std::find_if(extensions.begin(), extensions.end(), [&](const std::wstring& ex) -> bool
-		{					
-			return boost::filesystem::is_regular_file(boost::filesystem::wpath(filename).replace_extension(ex));
-		});
+	auto ext = boost::find_if(extensions, [&](const std::wstring& ex)
+	{					
+		return boost::filesystem::is_regular_file(boost::filesystem::wpath(filename + L"." + ex));
+	});
 
 	if(ext == extensions.end())
 		return core::frame_producer::empty();
 
 	std::wstring path = filename + L"." + *ext;
-	bool loop = std::find(params.begin(), params.end(), L"LOOP") != params.end();
+	bool loop = boost::find(params, L"LOOP") != params.end();
+
+	size_t start = 0;
+	size_t length = std::numeric_limits<size_t>::max();
 	
-	return make_safe<ffmpeg_producer>(frame_factory, path, loop);
+	auto seek_it = boost::find(params, L"SEEK");
+	if(seek_it != params.end())
+	{
+		if(++seek_it != params.end())
+			start = boost::lexical_cast<size_t>(*seek_it);
+	}
+	
+	auto length_it = boost::find(params, L"LENGTH");
+	if(length_it != params.end())
+	{
+		if(++length_it != params.end())
+			length = boost::lexical_cast<size_t>(*length_it);
+	}
+
+	std::wstring filter = L"";
+	auto filter_it = boost::find(params, L"FILTER");
+	if(filter_it != params.end())
+	{
+		if(++filter_it != params.end())
+			filter = *filter_it;
+	}
+
+	return make_safe<ffmpeg_producer>(frame_factory, path, filter, loop, start, length);
 }
 
 }
\ No newline at end of file