Merge e959d0d126 into c5047d8df8

cms/settings.py

@@ -163,6 +163,7 @@ HLS_DIR = os.path.join(MEDIA_ROOT, "hls/")
 
 FFMPEG_COMMAND = "ffmpeg"  # this is the path
 FFPROBE_COMMAND = "ffprobe"  # this is the path
+FFMPEG_THREADS = 0  # default - use optimal number of threads
 MP4HLS = "mp4hls"
 
 MASK_IPS_FOR_ACTIONS = True

files/helpers.py

@@ -554,6 +554,8 @@ def get_base_ffmpeg_command(
 
     base_cmd = [
         settings.FFMPEG_COMMAND,
+        "-threads",
+        str(settings.FFMPEG_THREADS),
         "-y",
         "-i",
         input_file,

files/models.py

@@ -1494,6 +1494,8 @@ def encoding_file_save(sender, instance, created, **kwargs):
                             ff.write("file {}\n".format(f))
                     cmd = [
                         settings.FFMPEG_COMMAND,
+                        "-threads",
+                        str(settings.FFMPEG_THREADS),
                         "-y",
                         "-f",
                         "concat",

files/tasks.py

@@ -62,6 +62,8 @@ def chunkize_media(self, friendly_token, profiles, force=True):
     chunks_file_name += ".mkv"
     cmd = [
         settings.FFMPEG_COMMAND,
+        "-threads",
+        str(settings.FFMPEG_THREADS),
         "-y",
         "-i",
         media.media_file.path,
@@ -233,6 +235,8 @@ def encode_media(
         # -ss 5 start from 5 second. -t 25 until 25 sec
         command = [
             settings.FFMPEG_COMMAND,
+            "-threads",
+            str(settings.FFMPEG_THREADS),
             "-y",
             "-ss",
             "3",