diff --git a/make.py b/make.py
index 2553177..6c0834c 100755
--- a/make.py
+++ b/make.py
@@ -181,8 +181,6 @@ def worker():
# prepend workdir to input file
task.infile = os.path.join(workdir, task.infile)
- if task.audiofile:
- task.audiofile = os.path.join(workdir, task.audiofile)
task.outfile = os.path.join(outdir, task.outfile)
task.workdir = workdir
diff --git a/osc22/__init__.py b/osc22/__init__.py
new file mode 100644
index 0000000..6f5063f
--- /dev/null
+++ b/osc22/__init__.py
@@ -0,0 +1,131 @@
+#!/usr/bin/python
+
+from renderlib import *
+from easing import *
+
+# URL to Schedule-XML
+scheduleUrl = 'https://events.opensuse.org/conferences/oSC22/schedule.xml'
+#scheduleUrl = 'https://cloud.lethliel.org/index.php/s/6LL8P6smZnSJ8Dt/download/schedule.xml'
+
+def bounce(i, min, max, frames):
+ if i == frames - 1:
+ return 0
+
+ if i <= frames/2:
+ return easeInOutQuad(i, min, max, frames/2)
+ else:
+ return max - easeInOutQuad(i - frames/2, min, max, frames/2)
+
+def introFrames(parameters):
+ # 3 Sekunde Text Fadein
+ frames = 1*fps
+ for i in range(0, frames):
+ yield (
+ ('textblock', 'style', 'opacity', "%.4f" % easeLinear(i, 0, 1, frames)),
+ )
+
+ # 4 Sekunden stehen lassen
+ frames = 4*fps
+ for i in range(0, frames):
+ yield ()
+
+ # 1 Sekunde Fade to black layer
+ frames = 1*fps
+ for i in range(0, frames):
+ yield (
+ ('fadeout', 'style', 'opacity', "%.4f" % easeLinear(i, 0, 1, frames)),
+ )
+
+def pauseFrames(parameters):
+ frames = 3*fps
+ colors = ['#21A4D4', '#73BA25', '#6DA741', '#35B9AB', '#00A489', '#173F4F']
+ yield (
+ ('pause_bg', 'style', 'fill', "%s" % '#173F4F'),
+ ('pause_bg', 'attr', 'opacity', '%.4f' % 1.0),
+ )
+ for i in range(0, len(colors)):
+ z = 0
+ for z in range(0,frames):
+ yield (
+ ('pause_bg_alt', 'style', 'fill', "%s" % colors[i]),
+ ('pause_bg_alt', 'attr', 'opacity', '%.4f' % easeLinear(z, 0.0, 1.0, frames)),
+ )
+ yield (
+ ('pause_bg', 'style', 'fill', "%s" % colors[i]),
+ ('pause_bg', 'attr', 'opacity', '%.4f' % 1.0),
+ )
+
+def outroFrames(p):
+ # 5 Sekunden stehen bleiben
+ frames = 5*fps
+ for i in range(0, frames):
+ yield []
+
+def debug():
+# render(
+# 'intro.svg',
+# '../intro.ts',
+# introFrames,
+# {
+# '$ID': 3992,
+# '$TITLE': "Long Long Long title is LONG",
+# '$SUBTITLE': 'Long Long Long Long subtitle is LONGER',
+# '$SPEAKER': 'Long Name of Dr. Dr. Prof. Dr. Long Long'
+# }
+# )
+#
+ render(
+ 'sponsors.svg',
+ '../pause.ts',
+ pauseFrames
+ )
+
+# render(
+# 'outro.svg',
+# '../outro.ts',
+# outroFrames
+# )
+#
+def tasks(queue, args, idlist, skiplist):
+ # iterate over all events extracted from the schedule xml-export
+ for event in events(scheduleUrl):
+ if event['room'] not in ('Saal ', 'Seminarraum 1'):
+ print("skipping room %s (%s [%s])" % (event['room'], event['title'], event['id']))
+ continue
+ if not (idlist==[]):
+ if 000000 in idlist:
+ print("skipping id (%s [%s])" % (event['title'], event['id']))
+ continue
+ if int(event['id']) not in idlist:
+ print("skipping id (%s [%s])" % (event['title'], event['id']))
+ continue
+
+ # generate a task description and put it into the queue
+ queue.put(Rendertask(
+ infile = 'intro.svg',
+ audiofile = 'intro.mpg',
+ outfile = str(event['id'])+".ts",
+ sequence = introFrames,
+ parameters = {
+ '$ID': event['id'],
+ '$TITLE': event['title'],
+ '$SUBTITLE': event['subtitle'],
+ '$SPEAKER': event['personnames']
+ }
+ ))
+
+ # place a task for the outro into the queue
+ if not "out" in skiplist:
+ queue.put(Rendertask(
+ infile = 'outro.svg',
+ outfile = 'outro.ts',
+ sequence = outroFrames
+ ))
+
+ # place the pause-sequence into the queue
+ if not "pause" in skiplist:
+ queue.put(Rendertask(
+ infile = 'pause.svg',
+ outfile = 'pause.ts',
+ sequence = pauseFrames
+ ))
diff --git a/osc22/artwork/_break.svg b/osc22/artwork/_break.svg
new file mode 100644
index 0000000..b6d431a
--- /dev/null
+++ b/osc22/artwork/_break.svg
@@ -0,0 +1,1086 @@
+
+
+
+
diff --git a/osc22/artwork/hexagons.png b/osc22/artwork/hexagons.png
new file mode 100644
index 0000000..0d3b6a1
Binary files /dev/null and b/osc22/artwork/hexagons.png differ
diff --git a/osc22/artwork/infobeamer.png b/osc22/artwork/infobeamer.png
new file mode 100644
index 0000000..07f1c52
Binary files /dev/null and b/osc22/artwork/infobeamer.png differ
diff --git a/osc22/artwork/infobeamer.svg b/osc22/artwork/infobeamer.svg
new file mode 100644
index 0000000..b925ef9
--- /dev/null
+++ b/osc22/artwork/infobeamer.svg
@@ -0,0 +1,241 @@
+
+
+
+
diff --git a/osc22/artwork/intro.mpg b/osc22/artwork/intro.mpg
new file mode 100644
index 0000000..df96717
Binary files /dev/null and b/osc22/artwork/intro.mpg differ
diff --git a/osc22/artwork/intro.svg b/osc22/artwork/intro.svg
new file mode 100644
index 0000000..eb50d98
--- /dev/null
+++ b/osc22/artwork/intro.svg
@@ -0,0 +1,346 @@
+
+
+
+
diff --git a/osc22/artwork/logo_osc-video.svg b/osc22/artwork/logo_osc-video.svg
new file mode 100644
index 0000000..fd4f59b
--- /dev/null
+++ b/osc22/artwork/logo_osc-video.svg
@@ -0,0 +1,377 @@
+
+
+
+
diff --git a/osc22/artwork/logo_osc-video_preview.png b/osc22/artwork/logo_osc-video_preview.png
new file mode 100644
index 0000000..f0b6686
Binary files /dev/null and b/osc22/artwork/logo_osc-video_preview.png differ
diff --git a/osc22/artwork/official-logo-monochrome.svg b/osc22/artwork/official-logo-monochrome.svg
new file mode 100644
index 0000000..6c91bb3
--- /dev/null
+++ b/osc22/artwork/official-logo-monochrome.svg
@@ -0,0 +1,19 @@
+
+
diff --git a/osc22/artwork/outro.svg b/osc22/artwork/outro.svg
new file mode 100644
index 0000000..c3d3058
--- /dev/null
+++ b/osc22/artwork/outro.svg
@@ -0,0 +1,735 @@
+
+
+
+
diff --git a/osc22/artwork/overlay_osc22_fullcam.png b/osc22/artwork/overlay_osc22_fullcam.png
new file mode 100644
index 0000000..2bacc45
Binary files /dev/null and b/osc22/artwork/overlay_osc22_fullcam.png differ
diff --git a/osc22/artwork/pause.svg b/osc22/artwork/pause.svg
new file mode 100644
index 0000000..0531ded
--- /dev/null
+++ b/osc22/artwork/pause.svg
@@ -0,0 +1,3472 @@
+
+
+
+
\ No newline at end of file
diff --git a/osc22/artwork/sponsors.png b/osc22/artwork/sponsors.png
new file mode 100644
index 0000000..81fe466
Binary files /dev/null and b/osc22/artwork/sponsors.png differ
diff --git a/osc22/artwork/sponsors.svg b/osc22/artwork/sponsors.svg
new file mode 100644
index 0000000..369bdac
--- /dev/null
+++ b/osc22/artwork/sponsors.svg
@@ -0,0 +1,1076 @@
+
+
+
+
diff --git a/renderlib.py b/renderlib.py
index 823149c..b84ef75 100644
--- a/renderlib.py
+++ b/renderlib.py
@@ -35,16 +35,13 @@ def easeDelay(easer, delay, t, b, c, d, *args):
class Rendertask:
- def __init__(self, infile, audiofile=None, parameters={}, outfile=None, workdir='.', sequence=None):
+ def __init__(self, infile, parameters={}, outfile=None, workdir='.', sequence=None):
if isinstance(infile, list):
self.infile = infile[0]
- self.audiofile = infile[1]
+ # self.audiofile = infile[1]
else:
self.infile = infile
- if audiofile:
- self.audiofile = audiofile
- else:
- self.audiofile = None
+ self.audiofile = None
self.parameters = parameters
self.outfile = outfile
self.workdir = workdir
@@ -191,7 +188,7 @@ def rendertask_video(task):
if task.audiofile is None:
cmd += '-map 1:0 -map 2:0 '
else:
- cmd += '-map 1:a -c:a copy -map 2:a -c:a copy '
+ cmd += '-map 1:0 -c:a copy -map 2:0 -c:a copy '
cmd += '-shortest -f mpegts "{0}"'.format(task.outfile)
elif task.outfile.endswith('.mov'):
cmd = 'cd {0} && '.format(task.workdir)