X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fffmpeg%2Fproducer%2Fffmpeg_producer.cpp;h=d20cbaca4f0a73f4d0280d3e121e1720b8ccdbd1;hb=53977d8992163fff46099451ac687794db6b7c36;hp=a56a2626fb1e4407cf519c706754d305768c3ed9;hpb=9a18958045ec31c435a1f918ad2101ee36fb235c;p=casparcg

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index a56a2626f..d20cbaca4 100644
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -23,100 +23,108 @@
 
 #include "frame_muxer.h"
 #include "input.h"
+#include "util.h"
 #include "audio/audio_decoder.h"
 #include "video/video_decoder.h"
 
+#include <common/env.h>
 #include <common/utility/assert.h>
-#include <common/utility/timer.h>
 #include <common/diagnostics/graph.h>
 
-#include <core/mixer/write_frame.h>
 #include <core/video_format.h>
-#include <core/producer/frame/audio_transform.h>
+#include <core/producer/frame_producer.h>
+#include <core/producer/frame/frame_factory.h>
 #include <core/producer/frame/basic_frame.h>
-#include <core/producer/color/color_producer.h>
-
-#include <common/env.h>
 
+#include <boost/algorithm/string.hpp>
+#include <boost/assign.hpp>
 #include <boost/timer.hpp>
-#include <boost/range/algorithm.hpp>
-#include <boost/range/algorithm_ext.hpp>
+#include <boost/foreach.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/range/algorithm/find_if.hpp>
+#include <boost/range/algorithm/find.hpp>
 
-#include <tbb/task_group.h>
-
-#include <deque>
-#include <vector>
+#include <tbb/parallel_invoke.h>
 
 namespace caspar {
-			
+				
 struct ffmpeg_producer : public core::frame_producer
 {
 	const std::wstring								filename_;
 	
 	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_;
 
 	input											input_;	
 	video_decoder									video_decoder_;
-	audio_decoder									audio_decoder_;
-	
+	audio_decoder									audio_decoder_;	
+	double											fps_;
 	frame_muxer										muxer_;
 
 	const int										start_;
-	int64_t											nb_frames_;
 	const bool										loop_;
+	const size_t									length_;
 
 	safe_ptr<core::basic_frame>						last_frame_;
-	
-	tbb::task_group									tasks_;
 
+	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, const std::wstring& filter, bool loop, int start, int length) 
+	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)
-		, graph_(diagnostics::create_graph(narrow(print())))
+		, graph_(diagnostics::create_graph([this]{return print();}))
 		, frame_factory_(frame_factory)		
 		, 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())
-		, muxer_(video_decoder_.fps(), format_desc_, frame_factory)
+		, fps_(video_decoder_.fps())
+		, muxer_(fps_, frame_factory)
 		, start_(start)
-		, nb_frames_(video_decoder_.nb_frames() - 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));	
 		
-		for(int n = 0; n < 128 && muxer_.size() < 2; ++n)
-			decode_frame();
+		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)
 	{
-		// TODO: Do rendering asynchronously.
-
+		auto frame = core::basic_frame::late();
+		
 		frame_timer_.restart();
-
-		for(int n = 0; n < 64 && muxer_.size() < 2; ++n)
-			decode_frame();
-
-		graph_->update_value("frame-time", static_cast<float>(frame_timer_.elapsed()*format_desc_.fps*0.5));
 		
-		if(!muxer_.empty())
-			return last_frame_ = muxer_.pop();	
-
-		if(input_.eof())
-			return core::basic_frame::eof();
-
-		graph_->add_tag("underflow");	
-		++nb_frames_;		
+		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));
 
-		return core::basic_frame::late();
+		if(!muxer_.empty())
+			frame = last_frame_ = muxer_.pop();	
+		else
+		{
+			if(input_.eof())
+				return core::basic_frame::eof();
+			else			
+				graph_->add_tag("underflow");	
+		}
+		
+		return frame;
 	}
 
 	virtual safe_ptr<core::basic_frame> last_frame() const
@@ -124,9 +132,9 @@ public:
 		return disable_audio(last_frame_);
 	}
 
-	void decode_frame()
+	void decode_frame(int hints)
 	{
-		for(int n = 0; n < 32 && ((!muxer_.video_ready() && !video_decoder_.ready()) ||	(!muxer_.audio_ready() && !audio_decoder_.ready())); ++n) 
+		for(int n = 0; n < 16 && ((!muxer_.video_ready() && !video_decoder_.ready()) ||	(!muxer_.audio_ready() && !audio_decoder_.ready())); ++n) 
 		{
 			std::shared_ptr<AVPacket> pkt;
 			if(input_.try_pop(pkt))
@@ -135,44 +143,81 @@ public:
 				audio_decoder_.push(pkt);
 			}
 		}
-
-		decltype(video_decoder_.poll()) video_frames;
-		decltype(audio_decoder_.poll()) audio_samples;
 		
 		tbb::parallel_invoke(
 		[&]
 		{
-			if(!muxer_.video_ready())
-				video_frames = video_decoder_.poll();
+			if(muxer_.video_ready())
+				return;
+
+			auto video_frames = video_decoder_.poll();
+			BOOST_FOREACH(auto& video, video_frames)	
+			{
+				is_progressive_ = video ? video->interlaced_frame == 0 : is_progressive_;
+				muxer_.push(video, hints);	
+			}
 		},
 		[&]
 		{
-			if(!muxer_.audio_ready())
-				audio_samples = audio_decoder_.poll();
+			if(muxer_.audio_ready())
+				return;
+					
+			auto audio_samples = audio_decoder_.poll();
+			BOOST_FOREACH(auto& audio, audio_samples)
+				muxer_.push(audio);				
 		});
-		
-		BOOST_FOREACH(auto& audio, audio_samples)
-			muxer_.push(audio);
 
-		BOOST_FOREACH(auto& video, video_frames)
-			muxer_.push(video);		
+		muxer_.commit();
 	}
 
-	virtual int64_t nb_frames() const
+	virtual int64_t nb_frames() const 
 	{
-		return loop_ ? 0 : nb_frames_;
+		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.
+
+		int64_t nb_frames = input_.nb_frames();
+		if(input_.nb_loops() < 1) // input still hasn't counted all frames
+		{
+			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)));
+		}
+
+		nb_frames = muxer_.calc_nb_frames(nb_frames);
+
+		// TODO: Might need to scale nb_frames av frame_muxer transformations.
+
+		return nb_frames - start_;
 	}
 				
 	virtual std::wstring print() const
 	{
-		return L"ffmpeg[" + boost::filesystem::wpath(filename_).filename() + L"]";
+		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"]";
 	}
 };
 
 safe_ptr<core::frame_producer> create_ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)
 {		
 	static const std::vector<std::wstring> extensions = boost::assign::list_of
-		(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");
+		(L"mpg")(L"mpeg")(L"m2v")(L"m4v")(L"mp3")(L"mp4")(L"mpga")
+		(L"avi")
+		(L"mov")
+		(L"qt")
+		(L"webm")
+		(L"dv")		
+		(L"f4v")(L"flv")
+		(L"mkv")(L"mka")
+		(L"wmv")(L"wma")(L"wav")
+		(L"rm")(L"ram")
+		(L"ogg")(L"ogv")(L"oga")(L"ogx")
+		(L"divx")(L"xvid");
+
 	std::wstring filename = env::media_folder() + L"\\" + params[0];
 	
 	auto ext = boost::find_if(extensions, [&](const std::wstring& ex)
@@ -183,28 +228,16 @@ safe_ptr<core::frame_producer> create_ffmpeg_producer(const safe_ptr<core::frame
 	if(ext == extensions.end())
 		return core::frame_producer::empty();
 
-	std::wstring path = filename + L"." + *ext;
-	bool loop = boost::find(params, L"LOOP") != params.end();
-
-	int start = -1;
-	int length = -1;
+	auto path		= filename + L"." + *ext;
+	auto loop		= boost::range::find(params, L"LOOP") != params.end();
+	auto start		= core::get_param(L"SEEK", params, 0);
+	auto length		= core::get_param(L"LENGTH", params, std::numeric_limits<size_t>::max());
+	auto filter_str = core::get_param<std::wstring>(L"FILTER", params, L""); 	
+		
+	boost::replace_all(filter_str, L"DEINTERLACE", L"YADIF=0:-1");
+	boost::replace_all(filter_str, L"DEINTERLACE_BOB", L"YADIF=1:-1");
 	
-	auto seek_it = std::find(params.begin(), params.end(), L"SEEK");
-	if(seek_it != params.end())
-	{
-		if(++seek_it != params.end())
-			start = boost::lexical_cast<int>(*seek_it);
-	}
-
-	std::wstring filter = L"";
-	auto filter_it = std::find(params.begin(), params.end(), 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);
+	return make_safe<ffmpeg_producer>(frame_factory, path, filter_str, loop, start, length);
 }
 
 }
\ No newline at end of file