diff --git a/config.py b/config.py index 2eb48e7..6132e75 100644 --- a/config.py +++ b/config.py @@ -26,8 +26,6 @@ FFMPEG_USE_INTEL_GPU = False FFMPEG_USE_VAAPI = False # bitrate VIDEO_BITRATE = "2.5M" -# crf -VIDEO_CRF = 28 # gop VIDEO_GOP = 60 # [video] @@ -97,7 +95,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 @@ -135,7 +132,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/danmaku_workflow.py b/danmaku_workflow.py index d9f4555..7b1061a 100644 --- a/danmaku_workflow.py +++ b/danmaku_workflow.py @@ -15,7 +15,7 @@ from PyQt5.QtWidgets import QWidget, QLabel, QApplication, QFrame, QVBoxLayout, from danmaku_xml_helper import get_file_start, diff_danmaku_files, NoDanmakuException from config import load_config, FFMPEG_EXEC, DANMAKU_FACTORY_EXEC, FFMPEG_USE_INTEL_GPU, FFMPEG_USE_NVIDIA_GPU, \ VIDEO_BITRATE, VIDEO_CLIP_EACH_SEC, VIDEO_CLIP_OVERFLOW_SEC, VIDEO_RESOLUTION, DANMAKU_SPEED, DANMAKU_FONT_NAME, \ - VIDEO_OUTPUT_DIR, VIDEO_CRF, VIDEO_GOP, FFMPEG_USE_HEVC, DANMAKU_FONT_SIZE + VIDEO_OUTPUT_DIR, VIDEO_GOP, FFMPEG_USE_HEVC, DANMAKU_FONT_SIZE class Job: @@ -591,8 +591,8 @@ def _common_ffmpeg_params(): return ( "-f", "mp4", "-b:v", VIDEO_BITRATE, "-c:a", "aac", "-preset:v", "fast", "-profile:v", "main", "-avoid_negative_ts", "1", - "-qmin", "18", "-qmax", "38", "-crf", str(VIDEO_CRF), "-g:v", str(VIDEO_GOP), - "-fflags", "+genpts", "-shortest", "-movflags", "faststart" + "-qmin", "18", "-qmax", "38", "-g:v", str(VIDEO_GOP), + "-fflags", "+genpts", "-shortest" )