DMC/play-daemon
13
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fixes Issue #2 #4

Merged
dafo5502 merged 59 commits from developer into master 2021-10-25 14:41:37 +02:00
Conversation 0 Commits 59 Files Changed 3 +5 -3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c0a4149e25 - Show all commits

6
daemon/packager.py
View File

@ -65,12 +65,14 @@ class Mediasite:
slides = [] slides = []
demux_file = os.path.join(slides_path, 'demux.txt') demux_file = os.path.join(slides_path, 'demux.txt')
with open(demux_file, 'w') as f: with open(demux_file, 'w') as f:
elapsed = 0
for slide in data['slides']: for slide in data['slides']:
myslide = { 'url': os.path.join(slides_path, self._download(slides_path, slide['url'], session)), myslide = { 'url': os.path.join(slides_path, self._download(slides_path, slide['url'], session)),
'duration': '{}ms'.format(slide['duration'])} 'duration': '{}ms'.format(int(slide['duration'])-elapsed)}
f.write('file \'{}\'\n'.format(myslide['url'])) f.write('file \'{}\'\n'.format(myslide['url']))
f.write('duration {}ms\n'.format(slide['duration'])) f.write('duration {}\n'.format(myslide['duration']))
slides.append(myslide) slides.append(myslide)
elapsed = int(slide(['duration']))
# to accomodate for an ffmpeg quirk that needs the last slide twice # to accomodate for an ffmpeg quirk that needs the last slide twice
f.write('file \'{}\'\n'.format(slides[-1]['url'])) f.write('file \'{}\'\n'.format(slides[-1]['url']))

2
daemon/transcoder.py
View File

@ -176,7 +176,7 @@ class _Worker:
self.logger.debug("%s - Calling ffmpeg", package_id) self.logger.debug("%s - Calling ffmpeg", package_id)
start = time.time() start = time.time()
(ffmpeg (ffmpeg
.input(demux_file, format='concat', safe=0, framerate=25) .input(demux_file, format='concat', safe=0)
.filter('scale', height='min(in_h, {})'.format(maxheight), width=-2) .filter('scale', height='min(in_h, {})'.format(maxheight), width=-2)
.output(outpath, vcodec='libx264', crf=crf, preset=preset, vsync='vfr', movflags='+faststart', pix_fmt='yuv420p', c='copy') .output(outpath, vcodec='libx264', crf=crf, preset=preset, vsync='vfr', movflags='+faststart', pix_fmt='yuv420p', c='copy')
.overwrite_output() .overwrite_output()