diff options
Diffstat (limited to 'src/flufigut.py')
-rwxr-xr-x | src/flufigut.py | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/src/flufigut.py b/src/flufigut.py index 7901e9a..94166d0 100755 --- a/src/flufigut.py +++ b/src/flufigut.py @@ -103,9 +103,10 @@ class Planet: master_cnt = 0 for source, input in inputs.items(): comp_name = 'input-%s' % source + comp_desc = 'capture raw data from %s' % (source) self.flow['inputs'][comp_name] = { 'type': input['type'], - 'desc': "capture raw data from %s" % (source), + 'desc': comp_desc, 'worker': None, 'master': input['master'], 'properties': {}, @@ -115,9 +116,9 @@ class Planet: self.__set_input_properties(comp_name, input['properties'], globals) if master_cnt == 0: - raise exception("You have not configured any master clock device!") + raise Exception("You have not configured any master clock device!") elif master_cnt > 1: - raise exception("You have configured multiple master clock devices!") + raise Exception("You have configured multiple master clock devices!") # # muxes @@ -131,11 +132,12 @@ class Planet: if target_samplerate == input_samplerate: return - comp_name = 'resample-%s-%s' % (source, target_samplerate) feeder = 'input-%s' % (mux['audio']) + comp_name = 'resample-%s-%s' % (source, target_samplerate) + comp_desc = 'resample audio from % s to % s Hz' % (source, target_samplerate) self.flow['inputs'][comp_name] = { 'type': 'audio-resample', - 'desc': "resample audio from %s to %s Hz" % (source, target_samplerate), + 'desc': comp_desc, 'worker': None, 'feeder': feeder, 'properties': { @@ -150,21 +152,22 @@ class Planet: return if input_resolution == "": - raise exception("format definition needs video but no video input given") + raise Exception("format definition needs video but no video input given") target_resolution = globals['profiles'][profile]['video'] if target_resolution == input_resolution: return if globals['resolutions'][target_resolution]['rate'] != globals['resolutions'][input_resolution]['rate']: - raise exception("ERROR: video rate conversion is not yet supported!!!") + raise Exception("ERROR: video rate conversion is not yet supported!!!") - comp_name = 'resize-%s-%s' % (source, target_resolution) feeder = 'input-%s' % (mux['video']) + comp_name = 'resize-%s-%s' % (source, target_resolution) + comp_desc = 'resize video from %s to %sx%s' % (source, globals['resolutions'][target_resolution]['width'], + globals['resolutions'][target_resolution]['height']), self.flow['inputs'][comp_name] = { 'type': 'video-resize', - 'desc': "resize video from %s to %sx%s" % (source, globals['resolutions'][target_resolution]['width'], - globals['resolutions'][target_resolution]['height']), + 'desc': comp_desc, 'worker': None, 'feeder': feeder, 'properties': { @@ -189,12 +192,17 @@ class Planet: feeder = 'resample-%s-%s' % (source, target_samplerate) comp_name = 'encode-%s-%s-%i-%i' % (source, encoder, bitrate, target_samplerate) + comp_desc = '%s encoder for %i kbit/s @ %i Hz, from %s' % (encoder, bitrate, target_samplerate, source), + if bitrate == 0: + comp_name = 'encode-%s-%s-%i' % (source, encoder, target_samplerate) + comp_desc = '%s encoder @ %i Hz, from %s' % (encoder, target_samplerate, source), + if comp_name in self.flow['encoders_audio']: return comp_name self.flow['encoders_audio'][comp_name] = { 'type': '%s-encode' % encoder, - 'desc': "%s encoder for %i kbit/s @ %i Hz, from %s" % (encoder, bitrate, target_samplerate, source), + 'desc': comp_desc, 'worker': None, 'feeder': feeder, 'properties': { @@ -216,13 +224,15 @@ class Planet: feeder = 'resize-%s-%s' % (source, target_resolution) comp_name = 'encode-%s-%s-%s' % (source, encoder, target_resolution) + comp_desc = '%s encoder for %sx%s, from %s' % (encoder, globals['resolutions'][target_resolution]['width'], + globals['resolutions'][target_resolution]['height'], source), + if comp_name in self.flow['encoders_video']: return comp_name self.flow['encoders_video'][comp_name] = { 'type': '%s-encode' % encoder, - 'desc': "%s encoder for %sx%s, from %s" % (encoder, globals['resolutions'][target_resolution]['width'], - globals['resolutions'][target_resolution]['height'], source), + 'desc': comp_desc, 'worker': None, 'feeder': feeder, 'properties': { @@ -235,9 +245,10 @@ class Planet: muxer = globals['formats'][format]['muxer'] comp_name = 'mux-%s-%s-%s' % (mux_name, format, profile) + comp_desc = '%s muxer for %s, profile %s' % (format, mux_name, profile), self.flow['muxers'][comp_name] = { 'type': '%s-mux' % muxer, - 'desc': "%s muxer for %s, profile %s" % (format, mux_name, profile), + 'desc': comp_desc, 'worker': None, 'feeder_audio': audio_encoder, 'feeder_video': video_encoder, |