2.1.0: -frame_producer: Refactored producer proxies.

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

diff --git a/common/spl/memory.h b/common/spl/memory.h
index fb72c5b864d924d60685237ae02e87bc8531556c..aadd39426186528072b7c6d591d967c5fdf8848e 100644 (file)
--- a/common/spl/memory.h
+++ b/common/spl/memory.h
@@ -102,7 +102,7 @@ public:
         return p_.unique();\r
     }\r
 \r
-    long ue_count() const \r
+    long use_count() const \r
     {\r
         return p_.use_count();\r
     }\r

diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index 77f8d25e72346a396d8b3cd1d5301b2126317650..928ec5957ee3d4e63e25b0f337f3220c72a62e01 100644 (file)
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -71,12 +71,63 @@ const spl::shared_ptr<frame_producer>& frame_producer::empty() // nothrow
        return producer;\r
 }      \r
 \r
-class destroy_producer_proxy : public frame_producer\r
+class producer_proxy_base : public frame_producer\r
+{      \r
+protected:\r
+       std::shared_ptr<frame_producer> producer_;\r
+public:\r
+       producer_proxy_base(spl::shared_ptr<frame_producer>&& producer) \r
+               : producer_(std::move(producer))\r
+       {\r
+       }\r
+       \r
+       virtual spl::shared_ptr<draw_frame>                                                     receive(int hints) override                                                                                                             {return producer_->receive(hints);}\r
+       virtual spl::shared_ptr<draw_frame>                                                     last_frame() const override                                                                                                             {return producer_->last_frame();}\r
+       virtual std::wstring                                                                            print() const override                                                                                                                  {return producer_->print();}\r
+       virtual boost::property_tree::wptree                                            info() const override                                                                                                                   {return producer_->info();}\r
+       virtual boost::unique_future<std::wstring>                                      call(const std::wstring& str) override                                                                                  {return producer_->call(str);}\r
+       virtual spl::shared_ptr<frame_producer>                                         get_following_producer() const override                                                                                 {return producer_->get_following_producer();}\r
+       virtual void                                                                                            set_leading_producer(const spl::shared_ptr<frame_producer>& producer) override  {return producer_->set_leading_producer(producer);}\r
+       virtual uint32_t                                                                                        nb_frames() const override                                                                                                              {return producer_->nb_frames();}\r
+};\r
+\r
+class follow_producer_proxy : public producer_proxy_base\r
+{      \r
+public:\r
+       follow_producer_proxy(spl::shared_ptr<frame_producer>&& producer) \r
+               : producer_proxy_base(std::move(producer))\r
+       {\r
+       }\r
+\r
+       virtual spl::shared_ptr<draw_frame>     receive(int hints) override                                                                                                             \r
+       {\r
+               auto frame = producer_->receive(hints);\r
+               if(frame == draw_frame::eof())\r
+               {\r
+                       CASPAR_LOG(info) << producer_->print() << " End Of File.";\r
+                       auto following = producer_->get_following_producer();\r
+                       if(following != frame_producer::empty())\r
+                       {\r
+                               following->set_leading_producer(spl::make_shared_ptr(producer_));\r
+                               producer_ = std::move(following);\r
+                       }\r
+\r
+                       return receive(hints);\r
+               }\r
+               return frame;\r
+       }\r
+\r
+       virtual spl::shared_ptr<draw_frame> last_frame() const override \r
+       {\r
+               return draw_frame::mute(producer_->last_frame());\r
+       }\r
+};\r
+\r
+class destroy_producer_proxy : public producer_proxy_base\r
 {      \r
-       std::unique_ptr<std::shared_ptr<frame_producer>> producer_;\r
 public:\r
        destroy_producer_proxy(spl::shared_ptr<frame_producer>&& producer) \r
-               : producer_(new std::shared_ptr<frame_producer>(std::move(producer)))\r
+               : producer_proxy_base(std::move(producer))\r
        {\r
        }\r
 \r
@@ -87,11 +138,10 @@ public:
                ++counter;\r
                CASPAR_VERIFY(counter < 32);\r
                \r
-               auto producer = producer_.release();\r
+               auto producer = new spl::shared_ptr<frame_producer>(std::move(producer_));\r
                async([=]\r
                {\r
-                       std::unique_ptr<std::shared_ptr<frame_producer>> pointer_guard(producer);\r
-\r
+                       std::unique_ptr<spl::shared_ptr<frame_producer>> pointer_guard(producer);\r
                        auto str = (*producer)->print();\r
                        try\r
                        {\r
@@ -107,23 +157,13 @@ public:
                        --counter;\r
                }); \r
        }\r
-\r
-       virtual spl::shared_ptr<draw_frame>                                                     receive(int hints) override                                                                                                             {return (*producer_)->receive(hints);}\r
-       virtual spl::shared_ptr<draw_frame>                                                     last_frame() const override                                                                                                             {return (*producer_)->last_frame();}\r
-       virtual std::wstring                                                                            print() const override                                                                                                                  {return (*producer_)->print();}\r
-       virtual boost::property_tree::wptree                                            info() const override                                                                                                                   {return (*producer_)->info();}\r
-       virtual boost::unique_future<std::wstring>                                      call(const std::wstring& str) override                                                                                  {return (*producer_)->call(str);}\r
-       virtual spl::shared_ptr<frame_producer>                                         get_following_producer() const override                                                                                 {return (*producer_)->get_following_producer();}\r
-       virtual void                                                                                            set_leading_producer(const spl::shared_ptr<frame_producer>& producer) override  {return (*producer_)->set_leading_producer(producer);}\r
-       virtual uint32_t                                                                                        nb_frames() const override                                                                                                              {return (*producer_)->nb_frames();}\r
 };\r
 \r
-class print_producer_proxy : public frame_producer\r
+class print_producer_proxy : public producer_proxy_base\r
 {      \r
-       std::shared_ptr<frame_producer> producer_;\r
 public:\r
        print_producer_proxy(spl::shared_ptr<frame_producer>&& producer) \r
-               : producer_(std::move(producer))\r
+               : producer_proxy_base(std::move(producer))\r
        {\r
                CASPAR_LOG(info) << producer_->print() << L" Initialized.";\r
        }\r
@@ -135,52 +175,6 @@ public:
                producer_.reset();\r
                CASPAR_LOG(info) << str << L" Uninitialized.";\r
        }\r
-       \r
-\r
-       virtual spl::shared_ptr<draw_frame>                                                     receive(int hints) override                                                                                                             {return producer_->receive(hints);}\r
-       virtual spl::shared_ptr<draw_frame>                                                     last_frame() const override                                                                                                             {return producer_->last_frame();}\r
-       virtual std::wstring                                                                            print() const override                                                                                                                  {return producer_->print();}\r
-       virtual boost::property_tree::wptree                                            info() const override                                                                                                                   {return producer_->info();}\r
-       virtual boost::unique_future<std::wstring>                                      call(const std::wstring& str) override                                                                                  {return producer_->call(str);}\r
-       virtual spl::shared_ptr<frame_producer>                                         get_following_producer() const override                                                                                 {return producer_->get_following_producer();}\r
-       virtual void                                                                                            set_leading_producer(const spl::shared_ptr<frame_producer>& producer) override  {return producer_->set_leading_producer(producer);}\r
-       virtual uint32_t                                                                                        nb_frames() const override                                                                                                              {return producer_->nb_frames();}\r
-};\r
-\r
-class follow_producer_proxy : public frame_producer\r
-{      \r
-       spl::shared_ptr<frame_producer> producer_;\r
-public:\r
-       follow_producer_proxy(spl::shared_ptr<frame_producer>&& producer) \r
-               : producer_(std::move(producer))\r
-       {\r
-       }\r
-\r
-       virtual spl::shared_ptr<draw_frame>     receive(int hints) override                                                                                                             \r
-       {\r
-               auto frame = producer_->receive(hints);\r
-               if(frame == draw_frame::eof())\r
-               {\r
-                       CASPAR_LOG(info) << producer_->print() << " End Of File.";\r
-                       auto following = producer_->get_following_producer();\r
-                       if(following != frame_producer::empty())\r
-                       {\r
-                               following->set_leading_producer(producer_);\r
-                               producer_ = std::move(following);\r
-                       }\r
-\r
-                       return receive(hints);\r
-               }\r
-               return frame;\r
-       }\r
-\r
-       virtual spl::shared_ptr<draw_frame>                                                     last_frame() const override                                                                                                             {return producer_->last_frame();}\r
-       virtual std::wstring                                                                            print() const override                                                                                                                  {return producer_->print();}\r
-       virtual boost::property_tree::wptree                                            info() const override                                                                                                                   {return producer_->info();}\r
-       virtual boost::unique_future<std::wstring>                                      call(const std::wstring& str) override                                                                                  {return producer_->call(str);}\r
-       virtual spl::shared_ptr<frame_producer>                                         get_following_producer() const override                                                                                 {return producer_->get_following_producer();}\r
-       virtual void                                                                                            set_leading_producer(const spl::shared_ptr<frame_producer>& producer) override  {return producer_->set_leading_producer(producer);}\r
-       virtual uint32_t                                                                                        nb_frames() const override                                                                                                              {return producer_->nb_frames();}\r
 };\r
 \r
 spl::shared_ptr<core::frame_producer> wrap_producer(spl::shared_ptr<core::frame_producer> producer)\r

diff --git a/core/producer/layer.cpp b/core/producer/layer.cpp
index ef901b0bd5ebb37cdf5fa6e9eb2b1eecc967d55b..e22a1211fc896404dac406bd89669abb93b871dc 100644 (file)
--- a/core/producer/layer.cpp
+++ b/core/producer/layer.cpp
@@ -101,7 +101,7 @@ public:
                \r
                        auto frame = foreground_->receive(flags.value());\r
                        if(frame == core::draw_frame::late())\r
-                               return draw_frame::mute(foreground_->last_frame());\r
+                               return foreground_->last_frame();\r
                        \r
                        ++frame_number_;\r
 \r