summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2012-10-16 17:34:40 +0200
committerChristian Pointner <equinox@spreadspace.org>2012-10-16 17:34:40 +0200
commitf4aeb1940c336d03252657677f3f812fce5f9463 (patch)
treec03576786ca7d27826021de4cbd690267c2c5c65 /src
parentadded help text to flufigut manage script (diff)
small fix for audio only stream
Diffstat (limited to 'src')
-rw-r--r--src/audio.json46
-rwxr-xr-xsrc/flufigut.py13
2 files changed, 53 insertions, 6 deletions
diff --git a/src/audio.json b/src/audio.json
new file mode 100644
index 0000000..1d6e15c
--- /dev/null
+++ b/src/audio.json
@@ -0,0 +1,46 @@
+{
+ "globals":{
+ "version": "0.10.0",
+ "name": "audio-only",
+ "description": "Audio only test",
+ "domain": "spreadspace.org",
+ "rrd-dir": "/var/lib/flumotion/rrd",
+ "manager": {
+ "machine": "calypso",
+ "host": "89.106.215.48",
+ "port": 7531,
+ "transport": "ssl"
+ },
+ "formats": {
+ "ogg": { "muxer": "ogg", "audio": "vorbis" }
+ },
+ "profiles": {
+ "high": { "audio": 160 },
+ "medium": { "audio": 128 },
+ "low": { "audio": 96 }
+ },
+ "machines": {
+ "calypso": [ "input", "encoder-vorbis-160", "encoder-vorbis-128", "encoder-vorbis-96",
+ "muxer-ogg-high", "muxer-ogg-medium", "muxer-ogg-low", "streamer-local1" ]
+ }
+ },
+ "input": {
+ "source": "decklink",
+ "samplerate": 48000,
+ "device": 0,
+ "connection": 0,
+ "audio-input": 0,
+ "mode": 16
+ },
+ "transcode": {
+ "ogg": [ "high", "medium", "low" ]
+ },
+ "stream": {
+ "streamer-local": {
+ "formats": [ "ogg" ],
+ "type": "http", "count": 1, "port": 8000,
+ "max-con": 5, "burst-on-connect": 5,
+ "hostname": "audio"
+ }
+ }
+}
diff --git a/src/flufigut.py b/src/flufigut.py
index b1e04af..1c0e538 100755
--- a/src/flufigut.py
+++ b/src/flufigut.py
@@ -105,12 +105,13 @@ for format in transcode.keys():
if input['samplerate'] != samplerate:
samplerates.append(samplerate)
for profile in transcode[format]:
- resolution = globals['profiles'][profile]['video']
- if resolution not in resolutions:
- if input['resolution'] != resolution:
- if globals['resolutions'][resolution]['rate'] != globals['resolutions'][input['resolution']]['rate']:
- raise SystemExit("ERROR: video rate conversion is not yet supported!!!")
- resolutions.append(resolution)
+ if 'video' in globals['profiles'][profile]:
+ resolution = globals['profiles'][profile]['video']
+ if resolution not in resolutions:
+ if input['resolution'] != resolution:
+ if globals['resolutions'][resolution]['rate'] != globals['resolutions'][input['resolution']]['rate']:
+ raise SystemExit("ERROR: video rate conversion is not yet supported!!!")
+ resolutions.append(resolution)
for resolution in resolutions:
if 'resize' not in worker: