From 93197101b9ead9e5dab49161cf52fee32cbb81a3 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Tue, 16 Oct 2012 22:28:52 +0200
Subject: fixed/updated config for multi source

---
 src/test.json  | 11 ++++++-----
 src/test2.json | 25 +++++++++++++++++--------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/test.json b/src/test.json
index 172e0cf..58e3aac 100644
--- a/src/test.json
+++ b/src/test.json
@@ -19,7 +19,7 @@
      "formats": {
         "flash": { "muxer": "flv", "video": "h264", "audio": "aac", "samplerate": 44100 },
         "webm": { "muxer": "webm", "video": "vp8", "audio": "vorbis" },
-        "ogg-audio": { "muxer": "ogg", "audio": "vorbis" }
+        "ogg": { "muxer": "ogg", "video": "theora", "audio": "vorbis" }
       },
      "profiles": {
         "high": { "video": "720p25", "audio": 160 },
@@ -31,9 +31,10 @@
         "vp8": { "720p25": 2048, "480p25": 1024, "360p25": 600 }
       },
      "machines": {
-       "titan": [ "input", "resample", "resize", "encoder-vorbis-160", "encoder-vorbis-96", "encoder-aac-160", "encoder-aac-96",
+       "titan": [ "input", "resample", "resize", "encoder-vorbis-160", "encoder-vorbis-128",
+                  "encoder-vorbis-96", "encoder-aac-160", "encoder-aac-128", "encoder-aac-96",
                   "muxer-flash-high", "muxer-flash-medium", "muxer-flash-low", "muxer-webm-high",
-                  "muxer-webm-medium", "muxer-webm-low", "muxer-ogg-audio-high", "streamer-local1" ],
+                  "muxer-webm-medium", "muxer-webm-low", "muxer-ogg-high", "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" ],
@@ -58,11 +59,11 @@
   "transcode": {
      "flash": [ "high", "medium", "low" ],
      "webm": [ "high", "medium", "low" ],
-     "ogg-audio": [ "high" ]
+     "ogg": [ "high" ]
    },
   "stream": {
     "streamer-local": {
-       "formats": [ "flash", "webm", "ogg-audio" ],
+       "formats": [ "flash", "webm", "ogg" ],
        "type": "http", "count": 1, "port": 8000,
        "max-con": 5, "burst-on-connect": 5,
        "hostname": "elevate-feed"
diff --git a/src/test2.json b/src/test2.json
index a930069..f3bd642 100644
--- a/src/test2.json
+++ b/src/test2.json
@@ -19,7 +19,7 @@
      "formats": {
         "flash": { "muxer": "flv", "video": "h264", "audio": "aac", "samplerate": 44100 },
         "webm": { "muxer": "webm", "video": "vp8", "audio": "vorbis" },
-        "ogg-audio": { "muxer": "ogg", "audio": "vorbis" }
+        "ogg": { "muxer": "ogg", "video": "theora", "audio": "vorbis" }
       },
      "profiles": {
         "high": { "video": "720p25", "audio": 160 },
@@ -28,11 +28,11 @@
       },
      "bitrates": {
         "h264": { "720p25": 2048, "480p25": 1024, "360p25": 600 },
-        "vp8": { "720p25": 2048, "480p25": 1024, "360p25": 600 }
+        "vp8": { "720p25": 2048, "480p25": 1024, "360p25": 600 },
       },
      "machines": {
-       "calypso": [ "input", "resample", "resize", "encoder-vorbis-160", "encoder-aac-160", "encoder-aac-96",
-                  "muxer-flash-high", "muxer-flash-medium", "muxer-flash-low", "muxer-ogg-audio-high", "streamer-local1" ],
+       "calypso": [ "input", "resample", "resize", "encoder-vorbis-160", "encoder-aac-160", "encoder-aac-128", "encoder-aac-96",
+                  "muxer-flash-high", "muxer-flash-medium", "muxer-flash-low", "muxer-ogg-high", "streamer-local1" ],
        "telesto": [ "encoder-h264-720p25", "encoder-h264-480p25", "encoder-h264-360p25" ]
      }
    },
@@ -47,16 +47,25 @@
          "connection": 0,
          "audio-input": 0,
          "mode": 16
-       }
-     }
+        }
+      },
+     "alsa": {
+       "type": "ao",
+       "source": "soundcard",
+       "properties": {
+         "samplerate": 48000,
+         "depth": 16,
+         "channels": 2
+        }
+      }
    },
   "transcode": {
      "flash": [ "high", "medium", "low" ],
-     "ogg-audio": [ "high" ]
+     "ogg": [ "high" ]
    },
   "stream": {
     "streamer-local": {
-       "formats": [ "flash", "ogg-audio" ],
+       "formats": [ "flash", "ogg" ],
        "type": "http", "count": 1, "port": 8000,
        "max-con": 5, "burst-on-connect": 5,
        "hostname": "elevate-feed"
-- 
cgit v1.2.3