Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
Voctomix Config
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Janne Mareike Koschinski
Voctomix Config
Compare revisions
ba7db870a7ebecae6f2e0964ade5bdfa7808994c to 5423b775163add2b6a6682348f583cdf52c4f6b7
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
justJanne/voctomix-config
Select target project
No results found
5423b775163add2b6a6682348f583cdf52c4f6b7
Select Git revision
Swap
Target
justJanne/voctomix-config
Select target project
justJanne/voctomix-config
1 result
ba7db870a7ebecae6f2e0964ade5bdfa7808994c
Select Git revision
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
use previews more consistently
· 31a9b690
Janne Mareike Koschinski
authored
2 months ago
31a9b690
add presets
· 5423b775
Janne Mareike Koschinski
authored
2 months ago
5423b775
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configs/voctocore-cam1.ini
+25
-2
25 additions, 2 deletions
configs/voctocore-cam1.ini
configs/voctocore-cam2.ini
+41
-3
41 additions, 3 deletions
configs/voctocore-cam2.ini
with
66 additions
and
5 deletions
configs/voctocore-cam1.ini
View file @
5423b775
...
...
@@ -42,7 +42,7 @@ live=true
videodecoder
=
vaapi
videoencoder
=
vaapi
videocodec
=
h264
videocaps
=
video/x-h264,width=
1024
,height=5
76
,framerate=30/1
videocaps
=
video/x-h264,width=
960
,height=5
40
,framerate=30/1
sources
=
cam1,slides
[blinder]
...
...
@@ -67,7 +67,7 @@ blend-time=300
[mirrors]
; disable if not needed
enabled
=
true
;
sources
=cam1,s
lide
s
sources
=
mix,mix-b
li
n
de
d
[composites]
; fullscreen source A (B is full transparent)
...
...
@@ -175,6 +175,29 @@ pip-pip_ = 750, |pip / sbs / |pip
; unique name = ms, from / [... /] to
def
=
750, * / *
[toolbar]
; only evaluated in voctogui, but having it here means we don't have
; to configure two systems if we change configs.
fullscreen
=
false
ports
=
false
queues
=
false
presets
=
fs_cam1,fs_slides,lec_slides_cam1
[preset.fs_cam1]
name
=
CAM1
icon
=
speaker.svg
key
=
q
[preset.fs_slides]
name
=
SLIDES
icon
=
slides.svg
key
=
w
[preset.lec_slides_cam1]
name
=
CAM1|SLIDES
icon
=
side-by-side-preview.svg
key
=
e
[toolbar.sources.a]
buttons
=
cam1,slides
cam1.name
=
cam1
...
...
This diff is collapsed.
Click to expand it.
configs/voctocore-cam2.ini
View file @
5423b775
...
...
@@ -50,8 +50,8 @@ live=true
videodecoder
=
vaapi
videoencoder
=
vaapi
videocodec
=
h264
videocaps
=
video/x-h264,width=
1024
,height=5
76
,framerate=30/1
sources
=
cam1,cam2,slides
videocaps
=
video/x-h264,width=
960
,height=5
40
,framerate=30/1
sources
=
cam1,cam2,slides
,mix,mix-blinded
[blinder]
enabled
=
true
...
...
@@ -75,7 +75,7 @@ blend-time=300
[mirrors]
; disable if not needed
enabled
=
true
;
sources
=cam1,cam2,s
lide
s
sources
=
mix,mix-b
li
n
de
d
[composites]
; fullscreen source A (B is full transparent)
...
...
@@ -183,6 +183,44 @@ pip-pip_ = 750, |pip / sbs / |pip
; unique name = ms, from / [... /] to
def
=
750, * / *
[toolbar]
; only evaluated in voctogui, but having it here means we don't have
; to configure two systems if we change configs.
fullscreen
=
false
ports
=
false
queues
=
false
presets
=
fs_cam1,fs_cam2,fs_slides,sbs_cam1_cam2,lec_slides_cam1,lec_slides_cam2
[preset.fs_cam1]
name
=
CAM1
icon
=
speaker.svg
key
=
q
[preset.fs_cam2]
name
=
CAM2
icon
=
speaker.svg
key
=
w
[preset.fs_slides]
name
=
SLIDES
icon
=
slides.svg
key
=
e
[preset.sbs_cam1_cam2]
name
=
CAM1|CAM2
icon
=
side-by-side.svg
key
=
r
[preset.lec_slides_cam1]
name
=
CAM1|SLIDES
icon
=
side-by-side-preview.svg
key
=
t
[preset.lec_slides_cam2]
name
=
CAM2|SLIDES
icon
=
side-by-side-preview.svg
key
=
z
[toolbar.sources.a]
buttons
=
cam1,cam2,slides
cam1.name
=
cam1
...
...
This diff is collapsed.
Click to expand it.