diff options
author | Christian Pointner <equinox@spreadspace.org> | 2012-10-02 01:25:39 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2012-10-02 01:25:39 +0200 |
commit | e648e65f1cbc93c4453c3f19f96e12e502b4ec4a (patch) | |
tree | f7045e1564d073e1042b955e564f8c6edf13a04d /src/test.json | |
parent | refactoring, redoing streamer representation (diff) |
redesign of streamer definition
Diffstat (limited to 'src/test.json')
-rw-r--r-- | src/test.json | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/test.json b/src/test.json index 0a2c7c9..d03845e 100644 --- a/src/test.json +++ b/src/test.json @@ -25,12 +25,12 @@ "vp8": { "720p25": 2048, "480p25": 1024, "360p25": 600 } }, "machines": { - "titan": [ "input", "encoder-vorbis", "encoder-aac", "muxer-flv", "muxer-webm", "muxer-ogg", "streamer0" ], + "titan": [ "input", "encoder-vorbis", "encoder-aac", "muxer-flv", "muxer-webm", "muxer-ogg", "streamer-local1" ], "calypso": [ "encoder-h264" ], "telesto": [ "encoder-vp8" ], - "elevate1": [ "streamer1" ], - "elevate2": [ "streamer2" ], - "elevate3": [ "streamer3" ] + "elevate1": [ "streamer-pub1" ], + "elevate2": [ "streamer-pub2" ], + "elevate3": [ "streamer-pub3" ] } }, "input": { @@ -43,18 +43,14 @@ "webm": [ "high", "medium", "low" ], "ogg-audio": [ "high" ] }, - "stream": [ - { "flash": [ "high", "medium", "low" ], "webm": [ "high", "medium", "low" ], "ogg-audio": [ "high" ], - "config": { "port": 8000, "max-con": 5 } + "stream": { + "streamer-local": { + "formats": [ "flash", "webm", "ogg-audio" ], + "type": "http", "count": 1, "port": 8000, "max-con": 5 }, - { "flash": [ "high", "medium", "low" ], "webm": [ "high", "medium", "low" ], - "config": { "port": 8000, "max-bw": 290000, "next": 2 } - }, - { "flash": [ "high", "medium", "low" ], "webm": [ "high", "medium", "low" ], - "config": { "port": 8000, "max-bw": 290000, "next": 3 } - }, - { "flash": [ "high", "medium", "low" ], "webm": [ "high", "medium", "low" ], - "config": { "port": 8000, "max-bw": 290000, "next": 1 } + "streamer-pub": { + "formats": [ "flash", "webm" ], + "type": "http", "count": 3, "port": 8000, "max-bw": 290000 } - ] + } } |