2.1.0: Fixed audio-sync.

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

diff --git a/modules/decklink/consumer/decklink_consumer.cpp b/modules/decklink/consumer/decklink_consumer.cpp
index cd706ad8719addd6b0b9c81dbf70e5eb0f8f3830..f3241e3cdc33bd3fe03a1e263d5617e3f58415c4 100644 (file)
--- a/modules/decklink/consumer/decklink_consumer.cpp
+++ b/modules/decklink/consumer/decklink_consumer.cpp
@@ -50,13 +50,12 @@ namespace caspar { namespace decklink {
        \r
 struct configuration\r
 {\r
-       int     device_index;\r
+       int             device_index;\r
        bool    embedded_audio;\r
        bool    internal_key;\r
        bool    low_latency;\r
        bool    key_only;\r
-       int     base_buffer_depth;\r
-       int     buffer_depth;\r
+       int             base_buffer_depth;\r
        \r
        configuration()\r
                : device_index(1)\r
@@ -65,7 +64,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
+       int 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
@@ -195,7 +200,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
@@ -526,7 +531,7 @@ public:
 \r
        virtual int buffer_depth() const override\r
        {\r
-               return config_.buffer_depth;\r
+               return config_.buffer_depth();\r
        }\r
 \r
        virtual int index() const override\r

diff --git a/modules/oal/consumer/oal_consumer.cpp b/modules/oal/consumer/oal_consumer.cpp
index 86b62bd704cdbb72159747ae71439db77d664910..85c11816956b6c422237f977b591e8b841a81aa0 100644 (file)
--- a/modules/oal/consumer/oal_consumer.cpp
+++ b/modules/oal/consumer/oal_consumer.cpp
@@ -25,6 +25,7 @@
 #include <common/diagnostics/graph.h>\r
 #include <common/log.h>\r
 #include <common/utf.h>\r
+#include <common/env.h>\r
 \r
 #include <core/consumer/frame_consumer.h>\r
 #include <core/mixer/audio/audio_util.h>\r
@@ -116,7 +117,7 @@ public:
        \r
        virtual int buffer_depth() const override\r
        {\r
-               return 6;\r
+               return 3;\r
        }\r
 \r
        // oal_consumer\r