#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
double fps_;\r
frame_muxer muxer_;\r
\r
- int late_frames_;\r
const int start_;\r
const bool loop_;\r
- const int64_t length_;\r
+ const size_t length_;\r
\r
safe_ptr<core::basic_frame> last_frame_;\r
\r
bool is_progressive_;\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, int length) \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
, 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
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
+ // Do some pre-work in order to not block rendering thread for initialization and allocations.\r
+\r
+ push_packets();\r
+ auto video_frames = video_decoder_.poll();\r
+ if(!video_frames.empty())\r
+ {\r
+ auto& video_frame = video_frames.front();\r
+ auto desc = get_pixel_format_desc(static_cast<PixelFormat>(video_frame->format), video_frame->width, video_frame->height);\r
+ if(desc.pix_fmt == core::pixel_format::invalid)\r
+ get_pixel_format_desc(PIX_FMT_BGRA, video_frame->width, video_frame->height);\r
+ \r
+ for(int n = 0; n < 3; ++n)\r
+ frame_factory->create_frame(this, desc);\r
+ }\r
+ BOOST_FOREACH(auto& video, video_frames) \r
+ muxer_.push(video, 0); \r
}\r
\r
virtual safe_ptr<core::basic_frame> receive(int hints)\r
{\r
if(input_.eof())\r
return core::basic_frame::eof();\r
- else\r
- {\r
+ else \r
graph_->add_tag("underflow"); \r
- ++late_frames_; \r
- }\r
}\r
\r
return frame;\r
return disable_audio(last_frame_);\r
}\r
\r
- void decode_frame(int hints)\r
+ void push_packets()\r
{\r
for(int n = 0; n < 16 && ((!muxer_.video_ready() && !video_decoder_.ready()) || (!muxer_.audio_ready() && !audio_decoder_.ready())); ++n) \r
{\r
audio_decoder_.push(pkt);\r
}\r
}\r
+ }\r
+\r
+ void decode_frame(int hints)\r
+ {\r
+ push_packets();\r
\r
tbb::parallel_invoke(\r
[&]\r
int64_t video_nb_frames = video_decoder_.nb_frames();\r
int64_t audio_nb_frames = audio_decoder_.nb_frames();\r
\r
- nb_frames = std::min(length_, std::max(nb_frames, std::max(video_nb_frames, audio_nb_frames)));\r
+ nb_frames = std::min(static_cast<int64_t>(length_), std::max(nb_frames, std::max(video_nb_frames, audio_nb_frames)));\r
}\r
\r
nb_frames = muxer_.calc_nb_frames(nb_frames);\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
+ + (is_progressive_ ? L"p" : L"i") + boost::lexical_cast<std::wstring>(is_progressive_ ? fps_ : 2.0 * fps_)\r
+ L"]";\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
{ \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
projects / casparcg / blobdiff