diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2012-10-11 22:42:36 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2012-10-11 22:42:36 +0200 |
| commit | 61ed04f7ddb471b10c05b26b77516bd4880b6474 (patch) | |
| tree | 29cffac2411230aaf5eea3c60bdd8245a07800ed | |
| parent | streamer seem to work now (diff) | |
splitted video/audio encoder to several worker
| -rwxr-xr-x | src/flufigut.py | 4 | ||||
| -rw-r--r-- | src/test.json | 13 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/flufigut.py b/src/flufigut.py index 635b48c..83c4e84 100755 --- a/src/flufigut.py +++ b/src/flufigut.py @@ -145,7 +145,7 @@ for format in transcode.keys(): flow['encoder_video'][video_encoder] = { 'type': '%s-encode' % encoder, 'desc': "%s encoder for %sx%s" % (encoder, globals['resolutions'][resolution]['width'], globals['resolutions'][resolution]['height']), - 'worker': 'encoder-%s' % encoder, + 'worker': 'encoder-%s-%s' % (encoder, resolution), 'feeder': feeder, 'properties': { 'bitrate': bitrate, @@ -167,7 +167,7 @@ for format in transcode.keys(): flow['encoder_audio'][audio_encoder] = { 'type': '%s-encode' % encoder, 'desc': "%s encoder for %i kbit/s @ %i Hz" % (encoder, bitrate, samplerate), - 'worker': 'encoder-%s' % encoder, + 'worker': 'encoder-%s-%s' % (encoder, bitrate), 'feeder': feeder, 'properties': { 'bitrate': bitrate, diff --git a/src/test.json b/src/test.json index abe35f8..57d413d 100644 --- a/src/test.json +++ b/src/test.json @@ -27,9 +27,10 @@ "vp8": { "720p25": 2048, "480p25": 1024, "360p25": 600 } }, "machines": { - "titan": [ "input", "encoder-vorbis", "encoder-aac", "muxer-flv", "muxer-webm", "muxer-ogg", "streamer-local1" ], - "calypso": [ "encoder-h264" ], - "telesto": [ "encoder-vp8" ], + "titan": [ "input", "encoder-vorbis-160", "encoder-vorbis-96", "encoder-aac-160", "encoder-aac-96", + "muxer-flv", "muxer-webm", "muxer-ogg", "streamer-local1" ], + "calypso": [ "encoder-h264-720p25", "encoder-h264-480p25", "encoder-h264-360p25" ], + "telesto": [ "encoder-vp8-720p25", "encoder-vp8-480p25", "encoder-vp8-360p25" ], "elevate1": [ "streamer-pub1" ], "elevate2": [ "streamer-pub2" ], "elevate3": [ "streamer-pub3" ] @@ -38,7 +39,11 @@ "input": { "source": "decklink", "resolution": "720p25", - "samplerate": 48000 + "samplerate": 48000, + "device": 0, + "connection": 0, + "audio-input": 0, + "mode": 16 }, "transcode": { "flash": [ "high", "medium", "low" ], |