From a23795773ab7769cf84bfa6da3c1ee045139d2cf Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 25 Jan 2018 23:17:26 +0100 Subject: generating inputs works now --- src/examples/audio.json | 6 +++--- src/examples/avminimal.json | 6 +++--- src/examples/elevate2013.json | 8 ++++---- src/examples/lac2013.json | 12 ++++++------ src/examples/test.json | 6 +++--- src/examples/test2.json | 6 +++--- 6 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src/examples') diff --git a/src/examples/audio.json b/src/examples/audio.json index a173fae..68baeb9 100644 --- a/src/examples/audio.json +++ b/src/examples/audio.json @@ -25,7 +25,7 @@ "muxer-audio-ogg-high", "muxer-audio-ogg-medium", "muxer-audio-ogg-low", "streamer-local1" ] } }, - "input": { + "inputs": { "alsa": { "type": "soundcard", "master": true, @@ -36,7 +36,7 @@ } } }, - "mux": { + "muxes": { "audio": { "audio": "alsa", "formats": { @@ -44,7 +44,7 @@ } } }, - "stream": { + "streams": { "streamer-local": { "muxes": [ "audio" ], "type": "http", "count": 1, "port": 8000, diff --git a/src/examples/avminimal.json b/src/examples/avminimal.json index b6c6da5..cef0ef6 100644 --- a/src/examples/avminimal.json +++ b/src/examples/avminimal.json @@ -28,7 +28,7 @@ "localhost": [ "input-video", "input-audio", "encoder-video-vp8-360p25", "encoder-audio-vorbis-96", "muxer-av-webm-low", "streamer-local1" ] } }, - "input": { + "inputs": { "audio": { "type": "audiotest", "master": true, @@ -44,7 +44,7 @@ } } }, - "mux": { + "muxes": { "av": { "video": "video", "audio": "audio", @@ -53,7 +53,7 @@ } } }, - "stream": { + "streams": { "streamer-local": { "muxes": [ "av" ], "type": "http", "count": 1, "port": 8000, diff --git a/src/examples/elevate2013.json b/src/examples/elevate2013.json index 487033a..1dedbd1 100644 --- a/src/examples/elevate2013.json +++ b/src/examples/elevate2013.json @@ -66,7 +66,7 @@ "elevate2": [ "streamer-pub2" ] } }, - "input": { + "inputs": { "sdi": { "type": "decklink", "master": true, @@ -92,7 +92,7 @@ } } }, - "mux": { + "muxes": { "av-orig": { "video": "sdi:video", "audio": "sdi:audio", @@ -131,7 +131,7 @@ } } }, - "stream": { + "streams": { "streamer-local": { "muxes": [ "av-orig", "av-en", "audio-orig", "audio-en" ], "type": "http", "count": 1, "port": 8000, @@ -145,7 +145,7 @@ "hostname": "elevate-live%i", "repeater": "repeater-pub" } }, - "record": { + "records": { "av": { "muxes": { "avr": { "format": "rec", "profile": "full" } diff --git a/src/examples/lac2013.json b/src/examples/lac2013.json index 45bc8fe..f686b6e 100644 --- a/src/examples/lac2013.json +++ b/src/examples/lac2013.json @@ -55,7 +55,7 @@ "elevate0": [ "streamer-pub2" ] } }, - "input": { + "inputs": { "sdi": { "type": "decklink", "master": true, @@ -69,7 +69,7 @@ } } }, - "mux": { + "muxes": { "av": { "video": "sdi:video", "audio": "sdi:audio", @@ -92,7 +92,7 @@ } } }, - "stream": { + "streams": { "streamer-local": { "muxes": [ "av", "audio" ], "type": "http", "count": 1, "port": 8000, @@ -106,10 +106,10 @@ "hostname": "lac-live%i", "repeater": "repeater-pub" } }, - "record": { + "records": { "av": { - "muxes": { - "avr": { "format": "rec", "profile": "full" } + "muxes": { + "avr": { "format": "rec", "profile": "full" } }, "directory": "/srv/lac2013/", "filename": "%Y-%m-%d %H-%M-%S" diff --git a/src/examples/test.json b/src/examples/test.json index 9f2d189..5a5d5b0 100644 --- a/src/examples/test.json +++ b/src/examples/test.json @@ -43,7 +43,7 @@ "streamer3": [ "streamer-pub3" ] } }, - "input": { + "inputs": { "sdi": { "type": "decklink", "master": true, @@ -57,7 +57,7 @@ } } }, - "mux": { + "muxes": { "av": { "video": "sdi:video", "audio": "sdi:audio", @@ -73,7 +73,7 @@ } } }, - "stream": { + "streams": { "streamer-local": { "muxes": [ "av", "audio" ], "type": "http", "count": 1, "port": 8000, diff --git a/src/examples/test2.json b/src/examples/test2.json index cb66d4d..6dc42f0 100644 --- a/src/examples/test2.json +++ b/src/examples/test2.json @@ -42,7 +42,7 @@ "telesto": [ "encoder-sdi-h264-720p25", "encoder-sdi-h264-480p25", "encoder-sdi-h264-360p25" ] } }, - "input": { + "inputs": { "sdi": { "type": "decklink", "master": true, @@ -65,7 +65,7 @@ } } }, - "mux": { + "muxes": { "av-orig": { "video": "sdi:video", "audio": "sdi:audio", @@ -93,7 +93,7 @@ } } }, - "stream": { + "streams": { "streamer-local": { "muxes": [ "av-orig", "av-en", "audio", "audio-en" ], "type": "http", "count": 1, "port": 8000, -- cgit v1.2.3