X-Git-Url: https://git.mdrn.pl/audio.git/blobdiff_plain/651c3fcf0e96681e5dfeb5afbbc4900a9342beb3..3c7adf8af63a913089eb5ec736443ea0c59a8d68:/src/youtube/utils.py diff --git a/src/youtube/utils.py b/src/youtube/utils.py index 5074c53..3b64018 100644 --- a/src/youtube/utils.py +++ b/src/youtube/utils.py @@ -23,7 +23,10 @@ def link_or_copy(src, dst): def process_to_file(cmdline, prefix='', suffix='', cache_key=None, output_path=None): if not output_path: - tmp = NamedTemporaryFile(prefix=prefix, suffix=suffix, delete=False) + tmp = NamedTemporaryFile( + prefix=prefix, suffix=suffix, delete=False, + dir=settings.FILE_UPLOAD_TEMP_DIR + ) tmp.close() output_path = tmp.name @@ -52,29 +55,32 @@ def video_from_image(img_path, duration, fps=25, cache=True): def cut_video(video_path, duration): return process_to_file( - ['ffmpeg', '-y', '-i', video_path, '-t', str(duration)], + ['ffmpeg', '-y', '-i', video_path, '-t', str(duration), '-c', 'copy'], 'cut-', '.mkv' ) -def ffmpeg_concat(paths, suffix): - filelist = NamedTemporaryFile(prefix='concat-', suffix='.txt') +def ffmpeg_concat(paths, suffix, copy=False): + filelist = NamedTemporaryFile( + prefix='concat-', suffix='.txt', + dir=settings.FILE_UPLOAD_TEMP_DIR + ) for path in paths: filelist.write(f"file '{path}'\n".encode('utf-8')) filelist.flush() - outname = process_to_file( - ['ffmpeg', '-y', '-safe', '0', '-f', 'concat', '-i', filelist.name], - 'concat-', suffix - ) + args = ['ffmpeg', '-y', '-safe', '0', '-f', 'concat', '-i', filelist.name] + if copy: + args += ['-c', 'copy'] + outname = process_to_file(args, 'concat-', suffix) filelist.close() return outname def concat_videos(paths): - return ffmpeg_concat(paths, '.mkv') + return ffmpeg_concat(paths, '.mkv', copy=True) def concat_audio(paths): @@ -101,6 +107,7 @@ def mux(channels, output_path=None): args = ['ffmpeg', '-y'] for c in channels: args.extend(['-i', c]) + args.extend(['-c', 'copy']) return process_to_file(args, 'mux-', '.mkv', output_path=output_path)