2.0. ffmpeg_producer: Increased max_buffer_count to allow faster detection of accurat...

[casparcg] / modules / ffmpeg / producer / input.cpp

diff --git a/modules/ffmpeg/producer/input.cpp b/modules/ffmpeg/producer/input.cpp
index e6f1534081e6bfb36ae7bee00f045898a9b80de6..44d549fb2ecfedc8818ef593645b939de6dbd3ad 100644 (file)
--- a/modules/ffmpeg/producer/input.cpp
+++ b/modules/ffmpeg/producer/input.cpp
@@ -57,8 +57,9 @@ extern "C"
 \r
 namespace caspar {\r
 \r
-static const size_t MAX_BUFFER_COUNT = 128;\r
-static const size_t MAX_BUFFER_SIZE  = 16 * 1000000;\r
+static const size_t MAX_BUFFER_COUNT = 50;\r
+static const size_t MIN_BUFFER_COUNT = 4;\r
+static const size_t MAX_BUFFER_SIZE  = 32 * 1000000;\r
        \r
 struct input::implementation : boost::noncopyable\r
 {              \r
@@ -114,9 +115,9 @@ public:
                for(int n = 0; n < 16 && !full(); ++n)\r
                        read_next_packet();\r
                                                \r
-               graph_->set_color("seek", diagnostics::color(0.5f, 1.0f, 0.5f));        \r
-               graph_->set_color("buffer-count", diagnostics::color(0.2f, 0.8f, 1.0f));\r
-               graph_->set_color("buffer-size", diagnostics::color(0.2f, 0.4f, 1.0f)); \r
+               graph_->set_color("seek", diagnostics::color(1.0f, 0.5f, 0.0f));        \r
+               graph_->set_color("buffer-count", diagnostics::color(0.4f, 0.8f, 0.8f));\r
+               graph_->set_color("buffer-size", diagnostics::color(0.2f, 0.4f, 0.8f)); \r
 \r
                thread_ = boost::thread([this]{run();});\r
        }\r
@@ -139,8 +140,8 @@ public:
                        buffer_cond_.notify_all();\r
                }\r
 \r
-               graph_->update_value("buffer-size", MAX_BUFFER_SIZE/static_cast<double>(buffer_size_));\r
-               graph_->update_value("buffer-count", MAX_BUFFER_COUNT/static_cast<double>(buffer_.size()));\r
+               graph_->update_value("buffer-size", (static_cast<double>(buffer_size_)+0.001)/MAX_BUFFER_SIZE);\r
+               graph_->update_value("buffer-count", (static_cast<double>(buffer_.size()+0.001)/MAX_BUFFER_COUNT));\r
 \r
                return result;\r
        }\r
@@ -169,7 +170,8 @@ private:
                        {\r
                                {\r
                                        boost::unique_lock<boost::mutex> lock(buffer_mutex_);\r
-                                       buffer_cond_.wait(lock, [this]{return !full();});\r
+                                       while(full())\r
+                                               buffer_cond_.timed_wait(lock, boost::posix_time::millisec(20));\r
                                }\r
                                read_next_packet();                     \r
                        }\r
@@ -249,14 +251,14 @@ private:
                        buffer_.try_push(read_packet);\r
                        buffer_size_ += read_packet->size;\r
                                \r
-                       graph_->update_value("buffer-count", MAX_BUFFER_COUNT/static_cast<double>(buffer_.size()));\r
-                       graph_->update_value("buffer-size", MAX_BUFFER_SIZE/static_cast<double>(buffer_size_));\r
+                       graph_->update_value("buffer-size", (static_cast<double>(buffer_size_)+0.001)/MAX_BUFFER_SIZE);\r
+                       graph_->update_value("buffer-count", (static_cast<double>(buffer_.size()+0.001)/MAX_BUFFER_COUNT));\r
                }                       \r
        }\r
 \r
        bool full() const\r
        {\r
-               return is_running_ && (buffer_size_ > MAX_BUFFER_SIZE || buffer_.size() > MAX_BUFFER_COUNT);\r
+               return is_running_ && (buffer_size_ > MAX_BUFFER_SIZE || buffer_.size() > MAX_BUFFER_COUNT) && buffer_.size() > MIN_BUFFER_COUNT;\r
        }\r
 \r
        void seek_frame(int64_t frame, int flags = 0)\r