#include <boost/range/algorithm/find_if.hpp>\r
#include <boost/range/algorithm/find.hpp>\r
\r
-#include <tbb/task_group.h>\r
+#include <tbb/parallel_invoke.h>\r
\r
namespace caspar {\r
- \r
+ \r
struct ffmpeg_producer : public core::frame_producer\r
{\r
const std::wstring filename_;\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
- tbb::task_group tasks_;\r
+ const size_t width_;\r
+ const size_t height_;\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(narrow(print())))\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
- , muxer_(video_decoder_.fps(), frame_factory)\r
- , late_frames_(0)\r
+ , fps_(video_decoder_.fps())\r
+ , muxer_(fps_, frame_factory)\r
, start_(start)\r
, loop_(loop)\r
+ , length_(length)\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(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
\r
- for(int n = 0; n < 32 && muxer_.size() < 2; ++n)\r
+ for(int n = 0; n < 32 && muxer_.empty(); ++n)\r
decode_frame(0);\r
}\r
-\r
- ~ffmpeg_producer()\r
- {\r
- try\r
- {\r
- tasks_.cancel();\r
- tasks_.wait();\r
- }\r
- catch(...)\r
- {\r
- CASPAR_LOG_CURRENT_EXCEPTION();\r
- }\r
- }\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 < 8 && muxer_.empty(); ++n)\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 last_frame();\r
- else\r
- {\r
+ return core::basic_frame::eof();\r
+ else \r
graph_->add_tag("underflow"); \r
- ++late_frames_; \r
- }\r
}\r
\r
- graph_->update_value("frame-time", static_cast<float>(frame_timer_.elapsed()*format_desc_.fps*0.5));\r
- \r
return frame;\r
}\r
\r
\r
void decode_frame(int hints)\r
{\r
- tasks_.wait();\r
-\r
- muxer_.commit();\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
}\r
}\r
\r
- if(!muxer_.video_ready())\r
+ tbb::parallel_invoke(\r
+ [&]\r
{\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
\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
{\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
\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
\r
- graph_->update_value("audio-time", static_cast<float>(audio_timer_.elapsed()*format_desc_.fps*0.5));\r
- }); \r
- }\r
+ muxer_.commit();\r
}\r
\r
virtual int64_t nb_frames() const \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
}\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
+ 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
}\r
};\r
\r
std::wstring path = filename + L"." + *ext;\r
bool loop = boost::find(params, L"LOOP") != params.end();\r
\r
- int start = -1;\r
- int length = -1;\r
+ size_t start = 0;\r
+ size_t length = std::numeric_limits<size_t>::max();\r
\r
- auto seek_it = std::find(params.begin(), params.end(), L"SEEK");\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<int>(*seek_it);\r
+ start = boost::lexical_cast<size_t>(*seek_it);\r
+ }\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 = std::find(params.begin(), params.end(), L"FILTER");\r
+ auto filter_it = boost::find(params, L"FILTER");\r
if(filter_it != params.end())\r
{\r
if(++filter_it != params.end())\r
projects / casparcg / blobdiff