2.0. ffmpeg_producer: Improved frame number count accuracy.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1098 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index a533d056e635fb158d96bee966731a3f75df7781..bb5d727cb0bd497c050b99a4bc97122a61c898a4 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -64,8 +64,8 @@ struct ffmpeg_producer : public core::frame_producer
        \r
        frame_muxer                                                                             muxer_;\r
 \r
+       int                                                                                             late_frames_;\r
        const int                                                                               start_;\r
-       int64_t                                                                                 nb_frames_;\r
        const bool                                                                              loop_;\r
 \r
        safe_ptr<core::basic_frame>                                             last_frame_;\r
@@ -80,8 +80,8 @@ public:
                , 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
                , start_(start)\r
-               , nb_frames_(video_decoder_.nb_frames() - start)\r
                , loop_(loop)\r
                , last_frame_(core::basic_frame::empty())\r
        {\r
@@ -111,7 +111,7 @@ public:
                        else\r
                        {\r
                                graph_->add_tag("underflow");   \r
-                               ++nb_frames_;           \r
+                               ++late_frames_;         \r
                        }\r
                }\r
                \r
@@ -161,7 +161,8 @@ public:
 \r
        virtual int64_t nb_frames() const\r
        {\r
-               return loop_ ? 0 : nb_frames_;\r
+               auto nb_frames = input_.nb_frames() != 0 ? input_.nb_frames() : video_decoder_.nb_frames();\r
+               return loop_ ? 0 : (nb_frames + late_frames_ - start_);\r
        }\r
                                \r
        virtual std::wstring print() const\r

diff --git a/modules/ffmpeg/producer/input.cpp b/modules/ffmpeg/producer/input.cpp
index 98ea13d070dfafaa87df41ad3e2072f2701008ee..cffee97717450e5233b315f512a1ee8f23664599 100644 (file)
--- a/modules/ffmpeg/producer/input.cpp
+++ b/modules/ffmpeg/producer/input.cpp
@@ -77,14 +77,20 @@ struct input::implementation : boost::noncopyable
                \r
        boost::thread                                                                                           thread_;\r
        tbb::atomic<bool>                                                                                       is_running_;\r
+       tbb::atomic<size_t>                                                                                     nb_frames_;\r
+       int64_t                                                                                                         frame_number_;\r
+\r
+       int                                                                                                                     default_stream_index_;\r
 public:\r
        explicit implementation(const safe_ptr<diagnostics::graph>& graph, const std::wstring& filename, bool loop, int start) \r
                : graph_(graph)\r
                , loop_(loop)\r
                , filename_(filename)\r
                , start_(std::max(start, 0))\r
+               , frame_number_(0)\r
        {                       \r
                is_running_ = true;\r
+               nb_frames_ = 0;\r
                \r
                AVFormatContext* weak_format_context_ = nullptr;\r
                THROW_ON_ERROR2(avformat_open_input(&weak_format_context_, narrow(filename).c_str(), nullptr, nullptr), print());\r
@@ -93,6 +99,8 @@ public:
                        \r
                THROW_ON_ERROR2(avformat_find_stream_info(format_context_.get(), nullptr), print());\r
                \r
+               default_stream_index_ = THROW_ON_ERROR2(av_find_default_stream_index(format_context_.get()), print());\r
+\r
                if(start_ != 0)                 \r
                        seek_frame(start_);\r
                \r
@@ -130,6 +138,11 @@ public:
                return result;\r
        }\r
 \r
+       size_t nb_frames() const\r
+       {\r
+               return nb_frames_;\r
+       }\r
+\r
 private:\r
        \r
        void run()\r
@@ -173,6 +186,9 @@ private:
                \r
                if(is_eof(ret))                                                                                                              \r
                {\r
+                       if(nb_frames_ == 0)\r
+                               nb_frames_ = static_cast<size_t>(frame_number_);\r
+\r
                        if(loop_)\r
                        {\r
                                seek_frame(start_, AVSEEK_FLAG_BACKWARD);\r
@@ -189,6 +205,9 @@ private:
                {               \r
                        THROW_ON_ERROR(ret, print(), "av_read_frame");\r
 \r
+                       if(read_packet->stream_index == default_stream_index_)\r
+                               ++frame_number_;\r
+\r
                        THROW_ON_ERROR2(av_dup_packet(read_packet.get()), print());\r
                                \r
                        // Make sure that the packet is correctly deallocated even if size and data is modified during decoding.\r
@@ -215,15 +234,8 @@ private:
        }\r
 \r
        void seek_frame(int64_t frame, int flags = 0)\r
-       {       \r
-               static const AVRational base_q = {1, AV_TIME_BASE};\r
-\r
-               int stream_index = av_find_default_stream_index(format_context_.get());\r
-               THROW_ON_ERROR(stream_index, print(), "av_find_default_stream_index");\r
-                                               \r
-               const int ret = av_seek_frame(format_context_.get(), stream_index, frame, flags);\r
-               THROW_ON_ERROR(ret, print(), "av_seek_frame");\r
-               \r
+       {                                                       \r
+               THROW_ON_ERROR2(av_seek_frame(format_context_.get(), default_stream_index_, frame, flags), print());            \r
                buffer_.push(nullptr);\r
        }               \r
 \r
@@ -248,4 +260,5 @@ input::input(const safe_ptr<diagnostics::graph>& graph, const std::wstring& file
 bool input::eof() const {return !impl_->is_running_;}\r
 bool input::try_pop(std::shared_ptr<AVPacket>& packet){return impl_->try_pop(packet);}\r
 std::shared_ptr<AVFormatContext> input::context(){return impl_->format_context_;}\r
+size_t input::nb_frames() const {return impl_->nb_frames();}\r
 }
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/input.h b/modules/ffmpeg/producer/input.h
index ddecae014e64c63b2cedf80d8de9ab0b2606764a..262aca4cc487992c421e24c2fb592524db8e2cd9 100644 (file)
--- a/modules/ffmpeg/producer/input.h
+++ b/modules/ffmpeg/producer/input.h
@@ -45,6 +45,8 @@ public:
        bool try_pop(std::shared_ptr<AVPacket>& packet);\r
        bool eof() const;\r
 \r
+       size_t nb_frames() const;\r
+\r
        std::shared_ptr<AVFormatContext> context();\r
 private:\r
        struct implementation;\r