From add2957cc22e22cc633afbc7789213d47a983d6e Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Thu, 21 Apr 2022 14:45:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84gpu=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.py | 8 ++++++-- workflow/video.py | 11 ++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/config.py b/config.py index dd77983..aa9aad5 100644 --- a/config.py +++ b/config.py @@ -1,7 +1,7 @@ import configparser import os.path -from flask.helpers import get_env +from flask.helpers import get_env PROD_ENV = get_env() == "production" @@ -19,6 +19,8 @@ VIDEO_RESOLUTION = "1280x720" FFMPEG_EXEC = "ffmpeg" # gpu FFMPEG_USE_GPU = False +# intel_gpu +FFMPEG_USE_INTEL_GPU = False # bitrate VIDEO_BITRATE = "2.5M" # [video] @@ -60,9 +62,10 @@ def load_config(): VIDEO_CLIP_OVERFLOW_SEC = section.getfloat('overflow_sec', VIDEO_CLIP_OVERFLOW_SEC) if config.has_section("ffmpeg"): section = config['ffmpeg'] - global FFMPEG_EXEC, FFMPEG_USE_GPU, VIDEO_BITRATE + global FFMPEG_EXEC, FFMPEG_USE_GPU, FFMPEG_USE_INTEL_GPU, VIDEO_BITRATE FFMPEG_EXEC = section.get('exec', FFMPEG_EXEC) FFMPEG_USE_GPU = section.getboolean('gpu', FFMPEG_USE_GPU) + FFMPEG_USE_INTEL_GPU = section.getboolean('intel_gpu', FFMPEG_USE_INTEL_GPU) VIDEO_BITRATE = section.get('bitrate', VIDEO_BITRATE) if config.has_section("recorder"): global BILILIVE_RECORDER_DIRECTORY, XIGUALIVE_RECORDER_DIRECTORY @@ -90,6 +93,7 @@ def get_config(): 'ffmpeg': { 'exec': FFMPEG_EXEC, 'gpu': FFMPEG_USE_GPU, + 'intel_gpu': FFMPEG_USE_INTEL_GPU, 'bitrate': VIDEO_BITRATE, }, 'recorder': { diff --git a/workflow/video.py b/workflow/video.py index 546d2d2..c1d97a3 100644 --- a/workflow/video.py +++ b/workflow/video.py @@ -3,7 +3,8 @@ import subprocess from datetime import datetime, timedelta from typing import IO -from config import FFMPEG_EXEC, VIDEO_BITRATE, FFMPEG_USE_GPU, VIDEO_CLIP_EACH_SEC, VIDEO_CLIP_OVERFLOW_SEC, PROD_ENV +from config import FFMPEG_EXEC, VIDEO_BITRATE, FFMPEG_USE_GPU, VIDEO_CLIP_EACH_SEC, VIDEO_CLIP_OVERFLOW_SEC, PROD_ENV, \ + FFMPEG_USE_INTEL_GPU def get_video_real_duration(filename): @@ -17,10 +18,10 @@ def encode_video_with_subtitles(orig_filename: str, subtitles: list[str], new_fi encode_process = subprocess.Popen([ FFMPEG_EXEC, "-hide_banner", "-progress", "-", "-v", "0", "-y", "-i", orig_filename, "-vf", - ",".join("subtitles=%s" % i for i in subtitles) + (",hwupload_cuda" if FFMPEG_USE_GPU else ""), - "-c:a", "copy", "-c:v", "h264_nvenc" if FFMPEG_USE_GPU else "h264", "-f", "mp4", - "-preset:v", "fast", "-profile:v", "high", "-level", "4.1", - "-b:v", VIDEO_BITRATE, "-rc:v", "vbr", *(["-tune:v", "hq"] if FFMPEG_USE_GPU else []), + ",".join("subtitles=%s" % i for i in subtitles) + (",hwupload_cuda" if FFMPEG_USE_GPU and not FFMPEG_USE_INTEL_GPU else ""), + "-c:a", "copy", "-c:v", "h264" if not FFMPEG_USE_GPU else ("h264_qsv" if FFMPEG_USE_INTEL_GPU else "h264_nvenc"), + "-f", "mp4", "-preset:v", "fast", "-profile:v", "high", "-level", "4.1", + "-b:v", VIDEO_BITRATE, "-rc:v", "vbr", *(["-tune:v", "hq"] if FFMPEG_USE_GPU and not FFMPEG_USE_INTEL_GPU else []), "-qmin", "10", "-qmax", "32", "-crf", "16", # "-t", "10", new_filename