From 19b30e726bc4e704858516177231b86601fd01cc Mon Sep 17 00:00:00 2001 From: Aevann Date: Sat, 29 Jul 2023 21:50:09 +0300 Subject: [PATCH] enforce consistency for ffmpeg params --- files/helpers/media.py | 8 +++++--- files/routes/posts.py | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/files/helpers/media.py b/files/helpers/media.py index ed75027ab7..488578a29f 100644 --- a/files/helpers/media.py +++ b/files/helpers/media.py @@ -19,6 +19,8 @@ from files.helpers.settings import get_setting from .config.const import * +generic_ffmpeg_params = ["ffmpeg", "-loglevel", "quiet", "-y", "-map_metadata", "-1"] + def subprocess_run(params): subprocess.run(params, check=True, timeout=30) @@ -88,7 +90,7 @@ def process_audio(file, v): new = old + '.' + extension try: - subprocess_run(["ffmpeg", "-loglevel", "quiet", "-y", "-i", old, "-map_metadata", "-1", "-c:a", "copy", new]) + subprocess_run(generic_ffmpeg_params + ["-i", old, "-c:a", "copy", new]) except: os.remove(old) if os.path.isfile(new): @@ -111,7 +113,7 @@ def process_audio(file, v): def convert_to_mp4(old, new): tmp = new.replace('.mp4', '-t.mp4') try: - subprocess_run(["ffmpeg", "-loglevel", "quiet", "-y", "-threads:v", "1", "-i", old, "-map_metadata", "-1", tmp]) + subprocess_run(generic_ffmpeg_params + ["-i", old, "-threads:v", "1", tmp]) except: os.remove(old) if os.path.isfile(tmp): @@ -151,7 +153,7 @@ def process_video(file, v): gevent.spawn(convert_to_mp4, old, new) else: try: - subprocess_run(["ffmpeg", "-loglevel", "quiet", "-y", "-i", old, "-map_metadata", "-1", "-c:v", "copy", "-c:a", "copy", new]) + subprocess_run(["-i", old, "-c:v", "copy", "-c:a", "copy", new]) except: os.remove(old) if os.path.isfile(new): diff --git a/files/routes/posts.py b/files/routes/posts.py index c30711142d..f3f231abfc 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -22,7 +22,7 @@ from files.helpers.sanitize import * from files.helpers.settings import get_setting from files.helpers.slots import * from files.helpers.sorting_and_time import * -from files.helpers.media import subprocess_run +from files.helpers.media import subprocess_run, generic_ffmpeg_params from files.routes.routehelpers import execute_shadowban_viewers_and_voters from files.routes.wrappers import * @@ -661,7 +661,7 @@ def submit_post(v:User, sub=None): p.url = process_video(file, v) name = f'/images/{time.time()}'.replace('.','') + '.webp' try: - subprocess_run(["ffmpeg", "-loglevel", "quiet", "-y", "-i", p.url, "-vf", "scale='iw':-2", "-q:v", "3", "-frames:v", "1", name]) + subprocess_run(generic_ffmpeg_params + ["-i", p.url, "-vf", "scale='iw':-2", "-q:v", "3", "-frames:v", "1", name]) except: if os.path.isfile(name): os.remove(name)