#include "audio/audio_decoder.h"\r
#include "video/video_decoder.h"\r
\r
+#include <common/concrt/bounded_buffer.h>\r
#include <common/env.h>\r
#include <common/utility/assert.h>\r
#include <common/diagnostics/graph.h>\r
#include <core/producer/frame/frame_factory.h>\r
#include <core/producer/frame/basic_frame.h>\r
\r
+#include <boost/algorithm/string.hpp>\r
#include <boost/assign.hpp>\r
#include <boost/timer.hpp>\r
#include <boost/foreach.hpp>\r
#include <boost/range/algorithm/find_if.hpp>\r
#include <boost/range/algorithm/find.hpp>\r
\r
-#include <tbb/parallel_invoke.h>\r
+#include <agents.h>\r
+#include <ppl.h>\r
\r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
+\r
+template<typename T>\r
+struct buffer_alias\r
+{\r
+ typedef Concurrency::bounded_buffer<std::shared_ptr<T>> type;\r
+};\r
\r
struct ffmpeg_producer : public core::frame_producer\r
-{\r
- const std::wstring filename_;\r
- \r
- const safe_ptr<diagnostics::graph> graph_;\r
- boost::timer frame_timer_;\r
- boost::timer video_timer_;\r
- boost::timer audio_timer_;\r
+{ \r
+ const std::wstring filename_;\r
+ const int start_;\r
+ const bool loop_;\r
+ const size_t length_;\r
+\r
+ buffer_alias<AVPacket>::type video_packets_;\r
+ buffer_alias<AVPacket>::type audio_packets_;\r
+ buffer_alias<AVFrame>::type video_frames_;\r
+ buffer_alias<core::audio_buffer>::type audio_buffers_;\r
+ buffer_alias<core::basic_frame>::type muxed_frames_;\r
+ Concurrency::overwrite_buffer<bool> active_token_;\r
+ \r
+ const safe_ptr<diagnostics::graph> graph_;\r
\r
- const safe_ptr<core::frame_factory> frame_factory_;\r
- const core::video_format_desc format_desc_;\r
+ input input_; \r
+ video_decoder video_decoder_;\r
+ audio_decoder audio_decoder_; \r
+ frame_muxer2 muxer_;\r
\r
- input input_; \r
- video_decoder video_decoder_;\r
- audio_decoder audio_decoder_; \r
- double fps_;\r
- frame_muxer muxer_;\r
-\r
- int late_frames_;\r
- const int start_;\r
- const bool loop_;\r
- const size_t length_;\r
-\r
- safe_ptr<core::basic_frame> last_frame_;\r
-\r
- const size_t width_;\r
- const size_t height_;\r
- bool is_progressive_;\r
+ safe_ptr<core::basic_frame> last_frame_;\r
\r
public:\r
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) \r
: filename_(filename)\r
- , graph_(diagnostics::create_graph([this]{return print();}))\r
- , frame_factory_(frame_factory) \r
- , format_desc_(frame_factory->get_video_format_desc())\r
- , input_(graph_, filename_, loop, start, length)\r
- , video_decoder_(input_.context(), frame_factory, filter)\r
- , audio_decoder_(input_.context(), frame_factory->get_video_format_desc())\r
- , fps_(video_decoder_.fps())\r
- , muxer_(fps_, frame_factory)\r
- , late_frames_(0)\r
, start_(start)\r
, loop_(loop)\r
, length_(length)\r
+ , video_packets_(25)\r
+ , audio_packets_(25)\r
+ , video_frames_(2)\r
+ , audio_buffers_(2)\r
+ , muxed_frames_(2)\r
+ , graph_(diagnostics::create_graph([this]{return print();}, false))\r
+ , input_(active_token_, video_packets_, audio_packets_, graph_, filename_, loop, start, length)\r
+ , video_decoder_(active_token_, video_packets_, video_frames_, input_.context(), frame_factory->get_video_format_desc().fps, filter)\r
+ , audio_decoder_(active_token_, audio_packets_, audio_buffers_, input_.context(), frame_factory->get_video_format_desc())\r
+ , muxer_(active_token_, video_frames_, audio_buffers_, muxed_frames_, video_decoder_.fps(), frame_factory)\r
, last_frame_(core::basic_frame::empty())\r
- , width_(video_decoder_.width())\r
- , height_(video_decoder_.height())\r
- , is_progressive_(true)\r
{\r
- graph_->add_guide("frame-time", 0.5);\r
- graph_->set_color("frame-time", diagnostics::color(0.1f, 1.0f, 0.1f));\r
graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f)); \r
- \r
- for(int n = 0; n < 32 && muxer_.empty(); ++n)\r
- decode_frame(0);\r
+ graph_->start();\r
+\r
+ Concurrency::send(active_token_, true);\r
}\r
- \r
+\r
+ ~ffmpeg_producer()\r
+ {\r
+ Concurrency::send(active_token_, false);\r
+ std::shared_ptr<core::basic_frame> frame;\r
+ Concurrency::try_receive(muxed_frames_, frame);\r
+ }\r
+ \r
virtual safe_ptr<core::basic_frame> receive(int hints)\r
{\r
auto frame = core::basic_frame::late();\r
\r
- frame_timer_.restart();\r
- \r
- for(int n = 0; n < 64 && muxer_.empty(); ++n)\r
- decode_frame(hints);\r
- \r
- graph_->update_value("frame-time", static_cast<float>(frame_timer_.elapsed()*format_desc_.fps*0.5));\r
-\r
- if(!muxer_.empty())\r
- frame = last_frame_ = muxer_.pop(); \r
- else\r
- {\r
- if(input_.eof())\r
- return core::basic_frame::eof();\r
- else\r
- {\r
- graph_->add_tag("underflow"); \r
- ++late_frames_; \r
- }\r
+ try\r
+ { \r
+ frame = last_frame_ = safe_ptr<core::basic_frame>(Concurrency::receive(muxed_frames_, 8));\r
}\r
- \r
+ catch(Concurrency::operation_timed_out&)\r
+ { \r
+ graph_->add_tag("underflow"); \r
+ }\r
+\r
return frame;\r
}\r
\r
{\r
return disable_audio(last_frame_);\r
}\r
-\r
- void decode_frame(int hints)\r
- {\r
- for(int n = 0; n < 16 && ((!muxer_.video_ready() && !video_decoder_.ready()) || (!muxer_.audio_ready() && !audio_decoder_.ready())); ++n) \r
- {\r
- std::shared_ptr<AVPacket> pkt;\r
- if(input_.try_pop(pkt))\r
- {\r
- video_decoder_.push(pkt);\r
- audio_decoder_.push(pkt);\r
- }\r
- }\r
- \r
- tbb::parallel_invoke(\r
- [&]\r
- {\r
- if(muxer_.video_ready())\r
- return;\r
-\r
- auto video_frames = video_decoder_.poll();\r
- BOOST_FOREACH(auto& video, video_frames) \r
- {\r
- is_progressive_ = video ? video->interlaced_frame == 0 : is_progressive_;\r
- muxer_.push(video, hints); \r
- }\r
- },\r
- [&]\r
- {\r
- if(muxer_.audio_ready())\r
- return;\r
- \r
- auto audio_samples = audio_decoder_.poll();\r
- BOOST_FOREACH(auto& audio, audio_samples)\r
- muxer_.push(audio); \r
- });\r
-\r
- muxer_.commit();\r
- }\r
-\r
- virtual int64_t nb_frames() const \r
+ \r
+ virtual int64_t nb_frames() const\r
{\r
if(loop_)\r
return std::numeric_limits<int64_t>::max();\r
\r
// TODO: Might need to scale nb_frames av frame_muxer transformations.\r
\r
- return nb_frames + late_frames_ - start_;\r
+ return nb_frames - start_;\r
}\r
\r
virtual std::wstring print() const\r
{\r
return L"ffmpeg[" + boost::filesystem::wpath(filename_).filename() + L"|" \r
- + boost::lexical_cast<std::wstring>(width_) + L"x" + boost::lexical_cast<std::wstring>(height_)\r
- + (is_progressive_ ? L"p" : L"i") + boost::lexical_cast<std::wstring>(fps_)\r
+ + boost::lexical_cast<std::wstring>(video_decoder_.width()) + L"x" + boost::lexical_cast<std::wstring>(video_decoder_.height())\r
+ + (video_decoder_.is_progressive() ? L"p" : L"i") + boost::lexical_cast<std::wstring>(video_decoder_.is_progressive() ? video_decoder_.fps() : 2.0 * video_decoder_.fps())\r
+ L"]";\r
}\r
};\r
\r
-safe_ptr<core::frame_producer> create_ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
{ \r
static const std::vector<std::wstring> extensions = boost::assign::list_of\r
- (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");\r
+ (L"mpg")(L"mpeg")(L"m2v")(L"m4v")(L"mp3")(L"mp4")(L"mpga")\r
+ (L"avi")\r
+ (L"mov")\r
+ (L"qt")\r
+ (L"webm")\r
+ (L"dv") \r
+ (L"f4v")(L"flv")\r
+ (L"mkv")(L"mka")\r
+ (L"wmv")(L"wma")(L"wav")\r
+ (L"rm")(L"ram")\r
+ (L"ogg")(L"ogv")(L"oga")(L"ogx")\r
+ (L"divx")(L"xvid");\r
+\r
std::wstring filename = env::media_folder() + L"\\" + params[0];\r
\r
auto ext = boost::find_if(extensions, [&](const std::wstring& ex)\r
if(ext == extensions.end())\r
return core::frame_producer::empty();\r
\r
- std::wstring path = filename + L"." + *ext;\r
- bool loop = boost::find(params, L"LOOP") != params.end();\r
-\r
- size_t start = 0;\r
- size_t length = std::numeric_limits<size_t>::max();\r
- \r
- auto seek_it = boost::find(params, L"SEEK");\r
- if(seek_it != params.end())\r
- {\r
- if(++seek_it != params.end())\r
- start = boost::lexical_cast<size_t>(*seek_it);\r
- }\r
+ auto path = filename + L"." + *ext;\r
+ auto loop = boost::range::find(params, L"LOOP") != params.end();\r
+ auto start = core::get_param(L"SEEK", params, 0);\r
+ auto length = core::get_param(L"LENGTH", params, std::numeric_limits<size_t>::max());\r
+ auto filter_str = core::get_param<std::wstring>(L"FILTER", params, L""); \r
+ \r
+ boost::replace_all(filter_str, L"DEINTERLACE", L"YADIF=0:-1");\r
+ boost::replace_all(filter_str, L"DEINTERLACE_BOB", L"YADIF=1:-1");\r
\r
- auto length_it = boost::find(params, L"LENGTH");\r
- if(length_it != params.end())\r
- {\r
- if(++length_it != params.end())\r
- length = boost::lexical_cast<size_t>(*length_it);\r
- }\r
-\r
- std::wstring filter = L"";\r
- auto filter_it = boost::find(params, L"FILTER");\r
- if(filter_it != params.end())\r
- {\r
- if(++filter_it != params.end())\r
- filter = *filter_it;\r
- }\r
-\r
- return make_safe<ffmpeg_producer>(frame_factory, path, filter, loop, start, length);\r
+ return make_safe<ffmpeg_producer>(frame_factory, path, filter_str, loop, start, length);\r
}\r
\r
-}
\ No newline at end of file
+}}
\ No newline at end of file
projects / casparcg / blobdiff