2.0. layer: Fixed potential arethmetic overflows.

[casparcg] / core / producer / layer.cpp

diff --git a/core/producer/layer.cpp b/core/producer/layer.cpp
index 9ba6acaa5360094278f057d4cb138de55702c89f..f940d2a9eb6bda491fa0253bc9b376dcbc47fa50 100644 (file)
--- a/core/producer/layer.cpp
+++ b/core/producer/layer.cpp
@@ -31,16 +31,19 @@ struct layer::implementation
 {                              \r
        safe_ptr<frame_producer>        foreground_;\r
        safe_ptr<frame_producer>        background_;\r
-       bool                                            is_paused_;\r
-       int                                                     auto_play_delta_;\r
        int64_t                                         frame_number_;\r
+       int                                                     auto_play_delta_;\r
+       bool                                            is_paused_;\r
+\r
 public:\r
        implementation() \r
                : foreground_(frame_producer::empty())\r
                , background_(frame_producer::empty())\r
-               , is_paused_(false)\r
+               , frame_number_(0)\r
                , auto_play_delta_(-1)\r
-               , frame_number_(0){}\r
+               , is_paused_(false)\r
+       {\r
+       }\r
        \r
        void pause()\r
        {\r
@@ -70,18 +73,24 @@ public:
                if(background_ != frame_producer::empty())\r
                {\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
+                       foreground_                     = background_;\r
+                       background_                     = frame_producer::empty();\r
+                       frame_number_           = 0;\r
+                       auto_play_delta_        = -1;   \r
                }\r
-               resume();\r
+\r
+               is_paused_                      = false;\r
        }\r
        \r
        void stop()\r
        {\r
-               foreground_ = frame_producer::empty();\r
-               frame_number_ = 0;\r
+               foreground_                     = frame_producer::empty();\r
+               background_                     = background_;\r
+               frame_number_           = 0;\r
+               auto_play_delta_        = -1;\r
+\r
+               is_paused_                      = true;\r
        }\r
                \r
        safe_ptr<basic_frame> receive()\r
@@ -89,25 +98,17 @@ public:
                try\r
                {\r
                        if(is_paused_)\r
-                               return foreground_->last_frame();\r
+                               return disable_audio(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(frames_left <= 0 || frame == core::basic_frame::eof())\r
-                               {\r
-                                       //CASPAR_ASSERT(frame != core::basic_frame::eof() && "Received early EOF. Media duration metadata incorrect.");\r
 \r
-                                       CASPAR_LOG(info) << L"Automatically playing next clip with " << auto_play_delta_ << " frames offset. Frames left: " << frames_left;\r
-                               \r
-                                       play();\r
-                                       frame = receive();\r
-                               }\r
+                       auto frames_left = foreground_->nb_frames() - (++frame_number_) - auto_play_delta_;\r
+                       if(auto_play_delta_ > -1 && frames_left < 1)\r
+                       {\r
+                               play();\r
+                               return receive();\r
                        }\r
                                \r
                        return frame;\r
@@ -120,6 +121,18 @@ public:
                }\r
        }\r
 \r
+       layer_status status() const\r
+       {\r
+               layer_status status;\r
+               status.foreground        = foreground_->print();\r
+               status.background        = background_->print();\r
+               status.is_paused         = is_paused_;\r
+               status.total_frames      = foreground_->nb_frames();\r
+               status.current_frame = frame_number_;\r
+\r
+               return status;\r
+       }\r
+\r
        bool empty() const\r
        {\r
                return background_ == core::frame_producer::empty() && foreground_ == core::frame_producer::empty();\r
@@ -148,6 +161,9 @@ void layer::load(const safe_ptr<frame_producer>& frame_producer, bool preview, i
 void layer::play(){impl_->play();}\r
 void layer::pause(){impl_->pause();}\r
 void layer::stop(){impl_->stop();}\r
+bool layer::is_paused() const{return impl_->is_paused_;}\r
+int64_t layer::frame_number() const{return impl_->frame_number_;}\r
+layer_status layer::status() const {return impl_->status();}\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