2.0. core: Simplified layer and frame_producer logic.

[casparcg] / core / producer / frame_producer.cpp

diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index da08185ac5ef7e66d22c0db298098c6f153a2410..f881d2adbb6d36353912b8cfb8b56b3c12e23335 100644 (file)
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -34,16 +34,36 @@ namespace caspar { namespace core {
        \r
 std::vector<const producer_factory_t> g_factories;\r
 \r
-const safe_ptr<frame_producer>& frame_producer::empty() // nothrow\r
+class last_frame_producer : public frame_producer\r
 {\r
-       struct empty_frame_producer : public frame_producer\r
+       const std::wstring                      print_;\r
+       const safe_ptr<basic_frame>     frame_;\r
+       const int64_t                           nb_frames_;\r
+public:\r
+       last_frame_producer(const safe_ptr<frame_producer>& producer) \r
+               : print_(producer->print())\r
+               , frame_(producer->last_frame() != basic_frame::eof() ? producer->last_frame() : basic_frame::empty())\r
+               , nb_frames_(producer->nb_frames())\r
        {\r
-               virtual safe_ptr<basic_frame> receive(int){return basic_frame::empty();}\r
-               virtual safe_ptr<basic_frame> last_frame() const{return basic_frame::empty();}\r
-               virtual void set_frame_factory(const safe_ptr<frame_factory>&){}\r
-               virtual int64_t nb_frames() const {return 0;}\r
-               virtual std::wstring print() const { return L"empty";}\r
-       };\r
+       }\r
+       \r
+       virtual safe_ptr<basic_frame> receive(int){return frame_;}\r
+       virtual safe_ptr<core::basic_frame> last_frame() const{return frame_;}\r
+       virtual std::wstring print() const{return L"dummy[" + print_ + L"]";}\r
+       virtual int64_t nb_frames() const {return nb_frames_;}  \r
+};\r
+\r
+struct empty_frame_producer : public frame_producer\r
+{\r
+       virtual safe_ptr<basic_frame> receive(int){return basic_frame::empty();}\r
+       virtual safe_ptr<basic_frame> last_frame() const{return basic_frame::empty();}\r
+       virtual void set_frame_factory(const safe_ptr<frame_factory>&){}\r
+       virtual int64_t nb_frames() const {return 0;}\r
+       virtual std::wstring print() const { return L"empty";}\r
+};\r
+\r
+const safe_ptr<frame_producer>& frame_producer::empty() // nothrow\r
+{\r
        static safe_ptr<frame_producer> producer = make_safe<empty_frame_producer>();\r
        return producer;\r
 }      \r
@@ -55,11 +75,13 @@ safe_ptr<basic_frame> receive_and_follow(safe_ptr<frame_producer>& producer, int
        {\r
                CASPAR_LOG(info) << producer->print() << " End Of File.";\r
                auto following = producer->get_following_producer();\r
-               following->set_leading_producer(producer);\r
-               producer = std::move(following);                \r
-                               \r
-               if(producer == frame_producer::empty())\r
-                       return basic_frame::eof();\r
+               if(following != frame_producer::empty())\r
+               {\r
+                       following->set_leading_producer(producer);\r
+                       producer = std::move(following);\r
+               }\r
+               else\r
+                       producer = make_safe<last_frame_producer>(producer);\r
 \r
                return receive_and_follow(producer, hints);\r
        }\r