From c3993965a98658d955aeb0bc1a581a0a43415c8a Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Thu, 8 Dec 2022 12:20:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4CRF=EF=BC=8C=E9=81=BF?= =?UTF-8?q?=E5=85=8D=E7=A0=81=E7=8E=87=E8=AE=BE=E7=BD=AE=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.py | 6 +----- templates/index.html | 5 ----- test/create_workflow.py | 24 ++++++++++++++++++++++++ workflow/video.py | 6 +++--- 4 files changed, 28 insertions(+), 13 deletions(-) create mode 100644 test/create_workflow.py diff --git a/config.py b/config.py index c3de16b..41dadd6 100644 --- a/config.py +++ b/config.py @@ -30,8 +30,6 @@ FFMPEG_USE_INTEL_GPU = False FFMPEG_USE_VAAPI = False # bitrate VIDEO_BITRATE = "2.5M" -# crf -VIDEO_CRF = 28 # gop VIDEO_GOP = 60 # [video] @@ -96,7 +94,7 @@ 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_HEVC, FFMPEG_USE_NVIDIA_GPU, FFMPEG_USE_INTEL_GPU, VIDEO_BITRATE, VIDEO_CRF, \ + global FFMPEG_EXEC, FFMPEG_USE_HEVC, FFMPEG_USE_NVIDIA_GPU, FFMPEG_USE_INTEL_GPU, VIDEO_BITRATE, \ VIDEO_GOP, FFMPEG_USE_VAAPI FFMPEG_EXEC = section.get('exec', FFMPEG_EXEC) FFMPEG_USE_HEVC = section.getboolean('hevc', FFMPEG_USE_HEVC) @@ -104,7 +102,6 @@ def load_config(): FFMPEG_USE_INTEL_GPU = section.getboolean('intel_gpu', FFMPEG_USE_INTEL_GPU) FFMPEG_USE_VAAPI = section.getboolean('vaapi', FFMPEG_USE_VAAPI) VIDEO_BITRATE = section.get('bitrate', VIDEO_BITRATE) - VIDEO_CRF = section.getfloat('crf', VIDEO_CRF) VIDEO_GOP = section.getfloat('gop', VIDEO_GOP) if config.has_section("recorder"): global BILILIVE_RECORDER_DIRECTORY, XIGUALIVE_RECORDER_DIRECTORY, VIDEO_OUTPUT_DIR @@ -144,7 +141,6 @@ def get_config(): 'intel_gpu': FFMPEG_USE_INTEL_GPU, 'vaapi': FFMPEG_USE_VAAPI, 'bitrate': VIDEO_BITRATE, - 'crf': VIDEO_CRF, 'gop': VIDEO_GOP, }, 'recorder': { diff --git a/templates/index.html b/templates/index.html index e844cf2..b5bc675 100644 --- a/templates/index.html +++ b/templates/index.html @@ -104,10 +104,6 @@