Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Local Program Output improvements #357

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Local Program Output improvements #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
561f6bf
Make programoutput compatible with kmssink
justjanne Jan 8, 2025
05f58fd
Allow configuring source for programoutput
justjanne Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions vocto/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
4 changes: 2 additions & 2 deletions voctocore/lib/pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
3 changes: 2 additions & 1 deletion voctocore/lib/program_output.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down