diff --git a/vocto/config.py b/vocto/config.py index e0ae9d9d..ee5a3c52 100644 --- a/vocto/config.py +++ b/vocto/config.py @@ -424,6 +424,9 @@ def getAVRawOutputEnabled(self): def getProgramOutputEnabled(self): return self.getboolean('programoutput', 'enabled', fallback=False) + def getProgramOutputSource(self): + return self.get('programoutput', 'source', fallback="mix") + def getProgramOutputVideoSink(self): return self.get('programoutput', 'videosink', fallback="autovideosink") diff --git a/voctocore/lib/pipeline.py b/voctocore/lib/pipeline.py index d51e3738..e2f73f13 100644 --- a/voctocore/lib/pipeline.py +++ b/voctocore/lib/pipeline.py @@ -87,9 +87,9 @@ def __init__(self): # add localui if Config.getProgramOutputEnabled(): - pgmout = ProgramOutputSink("mix", Port.MIX_OUT, use_audio_mix=True) + pgmout = ProgramOutputSink(Config.getProgramOutputSource(), Port.MIX_OUT, use_audio_mix=True) self.bins.append(pgmout) - self.ports.append(Port('mix', pgmout)) + self.ports.append(Port(Config.getProgramOutputSource(), pgmout)) # create mix preview TCP output if Config.getPreviewsEnabled(): diff --git a/voctocore/lib/program_output.py b/voctocore/lib/program_output.py index 83156f75..30bbf628 100644 --- a/voctocore/lib/program_output.py +++ b/voctocore/lib/program_output.py @@ -27,8 +27,9 @@ def __init__(self, source, port, use_audio_mix=False, audio_blinded=False): self.bin = "" # video pipeline self.bin += """ - video-mix. + video-{source}. ! {vcaps} + ! videoconvert ! queue max-size-time=3000000000 name=queue-mux-video-localui