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 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 455e0ead6a - Show all commits

2
daemon/packager.py
View File

@ -66,9 +66,9 @@ class Mediasite:
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:
for slide in data['slides']: for slide in data['slides']:
self.logger.info('Slide: {}'.format(slide))
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': slide['duration'] } 'duration': slide['duration'] }
self.logger.info('Slide: {}'.format(myslide))
f.write('file \'{}\'\n'.format(myslide['url'])) f.write('file \'{}\'\n'.format(myslide['url']))
f.write('duration {}\n'.format(slide['duration'])) f.write('duration {}\n'.format(slide['duration']))
mypackage['slides'].append(myslide) mypackage['slides'].append(myslide)

2
daemon/transcoder.py
View File

@ -184,7 +184,7 @@ class _Worker:
start = time.time() start = time.time()
(ffmpeg (ffmpeg
.input(demux_file, framerate=25) .input(demux_file, framerate=25)
.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') .output(outpath, vcodec='libx264', crf=crf, preset=preset, vsync='vfr', movflags='+faststart', pix_fmt='yuv420p')
.run(quiet=quiet)) .run(quiet=quiet))