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

4
daemon/packager.py
View File

@ -87,7 +87,9 @@ class Mediasite:
else: else:
myslide['duration'] = '{}ms'.format(int(data['slides'][i+1]['duration']) - int(data['slides'][i]['duration'])) myslide['duration'] = '{}ms'.format(int(data['slides'][i+1]['duration']) - int(data['slides'][i]['duration']))
# Commit to the demuxfile # Commit to the demuxfile. Duration is assumed to be seconds unless staded otherwise
# https://ffmpeg.org/ffmpeg-utils.html#Time-duration
# https://trac.ffmpeg.org/wiki/Slideshow
f.write('file \'{}\'\n'.format(myslide['url'])) f.write('file \'{}\'\n'.format(myslide['url']))
f.write('duration {}\n'.format(myslide['duration'])) f.write('duration {}\n'.format(myslide['duration']))
slides.append(myslide) slides.append(myslide)

2
daemon/transcoder.py
View File

@ -193,6 +193,8 @@ class _Worker:
self.logger.debug("%s - Calling ffmpeg", package_id) self.logger.debug("%s - Calling ffmpeg", package_id)
start = time.time() start = time.time()
# https://ffmpeg.org/ffmpeg-formats.html#toc-concat-1
# https://github.com/kkroening/ffmpeg-python/tree/master/examples
(ffmpeg (ffmpeg
.input(demux_file, safe=0) .input(demux_file, safe=0)
.filter('scale', height='min(in_h, {})'.format(maxheight), width=-2) .filter('scale', height='min(in_h, {})'.format(maxheight), width=-2)