use yaml for elavate2018 example

2 files changed, 104 insertions, 124 deletions

diff --git a/src/examples/elevate2018.json b/src/examples/elevate2018.json
deleted file mode 100644
index 412fcac..0000000
--- a/src/examples/elevate2018.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-  "globals":{
-     "templates": "default",
-     "version": "0.10.1",
-     "name": "elevate-live",
-     "description": "Live from Elevate Festival 2018",
-     "manager": {
-        "machine": "dione",
-        "host": "109.73.158.69",
-        "port": 8642,
-        "transport": "tcp"
-      },
-     "admin": {
-        "username": "equinox",
-        "password": "change-me"
-      },
-     "resolutions": {
-        "720p25": { "width": 1280, "height": 720, "rate": "25/1" },
-        "480p25": { "width":  854, "height": 480, "rate": "25/1" },
-        "360p25": { "width":  640, "height": 360, "rate": "25/1" },
-        "240p25": { "width":  426, "height": 240, "rate": "25/1" }
-      },
-     "formats": {
-        "flash": { "muxer": "flv", "video": "h264", "audio": "aac", "samplerate": 44100 },
-        "webm": { "muxer": "webm", "video": "vp8", "audio": "vorbis" },
-        "ogg": { "muxer": "ogg", "video": "theora", "audio": "vorbis" },
-        "mp3": { "muxer": "mp3", "video": "null", "audio": "mp3" },
-        "rec": { "muxer": "mkv", "video": "mjpeg", "audio": "raw" }
-      },
-     "profiles": {
-        "high": { "video": "720p25", "audio": 160 },
-        "medium": { "video": "480p25", "audio": 128 },
-        "low": { "video": "360p25", "audio": 96 },
-        "mini": { "video": "240p25", "audio": 64 },
-        "full": { "video": "720p25", "audio": 0 }
-      },
-     "bitrates": {
-        "h264": { "720p25": 1800, "480p25": 1000, "360p25": 600, "240p25": 300 },
-        "vp8": { "720p25": 1800, "480p25": 1000, "360p25": 600, "240p25": 300 },
-        "mjpeg": { "720p25": 95 }
-      },
-     "workers": {
-       "dione": [ "input-*", "resize-*", "resample-*", "encode-*" ],
-       "helene": [ "encode-sdi-orig-vp8-*", "encode-sdi-orig-h264-360p25", "mux-*", "port-local1*", "http-local1*", "record-*" ],
-       "emc-00": [ "repeater-public*" ],
-       "emc-01": [ "port-public1*", "http-public1*" ],
-       "emc-02": [ "port-public2*", "http-public2*" ],
-       "emc-03": [ "port-public3*", "http-public3*" ],
-       "emc-04": [ "port-public4*", "http-public4*" ]
-     }
-   },
-  "inputs": {
-     "sdi-orig": {
-       "type": "decklink",
-       "master": true,
-       "properties": {
-         "resolution": "720p25",
-         "samplerate": 48000,
-         "device": 0,
-         "connection": 0,
-         "audio-input": 0,
-         "mode": 10
-       }
-     }
-   },
-  "muxes": {
-     "av-orig": {
-        "video": "sdi-orig:video",
-        "audio": "sdi-orig:audio",
-        "formats": {
-          "flash": [ "high", "medium", "low", "mini" ],
-          "webm": [ "high", "medium", "low", "mini" ]
-        }
-      },
-     "avr": {
-        "video": "sdi-orig:video",
-        "audio": "sdi-orig:audio",
-        "formats": {
-          "rec": [ "full" ]
-        }
-      },
-     "audio-orig": {
-        "audio": "sdi-orig:audio",
-        "formats": {
-          "ogg": [ "high", "medium", "low", "mini" ],
-          "mp3": [ "high", "medium", "low", "mini" ]
-        }
-      }
-   },
-  "streams": {
-    "local": {
-       "muxes": [ "av-orig", "audio-orig" ],
-       "type": "http", "count": 1,
-       "port": 8000,
-       "max-con": 100, "burst-on-connect": 5,
-       "hostname": "elevate-feed.spreadspace.org",
-     },
-    "public": {
-       "muxes": [ "av-orig", "audio-orig" ],
-       "type": "http", "count": 4,
-       "port": 8000, "interface": "localhost",
-       "max-bw": 290000000, "burst-on-connect": 5,
-       "hostname": "elevate-live%i.spreadspace.org", "repeater": True,
-     }
-   },
-  "records": {
-    "av": {
-       "muxes": {
-           "avr": { "format": "rec", "profile": "full" }
-        },
-       "directory": "/srv/elevate2017/",
-       "filename": "av-orig %Y-%m-%d %H-%M-%S"
-     },
-    "audio": {
-       "muxes": {
-           "audio-orig": { "format": "ogg", "profile": "high" }
-        },
-       "directory": "/srv/elevate2017/",
-       "filename": "audio-orig %Y-%m-%d %H-%M-%S"
-     }
-
-   }
-
-}
diff --git a/src/examples/elevate2018.yml b/src/examples/elevate2018.yml
new file mode 100644
index 0000000..2363411
--- /dev/null
+++ b/src/examples/elevate2018.yml
@@ -0,0 +1,104 @@
+globals:
+  templates: default
+  version: 0.10.1
+  name: elevate-live
+  description: "Live from Elevate Festival 2018"
+  manager:
+    machine: dione
+    host: 109.73.158.69
+    port: 8642
+    transport: tcp
+  admin:
+    username: equinox
+    password: change-me
+  resolutions:
+    720p25: { width: 1280, height: 720, rate: 25/1 }
+    480p25: { width:  854, height: 480, rate: 25/1 }
+    360p25: { width:  640, height: 360, rate: 25/1 }
+    240p25: { width:  426, height: 240, rate: 25/1 }
+  formats:
+    flash: { muxer: flv, video: h264, audio: aac, samplerate: 44100 }
+    webm: { muxer: webm, video: vp8, audio: vorbis }
+    ogg: { muxer: ogg, video: theora, audio: vorbis }
+    mp3: { muxer: mp3, video: null, audio: mp3 }
+    rec: { muxer: mkv, video: mjpeg, audio: raw }
+  profiles:
+    high: { video: 720p25, audio: 160 }
+    medium: { video: 480p25, audio: 128 }
+    low: { video: 360p25, audio: 96 }
+    mini: { video: 240p25, audio: 64 }
+    full: { video: 720p25, audio: 0 }
+  bitrates:
+    h264: { 720p25: 1800, 480p25: 1000, 360p25: 600, 240p25: 300 }
+    vp8: { 720p25: 1800, 480p25: 1000, 360p25: 600, 240p25: 300 }
+    mjpeg: { 720p25: 95 }
+  workers:
+    dione: [ "input-*", "resize-*", "resample-*", "encode-*" ]
+    helene: [ "encode-sdi-orig-vp8-*", "encode-sdi-orig-h264-360p25", "mux-*", "port-local1*", "http-local1*", "record-*" ]
+    emc-00: [ "repeater-public*" ]
+    emc-01: [ "port-public1*", "http-public1*" ]
+    emc-02: [ "port-public2*", "http-public2*" ]
+    emc-03: [ "port-public3*", "http-public3*" ]
+    emc-04: [ "port-public4*", "http-public4*" ]
+inputs:
+  sdi-orig:
+    type: decklink
+    master: true,
+    properties:
+      resolution: 720p25
+      samplerate: 48000
+      device: 0
+      connection: 0
+      audio-input: 0
+      mode: 10
+muxes:
+  av-orig:
+    video: sdi-orig:video
+    audio: sdi-orig:audio
+    formats:
+      flash: [ high, medium, low, mini ]
+      webm: [ high, medium, low, mini ]
+  avr:
+    video: sdi-orig:video
+    audio: sdi-orig:audio
+    formats:
+      rec: [ full ]
+  audio-orig:
+    audio: sdi-orig:audio
+    formats:
+      ogg: [ high, medium, low, mini ]
+      mp3: [ high, medium, low, mini ]
+streams:
+  local:
+     muxes: [ av-orig, audio-orig ]
+     type: http
+     count: 1
+     port: 8000
+     max-con: 100
+     burst-on-connect: 5
+     hostname: elevate-feed.spreadspace.org
+  public:
+     muxes: [ av-orig, audio-orig ]
+     type: http
+     count: 4
+     port: 8000
+     interface: localhost
+     max-bw: 290000000
+     burst-on-connect: 5
+     hostname: "elevate-live%i.spreadspace.org"
+     repeater: True
+records:
+  av:
+    muxes:
+      avr:
+        format: rec
+        profile: full
+    directory: /srv/elevate2017/
+    filename: "av-orig %Y-%m-%d %H-%M-%S"
+  audio:
+    muxes:
+      audio-orig:
+        format: ogg
+        profile: high
+    directory: /srv/elevate2017/
+    filename: "audio-orig %Y-%m-%d %H-%M-%S"