Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Jannik Hellenkamp
website
Commits
323ca413
Commit
323ca413
authored
Jul 27, 2018
by
Julian Rother
Browse files
Small livestream fix
parent
f7a3dcd3
Changes
1
Show whitespace changes
Inline
Side-by-side
livestreams.py
View file @
323ca413
...
@@ -184,15 +184,15 @@ def schedule_livestream(lecture_id):
...
@@ -184,15 +184,15 @@ def schedule_livestream(lecture_id):
data
[
'vmix'
]
=
'streamselect=map=0'
data
[
'vmix'
]
=
'streamselect=map=0'
elif
mode
==
'2'
:
elif
mode
==
'2'
:
data
[
'vmix'
]
=
'streamselect=map=1'
data
[
'vmix'
]
=
'streamselect=map=1'
elif
v
mode
==
'lecture4:3'
:
elif
mode
==
'lecture4:3'
:
data
[
'src1'
][
'vfilter'
].
append
(
'scale=1440:1080'
)
data
[
'src1'
][
'vfilter'
].
append
(
'scale=1440:1080'
)
data
[
'src2'
][
'vfilter'
].
append
(
'scale=1440:810,pad=1440:1080:0:135,crop=480:1080'
)
data
[
'src2'
][
'vfilter'
].
append
(
'scale=1440:810,pad=1440:1080:0:135,crop=480:1080'
)
data
[
'vmix'
]
=
'hstack'
data
[
'vmix'
]
=
'hstack'
elif
v
mode
==
'lecture16:9'
:
elif
mode
==
'lecture16:9'
:
data
[
'src1'
][
'vfilter'
].
append
(
'scale=1440:810,pad=1440:1080:0:135'
)
data
[
'src1'
][
'vfilter'
].
append
(
'scale=1440:810,pad=1440:1080:0:135'
)
data
[
'src2'
][
'vfilter'
].
append
(
'scale=1440:810,pad=1440:1080:0:135,crop=480:1080'
)
data
[
'src2'
][
'vfilter'
].
append
(
'scale=1440:810,pad=1440:1080:0:135,crop=480:1080'
)
data
[
'vmix'
]
=
'hstack'
data
[
'vmix'
]
=
'hstack'
elif
v
mode
==
'sidebyside'
:
elif
mode
==
'sidebyside'
:
data
[
'src1'
][
'vfilter'
].
append
(
'scale=960:540'
)
data
[
'src1'
][
'vfilter'
].
append
(
'scale=960:540'
)
data
[
'src2'
][
'vfilter'
].
append
(
'scale=960:540'
)
data
[
'src2'
][
'vfilter'
].
append
(
'scale=960:540'
)
data
[
'vmix'
]
=
'hstack,pad=1920:1080:0:270'
data
[
'vmix'
]
=
'hstack,pad=1920:1080:0:270'
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment