]> git.sesse.net Git - casparcg/blobdiff - modules/ffmpeg/producer/ffmpeg_producer.cpp
2.0. Fixed rendering stalls caused by ogl frame allocation delays.
[casparcg] / modules / ffmpeg / producer / ffmpeg_producer.cpp
index 1aba5c3233b72a25f6807ba597352473b63bbd8e..d1ca8c0295a97d0f420c87ef472398903f3f0778 100644 (file)
@@ -36,6 +36,7 @@
 #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/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
@@ -61,80 +62,82 @@ struct ffmpeg_producer : public core::frame_producer
 \r
        input                                                                                   input_; \r
        video_decoder                                                                   video_decoder_;\r
-       audio_decoder                                                                   audio_decoder_;\r
-       \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 < 128 && muxer_.size() < 2; ++n)\r
-                       decode_frame(0);\r
-       }\r
+               // Do some pre-work in order to not block rendering thread for initialization and allocations.\r
 \r
-       ~ffmpeg_producer()\r
-       {\r
-               try\r
-               {\r
-                       tasks_.cancel();\r
-                       tasks_.wait();\r
-               }\r
-               catch(...)\r
+               push_packets();\r
+               auto video_frames = video_decoder_.poll();\r
+               if(!video_frames.empty())\r
                {\r
-                       CASPAR_LOG_CURRENT_EXCEPTION();\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
+                       \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
@@ -143,12 +146,8 @@ public:
                return disable_audio(last_frame_);\r
        }\r
 \r
-       void decode_frame(int hints)\r
+       void push_packets()\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
@@ -158,62 +157,86 @@ public:
                                audio_decoder_.push(pkt);\r
                        }\r
                }\r
+       }\r
+\r
+       void decode_frame(int hints)\r
+       {\r
+               push_packets();\r
                \r
-               if(!muxer_.video_ready())\r
+               tbb::parallel_invoke(\r
+               [&]\r
                {\r
-                       tasks_.run([=]\r
-                       {\r
-                               video_timer_.restart();\r
+                       if(muxer_.video_ready())\r
+                               return;\r
 \r
-                               auto video_frames = video_decoder_.poll();\r
-                               BOOST_FOREACH(auto& video, video_frames)                \r
-                                       muxer_.push(video, hints);      \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
+       virtual int64_t nb_frames() const \r
        {\r
                if(loop_)\r
-                       return 0;\r
+                       return std::numeric_limits<int64_t>::max();\r
+\r
+               // This function estimates nb_frames until input has read all packets for one loop, at which point the count should be accurate.\r
 \r
                int64_t nb_frames = input_.nb_frames();\r
+               if(input_.nb_loops() < 1) // input still hasn't counted all frames\r
+               {\r
+                       int64_t video_nb_frames = video_decoder_.nb_frames();\r
+                       int64_t audio_nb_frames = audio_decoder_.nb_frames();\r
 \r
-               if(nb_frames == 0)\r
-                       nb_frames = video_decoder_.nb_frames();\r
-               \r
-               if(nb_frames == 0)\r
-                       nb_frames = audio_decoder_.nb_frames();\r
-               \r
-               return nb_frames + late_frames_ - start_;\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 - 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>(is_progressive_ ? fps_ : 2.0 * 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
 {              \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
@@ -224,28 +247,16 @@ safe_ptr<core::frame_producer> create_ffmpeg_producer(const safe_ptr<core::frame
        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
-       int start = -1;\r
-       int length = -1;\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 seek_it = std::find(params.begin(), params.end(), L"SEEK");\r
-       if(seek_it != params.end())\r
-       {\r
-               if(++seek_it != params.end())\r
-                       start = boost::lexical_cast<int>(*seek_it);\r
-       }\r
-\r
-       std::wstring filter = L"";\r
-       auto filter_it = std::find(params.begin(), params.end(), 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