2.0. Header file optimizations and fixes.

[casparcg] / core / producer / layer.cpp

diff --git a/core/producer/layer.cpp b/core/producer/layer.cpp
index 066180ffe6a80c90bc54d2a06abadcf9b8f04c9f..ca5ce5e7b4aee60ca3100c0d4ffe970ea691a9f9 100644 (file)
--- a/core/producer/layer.cpp
+++ b/core/producer/layer.cpp
@@ -21,10 +21,9 @@
 #include "../stdafx.h"\r
 \r
 #include "layer.h"\r
-#include "frame_producer.h"\r
 \r
-#include "../producer/frame/basic_frame.h"\r
-#include "../producer/frame/audio_transform.h"\r
+#include "frame_producer.h"\r
+#include "frame/basic_frame.h"\r
 \r
 namespace caspar { namespace core {\r
        \r
@@ -32,29 +31,40 @@ struct layer::implementation
 {                              \r
        safe_ptr<frame_producer>        foreground_;\r
        safe_ptr<frame_producer>        background_;\r
-       safe_ptr<basic_frame>           last_frame_;\r
        bool                                            is_paused_;\r
+       int                                                     auto_play_delta_;\r
+       int64_t                                         frame_number_;\r
 public:\r
        implementation() \r
                : foreground_(frame_producer::empty())\r
                , background_(frame_producer::empty())\r
-               , last_frame_(basic_frame::empty())\r
-               , is_paused_(false){}\r
+               , is_paused_(false)\r
+               , auto_play_delta_(-1){}\r
        \r
        void pause(){is_paused_ = true;}\r
        void resume(){is_paused_ = false;}\r
 \r
-       void load(const safe_ptr<frame_producer>& producer, bool preview)\r
+       void load(const safe_ptr<frame_producer>& producer, bool preview, int auto_play_delta)\r
        {               \r
-               background_ = producer;\r
+               background_     = producer;\r
 \r
-               if(preview) \r
+               if(auto_play_delta > -1)\r
                {\r
-                       // Play the first frame and pause.\r
+                       if(producer->nb_frames() > 0)\r
+                               auto_play_delta_ = auto_play_delta;\r
+                       else\r
+                               CASPAR_LOG(warning) << producer->print() << L" Does not support auto-play.";\r
+               }\r
+\r
+               if(preview) // Play the first frame and pause.\r
+               {                       \r
                        play();\r
                        receive();\r
                        pause();\r
                }\r
+\r
+               if(auto_play_delta >= 0 && foreground_ == frame_producer::empty())\r
+                       play();\r
        }\r
        \r
        void play()\r
@@ -63,6 +73,8 @@ public:
                {\r
                        background_->set_leading_producer(foreground_);\r
                        foreground_ = background_;\r
+                       frame_number_ = 0;\r
+                       auto_play_delta_ = -1;\r
                        background_ = frame_producer::empty();\r
                }\r
                resume();\r
@@ -70,24 +82,51 @@ public:
        \r
        void stop()\r
        {\r
-               pause();\r
-               last_frame_ = basic_frame::empty();\r
                foreground_ = frame_producer::empty();\r
        }\r
                \r
        safe_ptr<basic_frame> receive()\r
        {               \r
                if(is_paused_)\r
-                       return last_frame_;\r
+                       return foreground_->last_frame();\r
+               \r
+               const auto frames_left = foreground_->nb_frames() - (++frame_number_) - auto_play_delta_;\r
+\r
+               auto frame = receive_and_follow(foreground_, frame_producer::NO_HINT);\r
+               if(frame == core::basic_frame::late())\r
+                       return foreground_->last_frame();\r
+               \r
+               if(auto_play_delta_ == 0)\r
+               {\r
+                       if(frame == core::basic_frame::eof())\r
+                       {\r
+                               CASPAR_ASSERT(frames_left == 0);\r
 \r
-               auto next_frame = receive_and_follow(foreground_);\r
-               if(next_frame == core::basic_frame::late())\r
-                       return last_frame_;\r
+                               CASPAR_LOG(info) << L"Automatically playing next clip with " << auto_play_delta_ << " frames offset.";\r
                                \r
-               last_frame_ = basic_frame(next_frame);\r
-               last_frame_->get_audio_transform().set_has_audio(false);\r
+                               play();\r
+                               frame = receive();\r
+                       }\r
+               }\r
+               else if(auto_play_delta_ > 0)\r
+               {\r
+                       if(frames_left <= 0 || frame == core::basic_frame::eof())\r
+                       {\r
+                               CASPAR_VERIFY(frame != core::basic_frame::eof() && "Received early EOF. Media duration metadata incorrect.");\r
 \r
-               return next_frame;\r
+                               CASPAR_LOG(info) << L"Automatically playing next clip with " << auto_play_delta_ << " frames offset.";\r
+                               \r
+                               play();\r
+                               frame = receive();\r
+                       }\r
+               }\r
+                               \r
+               return frame;\r
+       }\r
+\r
+       bool empty() const\r
+       {\r
+               return background_ == core::frame_producer::empty() && foreground_ == core::frame_producer::empty();\r
        }\r
 };\r
 \r
@@ -109,11 +148,12 @@ void layer::swap(layer& other)
 {      \r
        impl_.swap(other.impl_);\r
 }\r
-void layer::load(const safe_ptr<frame_producer>& frame_producer, bool preview){return impl_->load(frame_producer, preview);}   \r
+void layer::load(const safe_ptr<frame_producer>& frame_producer, bool preview, int auto_play_delta){return impl_->load(frame_producer, preview, auto_play_delta);}     \r
 void layer::play(){impl_->play();}\r
 void layer::pause(){impl_->pause();}\r
 void layer::stop(){impl_->stop();}\r
 safe_ptr<basic_frame> layer::receive() {return impl_->receive();}\r
 safe_ptr<frame_producer> layer::foreground() const { return impl_->foreground_;}\r
 safe_ptr<frame_producer> layer::background() const { return impl_->background_;}\r
+bool layer::empty() const {return impl_->empty();}\r
 }}
\ No newline at end of file