Merge branch 'sha'

This commit is contained in:
Peter Körner 2017-08-17 18:15:54 +02:00
commit b0ac0b83f4
7 changed files with 8277 additions and 1 deletions

Binary file not shown.

4170
SHA2017/Intro.motn Normal file

File diff suppressed because it is too large Load diff

4100
SHA2017/Outro.motn Normal file

File diff suppressed because it is too large Load diff

6
SHA2017/README.md Normal file
View file

@ -0,0 +1,6 @@
SHA2017
=======
Files for generating the SHA2017 intro and outro for the recorded (and streamed) videos. Will also contain the background loop (for when the stream is paused on stage?) when it's done.
The music for the videos is sourced from http://freemusicarchive.org/music/Broke_For_Free/Layers/A_Year

BIN
SHA2017/Roboto-Black.ttf Executable file

Binary file not shown.

BIN
SHA2017/by.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View file

@ -173,7 +173,7 @@ def finalize_job(job_id, event):
intermediate_clip = os.path.join(tempdir.name, event_id+'.mov') intermediate_clip = os.path.join(tempdir.name, event_id+'.mov')
final_clip = os.path.join(os.path.dirname(args.motn), event_id+'.ts') final_clip = os.path.join(os.path.dirname(args.motn), event_id+'.ts')
run('ffmpeg -y -hide_banner -loglevel error -i "{input}" -ar 48000 -ac 1 -f s16le -i /dev/zero -map 0:0 -c:v mpeg2video -q:v 0 -aspect 16:9 -map 1:0 -map 1:0 -map 1:0 -map 1:0 -shortest -f mpegts "{output}"', run('ffmpeg -y -hide_banner -loglevel error -i "{input}" -ar 48000 -ac 1 -f s16le -i /dev/zero -map 0:v -c:v mpeg2video -q:v 0 -aspect 16:9 -map 1:0 -map 1:0 -map 1:0 -map 1:0 -shortest -f mpegts "{output}"',
input=intermediate_clip, input=intermediate_clip,
output=final_clip) output=final_clip)