From 61ed04f7ddb471b10c05b26b77516bd4880b6474 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Thu, 11 Oct 2012 22:42:36 +0200
Subject: splitted video/audio encoder to several worker

---
 src/test.json | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/test.json')

diff --git a/src/test.json b/src/test.json
index abe35f8..57d413d 100644
--- a/src/test.json
+++ b/src/test.json
@@ -27,9 +27,10 @@
         "vp8": { "720p25": 2048, "480p25": 1024, "360p25": 600 }
       },
      "machines": {
-       "titan": [ "input", "encoder-vorbis", "encoder-aac", "muxer-flv", "muxer-webm", "muxer-ogg", "streamer-local1" ],
-       "calypso": [ "encoder-h264" ],
-       "telesto": [ "encoder-vp8" ],
+       "titan": [ "input", "encoder-vorbis-160", "encoder-vorbis-96", "encoder-aac-160", "encoder-aac-96",
+                  "muxer-flv", "muxer-webm", "muxer-ogg", "streamer-local1" ],
+       "calypso": [ "encoder-h264-720p25", "encoder-h264-480p25", "encoder-h264-360p25" ],
+       "telesto": [ "encoder-vp8-720p25", "encoder-vp8-480p25", "encoder-vp8-360p25" ],
        "elevate1": [ "streamer-pub1" ],
        "elevate2": [ "streamer-pub2" ],
        "elevate3": [ "streamer-pub3" ]
@@ -38,7 +39,11 @@
   "input": {
      "source": "decklink",
      "resolution": "720p25",
-     "samplerate": 48000
+     "samplerate": 48000,
+     "device": 0,
+     "connection": 0,
+     "audio-input": 0,
+     "mode": 16
    },
   "transcode": {
      "flash": [ "high", "medium", "low" ],
-- 
cgit v1.2.3