From 03c655febbbcaa0f3253ab0cb3d5432e0342a130 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 1 Feb 2018 10:12:05 +0100 Subject: fix description of some componentns --- src/flufigut.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/flufigut.py') diff --git a/src/flufigut.py b/src/flufigut.py index 272dbee..3e75ea6 100755 --- a/src/flufigut.py +++ b/src/flufigut.py @@ -158,7 +158,7 @@ class Planet: self.flow['inputs'] = {} master_cnt = 0 for source, input in self._desc.inputs.items(): - comp_name = 'input-%s' % source + comp_name = 'capture-%s' % source comp_desc = 'capture raw data from %s' % (source) self.flow['inputs'][comp_name] = { 'type': input['type'], @@ -204,12 +204,12 @@ class Planet: if 'samplerate' in self._desc.globals['formats'][format]: samplerate = self._desc.globals['formats'][format]['samplerate'] - feeder = self.__generate_audio_feeder('input-%s' % (mux['audio']), source, input_samplerate, samplerate) + feeder = self.__generate_audio_feeder('capture-%s' % (mux['audio']), source, input_samplerate, samplerate) comp_name = 'encode-%s-%s-%i-%i' % (source, encoder, bitrate, samplerate) - comp_desc = '%s encoder for %i kbit/s @ %i Hz, from %s' % (encoder, bitrate, samplerate, source), + comp_desc = '%s encoder for %i kbit/s @ %i Hz, from %s' % (encoder, bitrate, samplerate, source) if bitrate == 0: comp_name = 'encode-%s-%s-%i' % (source, encoder, samplerate) - comp_desc = '%s encoder @ %i Hz, from %s' % (encoder, samplerate, source), + comp_desc = '%s encoder @ %i Hz, from %s' % (encoder, samplerate, source) if comp_name in self.flow['encoders-audio']: return comp_name @@ -234,7 +234,7 @@ class Planet: comp_name = 'resize-%s-%s' % (source, target_resolution) comp_desc = 'resize video from %s to %sx%s' % (source, self._desc.globals['resolutions'][target_resolution]['width'], - self._desc.globals['resolutions'][target_resolution]['height']), + self._desc.globals['resolutions'][target_resolution]['height']) self.flow['inputs'][comp_name] = { 'type': 'video-resize', 'desc': comp_desc, @@ -260,10 +260,10 @@ class Planet: if input_resolution == "": raise Exception("format definition needs video but no video input given") - feeder = self.__generate_video_feeder('input-%s' % (mux['video']), source, input_resolution, resolution) + feeder = self.__generate_video_feeder('capture-%s' % (mux['video']), source, input_resolution, resolution) comp_name = 'encode-%s-%s-%s' % (source, encoder, resolution) comp_desc = '%s encoder for %sx%s, from %s' % (encoder, self._desc.globals['resolutions'][resolution]['width'], - self._desc.globals['resolutions'][resolution]['height'], source), + self._desc.globals['resolutions'][resolution]['height'], source) if comp_name in self.flow['encoders-video']: return comp_name @@ -283,7 +283,7 @@ class Planet: muxer = self._desc.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), + comp_desc = '%s muxer for %s, profile %s' % (format, mux_name, profile) self.flow['muxers'][comp_name] = { 'type': '%s-mux' % muxer, 'desc': comp_desc, @@ -455,7 +455,7 @@ class Planet: feeder = 'mux-%s-%s-%s' % (mux, format, profile) comp_name = 'record-%s-%s-%s' % (mux, format, profile) - comp_desc = 'recorder for %s %s-%s' % (mux, format, profile), + comp_desc = 'recorder for %s %s-%s' % (mux, format, profile) self.flow['recorders'][comp_name] = { 'type': "recorder", -- cgit v1.2.3