2.0. core: Simplified layer and frame_producer logic.

[casparcg] / modules / ffmpeg / producer / ffmpeg_producer.cpp

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index 3b62cf40319dd8dcd5da9608260b8b039f39d56b..3db902f5fe64b8e93776972bebce1a95e3de7e65 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -65,7 +65,6 @@ struct ffmpeg_producer : public core::frame_producer
        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
@@ -87,7 +86,6 @@ public:
                , audio_decoder_(input_.context(), frame_factory->get_video_format_desc())\r
                , fps_(video_decoder_.fps())\r
                , muxer_(fps_, frame_factory)\r
-               , late_frames_(0)\r
                , start_(start)\r
                , loop_(loop)\r
                , length_(length)\r
@@ -121,11 +119,8 @@ public:
                {\r
                        if(input_.eof())\r
                                return core::basic_frame::eof();\r
-                       else\r
-                       {\r
+                       else                    \r
                                graph_->add_tag("underflow");   \r
-                               ++late_frames_;         \r
-                       }\r
                }\r
                \r
                return frame;\r
@@ -194,7 +189,7 @@ public:
 \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