git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/core/producer/separated/separated_producer.cpp b/core/producer/separated/separated_producer.cpp
index 1703ec11ef6a5e2438e2b7e2979435b89ca86a86..28e68ece9582e41bb9644e38448502b8943b75a1 100644 (file)
--- a/core/producer/separated/separated_producer.cpp
+++ b/core/producer/separated/separated_producer.cpp
@@ -107,6 +107,12 @@ public:
                return L"separated[fill:" + fill_producer_->print() + L"|key[" + key_producer_->print() + L"]]";\r
        }       \r
 \r
+       virtual boost::unique_future<std::wstring> call(const std::wstring& str) override\r
+       {\r
+               key_producer_->call(str);\r
+               return fill_producer_->call(str);\r
+       }\r
+\r
        virtual std::wstring name() const override\r
        {\r
                return L"separated";\r

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.cpp b/modules/ffmpeg/producer/audio/audio_decoder.cpp
index 619ca4705b7bf9acfc5b6887f90c467584200f0d..62b1df6cd2426272cb5b00398fec2529000a10c7 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.cpp
+++ b/modules/ffmpeg/producer/audio/audio_decoder.cpp
@@ -141,7 +141,7 @@ public:
 \r
        bool ready() const\r
        {\r
-               return packets_.size() > 10;\r
+               return !packets_.empty();\r
        }\r
 \r
        uint32_t nb_frames() const\r

diff --git a/modules/ffmpeg/producer/input/input.cpp b/modules/ffmpeg/producer/input/input.cpp
index 0d5f94faa9f1822762acbdbc308c1887f4e4c8a6..5d52bba6691610321beba7a88a950a4f54ed5152 100644 (file)
--- a/modules/ffmpeg/producer/input/input.cpp
+++ b/modules/ffmpeg/producer/input/input.cpp
@@ -57,8 +57,8 @@ extern "C"
 #endif\r
 \r
 static const size_t MAX_BUFFER_COUNT = 100;\r
-static const size_t MIN_BUFFER_COUNT = 4;\r
-static const size_t MAX_BUFFER_SIZE  = 16 * 1000000;\r
+static const size_t MIN_BUFFER_COUNT = 32;\r
+static const size_t MAX_BUFFER_SIZE  = 32 * 1000000;\r
 \r
 namespace caspar { namespace ffmpeg {\r
                \r

diff --git a/modules/ffmpeg/producer/video/video_decoder.cpp b/modules/ffmpeg/producer/video/video_decoder.cpp
index c7d2b773002760317d5906a2ea9e0da1d06feae1..ea2f896a16015b6433ff09872eef6c40d4876ada 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.cpp
+++ b/modules/ffmpeg/producer/video/video_decoder.cpp
@@ -143,7 +143,7 @@ public:
        \r
        bool ready() const\r
        {\r
-               return packets_.size() >= 8;\r
+               return !packets_.empty();\r
        }\r
 \r
        uint32_t nb_frames() const\r