diff options
Diffstat (limited to 'voctocore/lib/pipeline.py')
| -rw-r--r-- | voctocore/lib/pipeline.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/voctocore/lib/pipeline.py b/voctocore/lib/pipeline.py index 6c207fe..5687573 100644 --- a/voctocore/lib/pipeline.py +++ b/voctocore/lib/pipeline.py @@ -7,8 +7,9 @@ from lib.controlserver import controlServerEntrypoint # import library components from lib.config import Config -from lib.videosrc import VideoSrc -from lib.videosrcmirror import VideoSrcMirror +from lib.video.src import VideoSrc +from lib.video.rawoutput import VideoRawOutput +from lib.video.mix import VideoMix class Pipeline(object): """mixing, streaming and encoding pipeline constuction and control""" @@ -16,15 +17,9 @@ class Pipeline(object): vsources = [] vmirrors = [] + vpreviews = [] def __init__(self): - # self.log.debug('Creating A/V-Mixer') - # self.videomixer = VideoMix() - # self.add(self.videomixer) - - # self.audiomixer = AudioMix() - # self.add(self.audiomixer) - caps = Config.get('mix', 'videocaps') self.log.info('Video-Caps configured to: %s', caps) @@ -39,5 +34,12 @@ class Pipeline(object): port = 13000 + idx self.log.info('Creating Mirror-Output for Video-Source %s at tcp-port %u', name, port) - mirror = VideoSrcMirror(name, port, caps) + mirror = VideoRawOutput('video_%s_mirror' % name, port, caps) self.vmirrors.append(mirror) + + # self.log.debug('Creating Video-Mixer') + # self.videomixer = VideoMix() + + # port = 11000 + # self.log.debug('Creating Video-Mixer-Output at tcp-port %u', port) + # mirror = VideoRawOutput('video_mix', port, caps) |