From a5bc9a3ea6daab34c4dd42e56f93971bd5f191c4 Mon Sep 17 00:00:00 2001 From: CI Bot Date: Thu, 20 Aug 2026 02:54:23 +0000 Subject: [PATCH] style: auto-format with black + isort + prettier [skip ci-format-check] --- .../pages/generate/hooks/useCanvasPlayer.ts | 4 +- apps/worker/worker_app/tasks/ingest.py | 72 ++++++++++--------- 2 files changed, 40 insertions(+), 36 deletions(-) diff --git a/apps/web/src/pages/generate/hooks/useCanvasPlayer.ts b/apps/web/src/pages/generate/hooks/useCanvasPlayer.ts index 24b0868b1..890061b32 100644 --- a/apps/web/src/pages/generate/hooks/useCanvasPlayer.ts +++ b/apps/web/src/pages/generate/hooks/useCanvasPlayer.ts @@ -539,7 +539,9 @@ export function useCanvasPlayer( try { await Promise.race([ decoder.flush(), - new Promise((_, reject) => setTimeout(() => reject(new Error("flush timeout 10s")), 10_000)), + new Promise((_, reject) => + setTimeout(() => reject(new Error("flush timeout 10s")), 10_000), + ), ]) console.log(`[useCanvasPlayer] Segment ${meta.assetId}: flush complete`) } catch (e) { diff --git a/apps/worker/worker_app/tasks/ingest.py b/apps/worker/worker_app/tasks/ingest.py index 3f1f50e6c..1b3e2c28d 100755 --- a/apps/worker/worker_app/tasks/ingest.py +++ b/apps/worker/worker_app/tasks/ingest.py @@ -237,60 +237,62 @@ def ingest_asset(job_id: str) -> dict: # ── HEVC 自动转码为 1080p H.264 ────────────────────────────── # 浏览器 WebCodecs 硬件解码 HEVC 输出黑帧，上传时自动转码 # 失败时降级使用原始文件，不阻塞上传流程 - if ( - media_type == "video" - and extract_success - and local_file - and local_file.exists() - ): + if media_type == "video" and extract_success and local_file and local_file.exists(): codec = (metadata.get("codec") or "").lower() if codec in ("hevc", "h265", "hvh1"): logger.info( "检测到 HEVC 编码 (codec=%s)，启动转码: job_id=%s", - codec, job_id, + codec, + job_id, ) _tc_tmp = None try: _tc_tmp = Path(tempfile.mktemp(suffix="_h264.mp4")) _cmd = [ - "ffmpeg", "-y", - "-i", str(local_file), - "-c:v", "libx264", - "-preset", "fast", - "-crf", "18", + "ffmpeg", + "-y", + "-i", + str(local_file), + "-c:v", + "libx264", + "-preset", + "fast", + "-crf", + "18", "-vf", "scale='if(gt(ih,1080),-2,iw)':'if(gt(ih,1080),1080,ih)'", - "-pix_fmt", "yuv420p", - "-c:a", "aac", - "-b:a", "128k", - "-movflags", "+faststart", + "-pix_fmt", + "yuv420p", + "-c:a", + "aac", + "-b:a", + "128k", + "-movflags", + "+faststart", str(_tc_tmp), ] _proc = subprocess.run( - _cmd, capture_output=True, text=True, timeout=300, + _cmd, + capture_output=True, + text=True, + timeout=300, ) - if ( - _proc.returncode == 0 - and _tc_tmp.exists() - and _tc_tmp.stat().st_size > 0 - ): + if _proc.returncode == 0 and _tc_tmp.exists() and _tc_tmp.stat().st_size > 0: from video_processing.oss_helpers import upload_to_oss _p = Path(job.storage_key) - _new_key = str( - _p.parent / (_p.stem + "_h264" + _p.suffix) - ) + _new_key = str(_p.parent / (_p.stem + "_h264" + _p.suffix)) _url = upload_to_oss(_tc_tmp, _new_key) if _url: job.storage_key = _new_key - metadata, extract_success = ( - extract_media_metadata( - str(_tc_tmp), media_type, - ) + metadata, extract_success = extract_media_metadata( + str(_tc_tmp), + media_type, ) logger.info( "HEVC→H.264 转码完成: job_id=%s key=%s", - job_id, _new_key[:80], + job_id, + _new_key[:80], ) else: logger.warning( @@ -298,12 +300,11 @@ def ingest_asset(job_id: str) -> dict: job_id, ) else: - _tail = ( - _proc.stderr[-300:] if _proc.stderr else "" - ) + _tail = _proc.stderr[-300:] if _proc.stderr else "" logger.warning( "FFmpeg 转码失败 rc=%s，降级原始文件: job_id=%s", - _proc.returncode, job_id, + _proc.returncode, + job_id, ) except subprocess.TimeoutExpired: logger.warning( @@ -313,7 +314,8 @@ def ingest_asset(job_id: str) -> dict: except Exception as _e: logger.warning( "HEVC 转码异常（降级原始文件）: job_id=%s err=%s", - job_id, _e, + job_id, + _e, ) finally: if _tc_tmp and _tc_tmp.exists():