summaryrefslogtreecommitdiff
path: root/src/test2.json
diff options
context:
space:
mode:
Diffstat (limited to 'src/test2.json')
-rw-r--r--src/test2.json22
1 files changed, 13 insertions, 9 deletions
diff --git a/src/test2.json b/src/test2.json
index 310232d..1069187 100644
--- a/src/test2.json
+++ b/src/test2.json
@@ -31,14 +31,18 @@
"vp8": { "720p25": 2048, "480p25": 1024, "360p25": 600 }
},
"machines": {
- "calypso": [ "input-sdi-av", "resize-sdi-av", "resample-sdi-av", "input-alsa", "resample-alsa",
- "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" ]
+ "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-audio-ogg-high", "muxer-audio-en-ogg-high", "streamer-local1" ],
+ "telesto": [ "encoder-sdi-h264-720p25", "encoder-sdi-h264-480p25", "encoder-sdi-h264-360p25" ]
}
},
"input": {
- "sdi-av": {
+ "sdi": {
"type": "decklink",
"master": true,
"properties": {
@@ -62,21 +66,21 @@
},
"mux": {
"av-orig": {
- "video": "sdi-av:video",
- "audio": "sdi-av:audio",
+ "video": "sdi:video",
+ "audio": "sdi:audio",
"formats": {
"flash": [ "high", "medium", "low" ]
}
},
"av-en": {
- "video": "sdi-av:video",
+ "video": "sdi:video",
"audio": "alsa",
"formats": {
"flash": [ "high", "medium", "low" ]
}
},
"audio": {
- "audio": "sdi-av:audio",
+ "audio": "sdi:audio",
"formats": {
"ogg": [ "high" ]
}