- 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
, 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
, 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
- , muxer_(video_decoder_.fps(), frame_factory)\r
- , late_frames_(0)\r
+ , fps_(video_decoder_.fps())\r
+ , muxer_(fps_, frame_factory)\r
+ , width_(video_decoder_.width())\r
+ , height_(video_decoder_.height())\r
+ , is_progressive_(true)\r
- graph_->set_color("frame-time", diagnostics::color(1.0f, 0.0f, 0.0f));\r
- graph_->set_color("video-time", diagnostics::color(1.0f, 1.0f, 0.0f));\r
- graph_->set_color("audio-time", diagnostics::color(0.2f, 1.0f, 0.2f));\r
- graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f)); \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
virtual safe_ptr<core::basic_frame> receive(int hints)\r
{\r
auto frame = core::basic_frame::late();\r
\r
frame_timer_.restart();\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 < 16 && ((!muxer_.video_ready() && !video_decoder_.ready()) || (!muxer_.audio_ready() && !audio_decoder_.ready())); ++n) \r
{\r
std::shared_ptr<AVPacket> pkt;\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
- tasks_.run([=]\r
- {\r
- video_timer_.restart();\r
-\r
- auto video_frames = video_decoder_.poll();\r
- BOOST_FOREACH(auto& video, video_frames) \r
- muxer_.push(video, hints); \r
+ if(muxer_.video_ready())\r
+ return;\r
- graph_->update_value("video-time", static_cast<float>(video_timer_.elapsed()*format_desc_.fps*0.5));\r
- });\r
- } \r
-\r
- if(!muxer_.audio_ready())\r
- {\r
- tasks_.run([=]\r
+ auto video_frames = video_decoder_.poll();\r
+ BOOST_FOREACH(auto& video, video_frames) \r
- audio_timer_.restart();\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
- auto audio_samples = audio_decoder_.poll();\r
- BOOST_FOREACH(auto& audio, audio_samples)\r
- muxer_.push(audio); \r
+ auto audio_samples = audio_decoder_.poll();\r
+ BOOST_FOREACH(auto& audio, audio_samples)\r
+ muxer_.push(audio); \r
+ });\r
int64_t video_nb_frames = video_decoder_.nb_frames();\r
int64_t audio_nb_frames = audio_decoder_.nb_frames();\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::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
- return L"ffmpeg[" + boost::filesystem::wpath(filename_).filename() + L"]";\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
+ + L"]";\r
if(seek_it != params.end())\r
{\r
if(++seek_it != params.end())\r
start = boost::lexical_cast<size_t>(*seek_it);\r
}\r
\r
if(seek_it != params.end())\r
{\r
if(++seek_it != params.end())\r
start = boost::lexical_cast<size_t>(*seek_it);\r
}\r
\r