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 d1ffab291489ec2d657d52cd260eca0aae5069c1..f881d2adbb6d36353912b8cfb8b56b3c12e23335 100644 (file)
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -22,56 +22,68 @@
 \r
 #include "frame_producer.h"\r
 #include "frame/basic_frame.h"\r
+#include "frame/frame_transform.h"\r
 \r
 #include "color/color_producer.h"\r
 #include "separated/separated_producer.h"\r
 \r
 #include <common/memory/safe_ptr.h>\r
+#include <common/exception/exceptions.h>\r
 \r
 namespace caspar { namespace core {\r
        \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(){return basic_frame::empty();}\r
-               virtual void set_frame_factory(const safe_ptr<frame_factory>&){}\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
 \r
-safe_ptr<basic_frame> receive_and_follow(safe_ptr<frame_producer>& producer)\r
+safe_ptr<basic_frame> receive_and_follow(safe_ptr<frame_producer>& producer, int hints)\r
 {      \r
-       if(producer == frame_producer::empty())\r
-               return basic_frame::eof();\r
-\r
-       auto frame = basic_frame::eof();\r
-       try\r
-       {\r
-               frame = producer->receive();\r
-       }\r
-       catch(...)\r
-       {\r
-               try\r
-               {\r
-                       // Producer will be removed since frame == basic_frame::eof.\r
-                       CASPAR_LOG_CURRENT_EXCEPTION();\r
-                       CASPAR_LOG(warning) << producer->print() << " Failed to receive frame. Removing producer.";\r
-               }\r
-               catch(...){}\r
-       }\r
-\r
+       auto frame = producer->receive(hints);\r
        if(frame == basic_frame::eof())\r
        {\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
+               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);\r
+               return receive_and_follow(producer, hints);\r
        }\r
        return frame;\r
 }\r
@@ -102,10 +114,7 @@ safe_ptr<core::frame_producer> do_create_producer(const safe_ptr<frame_factory>&
 \r
        if(producer == frame_producer::empty())\r
                producer = create_color_producer(my_frame_factory, params);\r
-\r
-       if(producer == frame_producer::empty())\r
-               BOOST_THROW_EXCEPTION(file_not_found() << msg_info("No match found for supplied commands. Check syntax."));\r
-\r
+       \r
        return producer;\r
 }\r
 \r
@@ -122,12 +131,25 @@ safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>& my
                {\r
                        params_copy[0] += L"_A";\r
                        key_producer = do_create_producer(my_frame_factory, params_copy);                       \r
+                       if(key_producer == frame_producer::empty())\r
+                       {\r
+                               params_copy[0] += L"LPHA";\r
+                               key_producer = do_create_producer(my_frame_factory, params_copy);       \r
+                       }\r
                }\r
        }\r
        catch(...){}\r
 \r
-       if(key_producer != frame_producer::empty())\r
-               return create_separated_producer(producer, key_producer);\r
+       if(producer != frame_producer::empty() && key_producer != frame_producer::empty())\r
+               producer = create_separated_producer(producer, key_producer);\r
+       \r
+       if(producer == frame_producer::empty())\r
+       {\r
+               std::wstring str;\r
+               BOOST_FOREACH(auto& param, params)\r
+                       str += param + L" ";\r
+               BOOST_THROW_EXCEPTION(file_not_found() << msg_info("No match found for supplied commands. Check syntax.") << arg_value_info(narrow(str)));\r
+       }\r
 \r
        return producer;\r
 }\r