diff options
Diffstat (limited to 'src/flufigut.py')
| -rwxr-xr-x | src/flufigut.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/flufigut.py b/src/flufigut.py index cfffeaa..88e49c4 100755 --- a/src/flufigut.py +++ b/src/flufigut.py @@ -124,7 +124,7 @@ for mux_name in mux.keys(): flow['input']['resample-%s-%s' % (source, samplerate)] = { 'type': 'audio-resample', 'desc': "resample audio from %s to %s Hz" % (source, samplerate), - 'worker': 'resample', + 'worker': worker_name, 'feeder': feeder, 'properties': { 'samplerate': samplerate, @@ -151,7 +151,7 @@ for mux_name in mux.keys(): flow['input']['resize-%s-%s' % (source, resolution)] = { 'type': 'video-resize', 'desc': "resize video from %s to %sx%s" % (source, globals['resolutions'][resolution]['width'], globals['resolutions'][resolution]['height']), - 'worker': 'resize', + 'worker': worker_name, 'feeder': feeder, 'properties': { 'width': globals['resolutions'][resolution]['width'], @@ -182,7 +182,7 @@ for mux_name in mux.keys(): if samplerate != input_samplerate: feeder = 'resample-%s-%s' % (source, samplerate) else: - feeder = mux[mux_name]['audio'] + feeder = 'input-%s' % (mux[mux_name]['audio']) audio_encoder = 'encode-%s-%s-%i-%i' % (source, encoder, bitrate, samplerate) if audio_encoder not in flow['encoder_audio']: worker_name = 'encoder-%s-%s-%s' % (source, encoder, bitrate) @@ -210,7 +210,7 @@ for mux_name in mux.keys(): if resolution != input_resolution: feeder = 'resize-%s-%s' % (source, resolution) else: - feeder = mux[mux_name]['video'] + feeder = 'input-%s' % (mux[mux_name]['video']) video_encoder = 'encode-%s-%s-%s' % (source, encoder, resolution) if video_encoder not in flow['encoder_video'].keys(): worker_name = 'encoder-%s-%s-%s' % (source, encoder, resolution) @@ -301,7 +301,7 @@ for cluster in stream.keys(): hostname = "%s.%s" % (stream[cluster]['hostname'], globals['domain']) flow['streamer'][name] = { 'type': "%s-stream" % stream[cluster]['type'], - 'desc': "%s streamer for %s-%s (part %i of %s cluster)" % (stream[cluster]['type'], format, profile, idx+1, cluster), + 'desc': "%s streamer for %s %s-%s (part %i of %s cluster)" % (stream[cluster]['type'], mux_name, format, profile, idx+1, cluster), 'worker': stream_worker, 'feeder': feeder, 'rrd_clients' : "%s/%s_clients.rrd" % (globals['rrd-dir'], name), |