0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

use ffmpeg to merge mp4 files, support clip extraction from multiple parts

Browse source
This commit is contained in:
j 2017-11-16 16:39:38 +01:00
parent 3204bc68f6
commit 959ffaba25
2 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pandora/item/models.py
View file

@ -498,14 +498,21 @@ class Item(models.Model):
p.wait() p.wait()
return True return True
elif format == "mp4": elif format == "mp4":
fd, tmp_output = tempfile.mkstemp('.mp4') fd, tmp_output_txt = tempfile.mkstemp('.txt')
shutil.copy(streams[0], tmp_output) with open(tmp_output_txt, 'w') as f:
for s in streams[1:]: f.write('\n'.join(["file '{}'".format(path) for path in streams]))
cmd = ['MP4Box', '-cat', s, tmp_output] cmd = [
p = subprocess.Popen(cmd, stdout=open('/dev/null', 'w'), stderr=open('/dev/null', 'w'), close_fds=True) settings.FFMPEG,
p.wait() '-nostats', '-loglevel', 'error',
shutil.copy(tmp_output, output) '-y',
os.unlink(tmp_output) '-f', 'concat', '-safe', '0', '-i', tmp_output_txt,
'-c', 'copy',
output
]
p = subprocess.Popen(
cmd, stdout=open('/dev/null', 'w'), stderr=open('/dev/null', 'w'), close_fds=True)
p.wait()
os.unlink(tmp_output_txt)
return True return True
else: else:
return None return None

14
pandora/item/views.py
View file

@ -1022,7 +1022,6 @@ def video(request, id, resolution, format, index=None, track=None):
path = stream.media.path path = stream.media.path
# server side cutting # server side cutting
# FIXME: this needs to join segments if needed
t = request.GET.get('t') t = request.GET.get('t')
if t: if t:
def parse_timestamp(s): def parse_timestamp(s):
@ -1031,8 +1030,19 @@ def video(request, id, resolution, format, index=None, track=None):
return float(s) return float(s)
t = list(map(parse_timestamp, t.split(','))) t = list(map(parse_timestamp, t.split(',')))
ext = '.%s' % format ext = '.%s' % format
duration = stream.info['duration']
# multipart request beyond first part, merge parts and chop that
if not index and streams.count() > 1 and stream.info['duration'] < t[1]:
video = NamedTemporaryFile(suffix=ext)
r = item.merge_streams(video.name, resolution, format)
if not r:
return HttpResponseForbidden()
path = video.name
duration = sum(item.json['durations'])
content_type = mimetypes.guess_type(path)[0] content_type = mimetypes.guess_type(path)[0]
if len(t) == 2 and t[1] > t[0] and stream.info['duration'] >= t[1]: if len(t) == 2 and t[1] > t[0] and duration >= t[1]:
response = HttpResponse(extract.chop(path, t[0], t[1]), content_type=content_type) response = HttpResponse(extract.chop(path, t[0], t[1]), content_type=content_type)
filename = u"Clip of %s - %s-%s - %s %s%s" % ( filename = u"Clip of %s - %s-%s - %s %s%s" % (
item.get('title'), item.get('title'),