From 9107995c023528b2a9bde34875e2822002736815 Mon Sep 17 00:00:00 2001 From: eric Date: Sun, 28 Dec 2025 08:20:11 -0600 Subject: [PATCH] ';s' --- main.py | 126 ++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 108 insertions(+), 18 deletions(-) diff --git a/main.py b/main.py index 0873abf..862ccca 100644 --- a/main.py +++ b/main.py @@ -1845,44 +1845,90 @@ def start_record(url_data: tuple, count_variable: int = -1) -> None: + # ffplay 预览命令（全屏显示到 HDMI） + ffplay_cmd = [ + "ffplay", + "-f", "flv", # 输入格式必须匹配 ffmpeg 的 -f flv + "-fflags", "nobuffer", + "-flags", "low_delay", + "-framedrop", + "-vf", "transpose=2,colorspace=all=bt709:iall=bt709," + "eq=gamma_r=0.95:gamma_g=1.0:gamma_b=1.05:" + "brightness=0.03:saturation=0.85:contrast=1.05", # 您喜欢的调色滤镜 + "-fs", # 全屏 + "-autoexit", # 流结束自动退出 + "-threads", "6", + "-" # 从标准输入（管道）读取 + ] # 1080p 输出到 HDMI + # 主 FFmpeg 命令 —— 仅负责拉流、转码、输出到 pipe（供 ffplay HDMI 显示） ffmpeg_command = [ - "ffmpeg", "-y", "-loglevel", "info", "-nostdin", "-re", + "ffmpeg", + "-y", + "-loglevel", "info", + "-nostdin", + "-re", + "-stats", "-stats_period", "1", + + # 抖音源重连参数 "-rw_timeout", "30000000", - "-reconnect", "1", "-reconnect_at_eof", "1", "-reconnect_streamed", "1", - "-reconnect_delay_max", "5", + "-reconnect", "1", + "-reconnect_at_eof", "1", + "-reconnect_streamed", "1", + "-reconnect_delay_max", "10", + + # 低延迟输入 flags "-fflags", "+genpts+discardcorrupt+nobuffer+flush_packets", "-flags", "low_delay", "-err_detect", "ignore_err", - "-max_delay", "80000", - "-thread_queue_size", "2048", + # 输入 headers（抖音必备） "-headers", douyin_headers, "-i", real_url, - "-vf","fps=30,scale=1080:1920:force_original_aspect_ratio=decrease:flags=lanczos,pad=1080:1920:(ow-iw)/2:(oh-ih)/2:black", - "-c:v", "libx264", - "-preset", "veryfast", - "-tune", "zerolatency", + + # ==================== 视频处理 ==================== + # 强制 30fps + 1080p（竖屏居中补黑边） + "-vf", "fps=30,scale=1080:1920:force_original_aspect_ratio=decrease:flags=lanczos," + "pad=1080:1920:(ow-iw)/2:(oh-ih)/2:black", + + # ==================== 编码参数 ==================== + "-c:v", codec_v, # libx264 或 h264_nvenc（已在前文检测） + "-preset", preset_v, # veryfast 或 p5 + *tune_param, # zerolatency 或 NVENC 参数 + "-profile:v", "high", - "-b:v", "5200k", "-maxrate", "5800k", "-bufsize", "10400k", - "-vsync", "cfr", - "-g", "60", "-keyint_min", "60", + "-b:v", "5200k", + "-maxrate", "5800k", + "-bufsize", "10400k", + "-g", "60", + "-keyint_min", "60", "-r", "30", + "-vsync", "cfr", "-bf", "0", "-sc_threshold", "0", - "-x264-params","force-cfr=1:scenecut=0:open_gop=0:sync-lookahead=0", + "-x264-params", "force-cfr=1:scenecut=0:open_gop=0:sync-lookahead=0", "-pix_fmt", "yuv420p", - "-c:a", "aac", "-b:a", "128k", "-ar", "44100", "-ac", "2", + + # ==================== 音频 ==================== + "-c:a", "aac", + "-b:a", "128k", + "-ar", "44100", + "-ac", "2", "-af", "aresample=async=1:first_pts=0", - # HDMI 输出，SDL 会直接开窗口显示 - "-f", "sdl", "HDMI" + # ==================== 输出格式 ==================== + "-flags", "+global_header", + "-flvflags", "no_duration_filesize", + + "-f", "flv", # 格式必须是 flv，ffplay 读取最稳定 + "pipe:1" # 直接输出到标准输出（管道），供 ffplay 读取 ] # ---- 单层重试循环（清晰可控） ---- proc = None + ffplay_proc = None # <--- 新增这一行 stderr_q = None reader_t = None retry_delay = INITIAL_RETRY_DELAY @@ -1893,6 +1939,14 @@ def start_record(url_data: tuple, count_variable: int = -1) -> None: if retry_delay > INITIAL_RETRY_DELAY: print(f"[WARN] 防风控等待 {retry_delay}s 后重新连接抖音源...") time.sleep(retry_delay) + # 清理旧的 ffplay 进程（防止残留） + if ffplay_proc and ffplay_proc.poll() is None: + try: + ffplay_proc.stdin.close() + ffplay_proc.wait(timeout=3) + except: + ffplay_proc.terminate() + ffplay_proc = None # 重置为 None # 每次重连前先清理上一次的进程/线程 try: @@ -1904,11 +1958,33 @@ def start_record(url_data: tuple, count_variable: int = -1) -> None: stderr_q = None stderr_q = queue.Queue() - print(f"[INFO][{datetime.datetime.now():%H:%M:%S}] 启动 YouTube 推流 → {stream_title}") + # 油管直播 + # print(f"[INFO][{datetime.datetime.now():%H:%M:%S}] 启动 YouTube 推流 → {stream_title}") + # proc = subprocess.Popen( + # ffmpeg_command, + # stdin=subprocess.DEVNULL, + # stdout=subprocess.DEVNULL, + # stderr=subprocess.PIPE, + # text=True, + # bufsize=1, + # universal_newlines=True + # ) + + # HDMI直播 + print(f"[INFO][{datetime.datetime.now():%H:%M:%S}] 启动抖音拉流 → HDMI 全屏显示") + + # 先启动 ffplay，准备接收管道数据 + ffplay_proc = subprocess.Popen( + ffplay_cmd, + stdin=subprocess.PIPE, + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL + ) + # 再启动 ffmpeg，把输出直接连到 ffplay 的输入 proc = subprocess.Popen( ffmpeg_command, stdin=subprocess.DEVNULL, - stdout=subprocess.DEVNULL, + stdout=ffplay_proc.stdin, # <--- 关键：管道直连 ffplay stderr=subprocess.PIPE, text=True, bufsize=1, @@ -1933,6 +2009,14 @@ def start_record(url_data: tuple, count_variable: int = -1) -> None: if time.time() - getattr(proc, "last_out_ts", time.time()) > STALE_OUTPUT_SECONDS: print("[WARN] 长时间无任何日志，强制重启进程") cleanup_proc(proc) + # 关闭 ffplay 进程 + if ffplay_proc and ffplay_proc.poll() is None: + try: + ffplay_proc.stdin.close() # 关闭管道输入，让 ffplay 自然退出 + ffplay_proc.wait(timeout=5) + except: + ffplay_proc.terminate() + ffplay_proc = None # <--- 加这行 break continue @@ -2034,6 +2118,12 @@ def start_record(url_data: tuple, count_variable: int = -1) -> None: clear_record_info(record_name, record_url) except Exception: pass + # 新增 + if 'ffplay_proc' in locals() and ffplay_proc and ffplay_proc.poll() is None: + try: + ffplay_proc.terminate() + except: + pass color_obj.print_colored(f"[{record_name}] YouTube 推流异常退出但已清理\n", color_obj.RED) return