From 80ae6d9411035e35a650d06eab23b140a8309816 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 25 Jan 2018 22:28:46 +0100 Subject: started a complete rewrite --- src/examples/audio.json | 2 +- src/examples/avminimal.json | 2 +- src/examples/elevate2013.json | 2 +- src/examples/lac2013.json | 2 +- src/examples/test.json | 2 +- src/examples/test2.json | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/examples') diff --git a/src/examples/audio.json b/src/examples/audio.json index cdaa734..a173fae 100644 --- a/src/examples/audio.json +++ b/src/examples/audio.json @@ -20,7 +20,7 @@ "medium": { "audio": 128 }, "low": { "audio": 96 } }, - "machines": { + "workers": { "calypso": [ "input-alsa", "encoder-alsa-vorbis-160", "encoder-alsa-vorbis-128", "encoder-alsa-vorbis-96", "muxer-audio-ogg-high", "muxer-audio-ogg-medium", "muxer-audio-ogg-low", "streamer-local1" ] } diff --git a/src/examples/avminimal.json b/src/examples/avminimal.json index a3e8f76..b6c6da5 100644 --- a/src/examples/avminimal.json +++ b/src/examples/avminimal.json @@ -24,7 +24,7 @@ "bitrates": { "vp8": { "720p25": 2048, "480p25": 1024, "360p25": 600 } }, - "machines": { + "workers": { "localhost": [ "input-video", "input-audio", "encoder-video-vp8-360p25", "encoder-audio-vorbis-96", "muxer-av-webm-low", "streamer-local1" ] } }, diff --git a/src/examples/elevate2013.json b/src/examples/elevate2013.json index 607b209..487033a 100644 --- a/src/examples/elevate2013.json +++ b/src/examples/elevate2013.json @@ -41,7 +41,7 @@ "vp8": { "720p25": 1800, "480p25": 1000, "360p25": 600, "240p25": 300 }, "mjpeg": { "720p25": 95 } }, - "machines": { + "workers": { "telesto": [ "input-sdi", "resize-sdi", "resample-sdi", "input-sdi-en", "resample-sdi-en", "encoder-sdi-vorbis-160", "encoder-sdi-vorbis-128", "encoder-sdi-vorbis-96", "encoder-sdi-vorbis-64", "encoder-sdi-en-vorbis-160", "encoder-sdi-en-vorbis-128", "encoder-sdi-en-vorbis-96", "encoder-sdi-en-vorbis-64", diff --git a/src/examples/lac2013.json b/src/examples/lac2013.json index 65fe19a..45bc8fe 100644 --- a/src/examples/lac2013.json +++ b/src/examples/lac2013.json @@ -40,7 +40,7 @@ "vp8": { "720p25": 1800, "480p25": 1000, "360p25": 600, "240p25": 300 }, "mjpeg": { "720p25": 95 } }, - "machines": { + "workers": { "calypso": [ "input-sdi", "resize-sdi", "resample-sdi", "encoder-sdi-vorbis-160", "encoder-sdi-vorbis-128", "encoder-sdi-vorbis-96", "encoder-sdi-vorbis-64", "encoder-sdi-aac-160", "encoder-sdi-aac-128", "encoder-sdi-aac-96", "encoder-sdi-aac-64", diff --git a/src/examples/test.json b/src/examples/test.json index ea3faa3..9f2d189 100644 --- a/src/examples/test.json +++ b/src/examples/test.json @@ -31,7 +31,7 @@ "h264": { "720p25": 2048, "480p25": 1024, "360p25": 600 }, "vp8": { "720p25": 2048, "480p25": 1024, "360p25": 600 } }, - "machines": { + "workers": { "titan": [ "input-sdi", "resample-sdi", "resize-sdi", "encoder-sdi-vorbis-160", "encoder-sdi-vorbis-128", "encoder-sdi-vorbis-96", "encoder-sdi-aac-160", "encoder-sdi-aac-128", "encoder-sdi-aac-96", "muxer-av-flash-high", "muxer-av-flash-medium", "muxer-av-flash-low", "muxer-av-webm-high", diff --git a/src/examples/test2.json b/src/examples/test2.json index 31739b3..cb66d4d 100644 --- a/src/examples/test2.json +++ b/src/examples/test2.json @@ -31,13 +31,13 @@ "h264": { "720p25": 2048, "480p25": 1024, "360p25": 600 }, "vp8": { "720p25": 2048, "480p25": 1024, "360p25": 600 } }, - "machines": { + "workers": { "calypso": [ "input-sdi", "resize-sdi", "resample-sdi", "input-alsa", "resample-alsa", "encoder-alsa-vorbis-160", "encoder-sdi-vorbis-160", "encoder-alsa-aac-160", "encoder-alsa-aac-128", "encoder-alsa-aac-96", "encoder-sdi-aac-160", "encoder-sdi-aac-128", "encoder-sdi-aac-96", - "muxer-av-orig-flash-high", "muxer-av-orig-flash-medium", "muxer-av-orig-flash-low", - "muxer-av-en-flash-high", "muxer-av-en-flash-medium", "muxer-av-en-flash-low", + "muxer-av-orig-flash-high", "muxer-av-orig-flash-medium", "muxer-av-orig-flash-low", + "muxer-av-en-flash-high", "muxer-av-en-flash-medium", "muxer-av-en-flash-low", "muxer-audio-ogg-high", "muxer-audio-en-ogg-high", "streamer-local1" ], "telesto": [ "encoder-sdi-h264-720p25", "encoder-sdi-h264-480p25", "encoder-sdi-h264-360p25" ] } -- cgit v1.2.3