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

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.cpp b/modules/ffmpeg/producer/audio/audio_decoder.cpp
index a1ff3e4ae6f31cc889248962d606af2bbfc317b6..8932b6531038a104ff7ef05fbf4ea8b0988872d1 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.cpp
+++ b/modules/ffmpeg/producer/audio/audio_decoder.cpp
@@ -137,6 +137,7 @@ public:
                                        semaphore_->acquire();\r
 \r
                                        send(target_, audio);\r
+                                       Concurrency::wait(2);\r
                                }\r
                        }\r
                }\r

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index 3648e2863008e94b7e9ad540c49d63da074db0ed..c7e77cac183028ace8284b080c63551793325748 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -148,7 +148,7 @@ public:
                \r
                try\r
                {               \r
-                       frame = last_frame_ = Concurrency::receive(frames_, 10);\r
+                       frame = last_frame_ = Concurrency::receive(frames_, 5);\r
                        graph_->update_text(narrow(print()));\r
                }\r
                catch(operation_timed_out&)\r

diff --git a/modules/ffmpeg/producer/input.cpp b/modules/ffmpeg/producer/input.cpp
index 30e491e5ca77cebc35fabbd398d2e06a6f243634..4bf5f00efd6e90c86bc731146443a3937ba61fb2 100644 (file)
--- a/modules/ffmpeg/producer/input.cpp
+++ b/modules/ffmpeg/producer/input.cpp
@@ -132,7 +132,7 @@ public:
                                        break;\r
 \r
                                Concurrency::asend(target_, make_safe_ptr(packet));\r
-                               Concurrency::wait(1);\r
+                               Concurrency::wait(2);\r
                        }\r
                }\r
                catch(...)\r

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index b01e10f6e3926c176744491a38054c4c235d90d2..a2f915e27745c1ee532c20210a3511a713834964 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -361,7 +361,7 @@ public:
 \r
                try\r
                {\r
-                       frame = Concurrency::receive(frames_, 10);\r
+                       frame = Concurrency::receive(frames_, 5);\r
                }\r
                catch(operation_timed_out&)\r
                {                       \r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 49a79802b92ab0e89823cc759599276381e73c1d..7d7186cac057f46150f5b675e8d6173d41ed7997 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -9,16 +9,16 @@
   <diagnostics>\r
     <graphs>true</graphs>\r
   </diagnostics>\r
+  <consumers>\r
+    <buffer-depth>3</buffer-depth>\r
+  </consumers>\r
   <mixers>\r
     <blend-modes>false</blend-modes>\r
   </mixers>\r
   <producers>\r
+    <buffer-depth>1</buffer-depth>\r
     <auto-transcode>true</auto-transcode>\r
     <template-hosts>\r
-      <template-host>\r
-        <video-mode>PAL</video-mode>\r
-        <filename>cg.fth.18.pal</filename>\r
-      </template-host>\r
       <template-host>\r
         <video-mode>1080i5994</video-mode>\r
         <filename>cg.fth.18.6000</filename>\r
@@ -29,28 +29,19 @@
         <width>1280</width>\r
         <height>720</height>\r
       </template-host>\r
-      <template-host>\r
-        <video-mode>1080i5000</video-mode>\r
-        <filename>cg.fth.18</filename>\r
-        <width>1280</width>\r
-        <height>720</height>\r
-      </template-host>\r
     </template-hosts>\r
-    </producers>\r
-    <channels>\r
-      <channel>\r
-        <video-mode>1080p5000</video-mode>\r
-        <consumers>\r
-          <decklink>\r
-            <device>1</device>\r
-            <embedded-audio>true</embedded-audio>\r
-          </decklink>\r
-          <screen>\r
-            <device>1</device>\r
-          </screen>\r
-        </consumers>\r
-      </channel>\r
-    </channels>\r
+  </producers>\r
+  <channels>\r
+    <channel>\r
+      <video-mode>1080p5000</video-mode>\r
+      <consumers>\r
+        <decklink>\r
+          <device>1</device>\r
+          <embedded-audio>true</embedded-audio>\r
+        </decklink>\r
+      </consumers>\r
+    </channel>\r
+  </channels>\r
   <controllers>\r
     <tcp>\r
       <port>5250</port>\r
@@ -110,6 +101,6 @@
       </screen>\r
     </consumers>\r
 </channel>  \r
--->  \r
-  \r
+-->\r
+\r
 \r