diff --git a/config/config.ini b/config/config.ini index c1264d1..7ff3a2a 100644 --- a/config/config.ini +++ b/config/config.ini @@ -8,7 +8,7 @@ language(zh_cn/en) = zh_cn 保存文件名是否包含标题 = 否 是否去除名称中的表情符号 = 是 视频保存格式ts|mkv|flv|mp4|mp3音频|m4a音频 = ts -原画|超清|高清|标清|流畅 = 超清 +原画|超清|高清|标清|流畅 = 原画 是否使用代理ip(是/否) = 否 代理地址 = 同一时间访问网络的线程数 = 3 diff --git a/main.py b/main.py index 92615b7..d6e9ce6 100644 --- a/main.py +++ b/main.py @@ -1688,14 +1688,10 @@ def start_record(url_data: tuple, count_variable: int = -1) -> None: MAX_RETRY_DELAY = 90 INITIAL_RETRY_DELAY = 3 - # NO_FRAME_TIMEOUT = 120 - # START_CHECK_AFTER = 25 - # STALE_OUTPUT_SECONDS = 40 + NO_FRAME_TIMEOUT = 120 + START_CHECK_AFTER = 25 + STALE_OUTPUT_SECONDS = 40 - START_CHECK_AFTER = 15 - STALE_OUTPUT_SECONDS = 90 # 改这一行就解决 99% 的“新配置不行” - NO_FRAME_TIMEOUT = 180 - STDERR_QUEUE_TIMEOUT = 1.0 END_KEYWORDS = [ "connection reset by peer", @@ -1737,41 +1733,22 @@ def start_record(url_data: tuple, count_variable: int = -1) -> None: "Origin: https://live.douyin.com\r\n" ) ffmpeg_command = [ - "ffmpeg", "-y", "-loglevel", "info", "-nostdin", "-re", - "-rw_timeout", "30000000", + "ffmpeg", "-loglevel", "info", + "-rw_timeout", "15000000", "-reconnect", "1", "-reconnect_at_eof", "1", "-reconnect_streamed", "1", - "-reconnect_delay_max", "5", - - "-fflags", "+genpts+discardcorrupt+nobuffer+flush_packets", - "-flags", "low_delay", + "-reconnect_delay_max", "15", + "-fflags", "+genpts+discardcorrupt", "-err_detect", "ignore_err", - "-max_delay", "80000", # 0.08s 缓冲,speed 必爆 - "-thread_queue_size", "2048", # 最小队列,dup 近 0 - + "-thread_queue_size", "8192", "-headers", douyin_headers, "-i", real_url, - - # 真 1080p 竖屏(左右各 36px 黑边,几乎无感) - "-vf", "scale=1080:1920:force_original_aspect_ratio=decrease:flags=lanczos,pad=1080:1920:(ow-iw)/2:(oh-ih)/2:black", - - "-c:v", "libx264", - "-preset", "superfast", # 4.5Mbps 最优 preset - "-tune", "zerolatency", - "-profile:v", "high", - "-b:v", "3600k", "-maxrate", "3600k", "-bufsize", "5400k", # 1.5× 超保守 CBR - "-g", "60", "-keyint_min", "50", - "-r", "30", - "-bf", "0", - "-sc_threshold", "0", - "-nal-hrd", "cbr", - "-x264-params", "vbv-maxrate=3600:vbv-bufsize=5400:nal-hrd=cbr:force-cfr=1:scenecut=0", - "-pix_fmt", "yuv420p", - - "-c:a", "aac", "-b:a", "96k", "-ar", "44100", "-ac", "2", + "-vf", "scale=720:1280:force_original_aspect_ratio=decrease,pad=720:1280:(ow-iw)/2:(oh-ih)/2:black", + "-c:v", codec_v, "-preset", preset_v, *tune_param, + "-b:v", "2500k", "-maxrate", "2500k", "-bufsize", "5000k", + "-g", "50", "-r", "25", "-pix_fmt", "yuv420p", + "-c:a", "aac", "-b:a", "128k", "-ar", "44100", "-ac", "2", "-af", "aresample=async=1:first_pts=0", - "-flags", "+global_header", - "-flvflags", "no_duration_filesize", "-f", "flv", youtube_rtmp ]