X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fffmpeg%2Fproducer%2Fffmpeg_producer.cpp;h=3db902f5fe64b8e93776972bebce1a95e3de7e65;hb=5bad7c1c1348fe338b748cff8dbc448155d3ae85;hp=115b663954a24143b4dfb260af446fb3c25beb04;hpb=bc1a65afed2d7207ce6bba139f90638824261ec6;p=casparcg diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp index 115b66395..3db902f5f 100644 --- a/modules/ffmpeg/producer/ffmpeg_producer.cpp +++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp @@ -43,10 +43,10 @@ #include #include -#include +#include namespace caspar { - + struct ffmpeg_producer : public core::frame_producer { const std::wstring filename_; @@ -61,80 +61,68 @@ struct ffmpeg_producer : public core::frame_producer input input_; video_decoder video_decoder_; - audio_decoder audio_decoder_; - + audio_decoder audio_decoder_; + double fps_; frame_muxer muxer_; - int late_frames_; const int start_; const bool loop_; + const size_t length_; safe_ptr last_frame_; - tbb::task_group tasks_; + const size_t width_; + const size_t height_; + bool is_progressive_; public: - explicit ffmpeg_producer(const safe_ptr& frame_factory, const std::wstring& filename, const std::wstring& filter, bool loop, int start, int length) + explicit ffmpeg_producer(const safe_ptr& 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(), frame_factory) - , late_frames_(0) + , fps_(video_decoder_.fps()) + , muxer_(fps_, frame_factory) , start_(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("video-time", diagnostics::color(1.0f, 1.0f, 0.0f)); - graph_->set_color("audio-time", diagnostics::color(0.2f, 1.0f, 0.2f)); - 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) + for(int n = 0; n < 32 && muxer_.empty(); ++n) decode_frame(0); } - - ~ffmpeg_producer() - { - try - { - tasks_.cancel(); - tasks_.wait(); - } - catch(...) - { - CASPAR_LOG_CURRENT_EXCEPTION(); - } - } - + virtual safe_ptr receive(int hints) { auto frame = core::basic_frame::late(); frame_timer_.restart(); - for(int n = 0; n < 8 && muxer_.empty(); ++n) + for(int n = 0; n < 64 && muxer_.empty(); ++n) decode_frame(hints); + + graph_->update_value("frame-time", static_cast(frame_timer_.elapsed()*format_desc_.fps*0.5)); if(!muxer_.empty()) frame = last_frame_ = muxer_.pop(); else { if(input_.eof()) - return last_frame(); - else - { + return core::basic_frame::eof(); + else graph_->add_tag("underflow"); - ++late_frames_; - } } - graph_->update_value("frame-time", static_cast(frame_timer_.elapsed()*format_desc_.fps*0.5)); - return frame; } @@ -145,10 +133,6 @@ public: void decode_frame(int hints) { - tasks_.wait(); - - muxer_.commit(); - for(int n = 0; n < 16 && ((!muxer_.video_ready() && !video_decoder_.ready()) || (!muxer_.audio_ready() && !audio_decoder_.ready())); ++n) { std::shared_ptr pkt; @@ -159,33 +143,30 @@ public: } } - if(!muxer_.video_ready()) + tbb::parallel_invoke( + [&] { - tasks_.run([=] - { - video_timer_.restart(); - - auto video_frames = video_decoder_.poll(); - BOOST_FOREACH(auto& video, video_frames) - muxer_.push(video, hints); + if(muxer_.video_ready()) + return; - graph_->update_value("video-time", static_cast(video_timer_.elapsed()*format_desc_.fps*0.5)); - }); - } - - if(!muxer_.audio_ready()) - { - tasks_.run([=] + auto video_frames = video_decoder_.poll(); + BOOST_FOREACH(auto& video, video_frames) { - audio_timer_.restart(); + is_progressive_ = video ? video->interlaced_frame == 0 : is_progressive_; + muxer_.push(video, hints); + } + }, + [&] + { + if(muxer_.audio_ready()) + return; - auto audio_samples = audio_decoder_.poll(); - BOOST_FOREACH(auto& audio, audio_samples) - muxer_.push(audio); + auto audio_samples = audio_decoder_.poll(); + BOOST_FOREACH(auto& audio, audio_samples) + muxer_.push(audio); + }); - graph_->update_value("audio-time", static_cast(audio_timer_.elapsed()*format_desc_.fps*0.5)); - }); - } + muxer_.commit(); } virtual int64_t nb_frames() const @@ -201,17 +182,22 @@ public: int64_t video_nb_frames = video_decoder_.nb_frames(); int64_t audio_nb_frames = audio_decoder_.nb_frames(); - nb_frames = std::max(nb_frames, std::max(video_nb_frames, audio_nb_frames)); + nb_frames = std::min(static_cast(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 + late_frames_ - start_; + 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(width_) + L"x" + boost::lexical_cast(height_) + + (is_progressive_ ? L"p" : L"i") + boost::lexical_cast(fps_) + + L"]"; } }; @@ -232,18 +218,25 @@ safe_ptr create_ffmpeg_producer(const safe_ptr::max(); - auto seek_it = std::find(params.begin(), params.end(), L"SEEK"); + auto seek_it = boost::find(params, L"SEEK"); if(seek_it != params.end()) { if(++seek_it != params.end()) - start = boost::lexical_cast(*seek_it); + start = boost::lexical_cast(*seek_it); + } + + auto length_it = boost::find(params, L"LENGTH"); + if(length_it != params.end()) + { + if(++length_it != params.end()) + length = boost::lexical_cast(*length_it); } std::wstring filter = L""; - auto filter_it = std::find(params.begin(), params.end(), L"FILTER"); + auto filter_it = boost::find(params, L"FILTER"); if(filter_it != params.end()) { if(++filter_it != params.end())