summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorequinox <equinox@88d0365b-309c-4eec-8061-d8e0c04ad69e>2012-09-27 00:22:19 +0000
committerequinox <equinox@88d0365b-309c-4eec-8061-d8e0c04ad69e>2012-09-27 00:22:19 +0000
commitbf0483a711cf86ef4c95562632205c734c438f1a (patch)
tree9f3d16afbad0bb9b63e6c0f5473d9487debae69b
parentcleanup (diff)
json format first proposal
git-svn-id: https://svn.spreadspace.org/flufigut/trunk@7 88d0365b-309c-4eec-8061-d8e0c04ad69e
-rw-r--r--TODO3
-rw-r--r--src/test.json79
2 files changed, 58 insertions, 24 deletions
diff --git a/TODO b/TODO
index efbd359..7a3bf1a 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,4 @@
-create output dir
implement sanity checks for json data
+generate internal representation of structure from json
+create output dir
add worker templates
diff --git a/src/test.json b/src/test.json
index a498523..eba2d36 100644
--- a/src/test.json
+++ b/src/test.json
@@ -1,31 +1,64 @@
{
"globals":{
- "name": "test",
+ "name": "emc",
"passwdfile": "/etc/flumotion/passwd",
"manager": "titan",
- "version": "0.10.0"
+ "version": "0.10.0",
+ "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" }
+ },
+ "formats": {
+ "flash": { "muxer": "flv", "video": "h264", "audio": "aac" },
+ "webm": { "muxer": "webm", "video": "vp8", "audio": "vorbis" },
+ "ogg-audio": { "muxer": "ogg", "audio": "vorbis" }
+ },
+ "profiles": {
+ "high": { "video": "720p25", "audio": 160 },
+ "medium": { "video": "480p25", "audio": 160 },
+ "low": { "video": "360p25", "audio": 96 }
+ },
+ "machines": {
+ "titan": [ "input", "muxer", "encoder-vorbis", "encoder-aac", "streamer0" ],
+ "calypso": [ "encoder-h264" ],
+ "telesto": [ "encoder-vp8" ],
+ "elevate1": [ "streamer1" ],
+ "elevate2": [ "streamer2" ],
+ "elevate3": [ "streamer3" ]
+ }
},
- "machines": {
- "titan": [ "input", "muxer", "encoder-voribs", "encoder-aac" ],
- "calypso": [ "encoder-h264" ],
- "telesto": [ "encoder-vp8" ]
+ "input": {
+ "source": "decklink",
+ "resolution": "720p25"
},
- "atmosphere": {
- "myporter": {
- "worker": "localhost",
- "type": "porter",
- "desc": "hello world",
- "parameter": {
- }
- }
+ "encoder": {
+ "video": {
+ "h264": [ "720p25", "480p25", "360p25" ],
+ "vp8": [ "720p25", "480p25", "360p25" ]
+ },
+ "audio": {
+ "aac": [ 160, 96 ],
+ "vorbis": [ 160, 96 ]
+ }
},
- "flow": {
- "rawinput": {
- "worker": "input",
- "type": "firewireav",
- "desc": "da kommst rein",
- "parameter": {
- }
- }
- }
+ "muxer": {
+ "flash": [ "high", "medium", "low" ],
+ "webm": [ "high", "medium", "low" ],
+ "ogg-audio": [ "high" ]
+ },
+ "streamer": [
+ { "flash": [ "high", "medium", "low" ], "webm": [ "high", "medium", "low" ], "ogg-audio": [ "high" ],
+ "config": { "max-con": 5 }
+ },
+ { "flash": [ "high", "medium", "low" ], "webm": [ "high", "medium", "low" ],
+ "config": { "max-bw": 290000, "next": 2 }
+ },
+ { "flash": [ "high", "medium", "low" ], "webm": [ "high", "medium", "low" ],
+ "config": { "max-bw": 290000, "next": 3 }
+ },
+ { "flash": [ "high", "medium", "low" ], "webm": [ "high", "medium", "low" ],
+ "config": { "max-bw": 290000, "next": 1 }
+ }
+ ]
}