diff options
author | Christian Pointner <equinox@spreadspace.org> | 2012-10-16 23:10:01 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2012-10-16 23:10:01 +0200 |
commit | 3e56ff11b32829edcf81b4e51eaa76cdfafa69ae (patch) | |
tree | e93b90c258ec76ad57782f7e5e72692e088be7f2 /src/test2.json | |
parent | fixed/updated config for multi source (diff) |
first part of multi source support
Diffstat (limited to 'src/test2.json')
-rw-r--r-- | src/test2.json | 44 |
1 files changed, 34 insertions, 10 deletions
diff --git a/src/test2.json b/src/test2.json index f3bd642..5e78dc9 100644 --- a/src/test2.json +++ b/src/test2.json @@ -28,18 +28,18 @@ }, "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-128", "encoder-aac-96", + "calypso": [ "input-sdi-av", "input-alsa", "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" ] } }, "input": { "sdi-av": { - "type": "av", - "source": "decklink", + "type": "decklink", + "master": true, "properties": { "resolution": "720p25", "samplerate": 48000, @@ -50,8 +50,8 @@ } }, "alsa": { - "type": "ao", - "source": "soundcard", + "type": "soundcard", + "master": false, "properties": { "samplerate": 48000, "depth": 16, @@ -59,13 +59,37 @@ } } }, - "transcode": { - "flash": [ "high", "medium", "low" ], - "ogg": [ "high" ] + "mux": { + "av-orig": { + "video": "sdi-av:video", + "audio": "sdi-av:audio", + "formats": { + "flash": [ "high", "medium", "low" ] + } + }, + "av-en": { + "video": "sdi-av:video", + "audio": "alsa", + "formats": { + "flash": [ "high", "medium", "low" ] + } + }, + "audio": { + "audio": "sdi-av:audio", + "formats": { + "ogg": [ "high" ] + } + }, + "audio-en": { + "audio": "alsa", + "formats": { + "ogg": [ "high" ] + } + } }, "stream": { "streamer-local": { - "formats": [ "flash", "ogg" ], + "muxes": [ "av-orig", "av-en", "audio", "audio-en" ], "type": "http", "count": 1, "port": 8000, "max-con": 5, "burst-on-connect": 5, "hostname": "elevate-feed" |