]> git.sesse.net Git - casparcg/commitdiff
decklink_consumer: Fixed buffer-depth.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Fri, 13 Jan 2012 23:41:54 +0000 (23:41 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Fri, 13 Jan 2012 23:41:54 +0000 (23:41 +0000)
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@2123 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

modules/decklink/consumer/decklink_consumer.cpp

index 4914a3c7fd6cc14e64e3f3e2473ed0db80430cb6..b952c8828b5b01d9aa9d5a107ba8b1e95273604c 100644 (file)
@@ -55,7 +55,6 @@ struct configuration
        bool    low_latency;\r
        bool    key_only;\r
        size_t  base_buffer_depth;\r
-       size_t  buffer_depth;\r
        \r
        configuration()\r
                : device_index(1)\r
@@ -64,7 +63,13 @@ struct configuration
                , low_latency(true)\r
                , key_only(false)\r
                , base_buffer_depth(3)\r
-               , buffer_depth(base_buffer_depth + (low_latency ? 0 : 1) + (embedded_audio ? 1 : 0)){}\r
+       {\r
+       }\r
+       \r
+       size_t buffer_depth() const\r
+       {\r
+               return base_buffer_depth + (low_latency ? 0 : 1) + (embedded_audio ? 1 : 0);\r
+       }\r
 };\r
 \r
 class decklink_frame : public IDeckLinkVideoFrame\r
@@ -194,7 +199,7 @@ public:
                , keyer_(decklink_)\r
                , model_name_(get_model_name(decklink_))\r
                , format_desc_(format_desc)\r
-               , buffer_size_(config.buffer_depth) // Minimum buffer-size 3.\r
+               , buffer_size_(config.buffer_depth()) // Minimum buffer-size 3.\r
                , video_scheduled_(0)\r
                , audio_scheduled_(0)\r
                , preroll_count_(0)\r
@@ -509,7 +514,7 @@ public:
 \r
        virtual size_t buffer_depth() const override\r
        {\r
-               return config_.buffer_depth;\r
+               return config_.buffer_depth();\r
        }\r
 \r
        virtual int index() const override\r