fnp
/
audio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor fix for duration tag.
[audio.git]
/
src
/
youtube
/
utils.py
diff --git
a/src/youtube/utils.py
b/src/youtube/utils.py
index
42ebc91
..
3b64018
100644
(file)
--- 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:
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
tmp.close()
output_path = tmp.name
@@
-52,14
+55,17
@@
def video_from_image(img_path, duration, fps=25, cache=True):
def cut_video(video_path, duration):
return process_to_file(
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, copy=False):
'cut-',
'.mkv'
)
def ffmpeg_concat(paths, suffix, copy=False):
- filelist = NamedTemporaryFile(prefix='concat-', suffix='.txt')
+ 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()
for path in paths:
filelist.write(f"file '{path}'\n".encode('utf-8'))
filelist.flush()
@@
-101,6
+107,7
@@
def mux(channels, output_path=None):
args = ['ffmpeg', '-y']
for c in channels:
args.extend(['-i', c])
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)
return process_to_file(args, 'mux-', '.mkv', output_path=output_path)