feat: per-stream resolution config with global fallback

Author: NieMoOxO

config.example.yaml

@@ -8,11 +8,14 @@ rtsp:
   streams:
     - name: "cam1"
       url: "rtsp://admin:password@192.168.1.100:554/ch1"
+      # resolution: "1920x1080"  # 可選：此串流的輸出解析度（留空用全域設定）
     - name: "cam2"
       url: "rtsp://admin:password@192.168.1.100:554/ch2"
+      resolution: "1280x720"  # 此串流強制縮放至 720p
     # 可自由新增更多串流：
     # - name: "cam3"
     #   url: "rtsp://10.8.60.55:8553/cam3"
+    #   resolution: "original"  # 保持原始解析度
   segment_duration: 600  # 每段錄製時長（秒）
 
 # ============================================================================
@@ -27,6 +30,7 @@ schedule:
 # ============================================================================
 output:
   dir: "~/rtsp-recorder/videos"  # 輸出目錄
+  resolution: "1920x1080"  # 全域預設解析度（個別串流未設定時使用）
 
 # ============================================================================
 # GCS 上傳設定

rust/crates/recorder/src/recorder.rs

@@ -194,7 +194,8 @@ async fn background_converter(
     stats: Arc<Mutex<Stats>>,
     mut shutdown: broadcast::Receiver<()>,
     ff: FfmpegPaths,
-    resolution: String,
+    streams: Vec<StreamConfig>,
+    default_resolution: String,
 ) {
     let mut interval = tokio::time::interval(tokio::time::Duration::from_secs(30));
 
@@ -212,6 +213,16 @@ async fn background_converter(
                                 use std::os::unix::fs::PermissionsExt;
                                 let _ = std::fs::set_permissions(&path, std::fs::Permissions::from_mode(0o644));
                             }
+                            // 從檔名取得 stream name，查找對應的解析度設定
+                            let resolution = path.file_stem()
+                                .and_then(|s| s.to_str())
+                                .and_then(|name| name.split('_').next())
+                                .and_then(|stream_name| {
+                                    streams.iter()
+                                        .find(|s| s.name == stream_name)
+                                        .and_then(|s| s.resolution.clone())
+                                })
+                                .unwrap_or_else(|| default_resolution.clone());
                             // 檢查檔案是否正在寫入（修改時間 > 10 秒前）
                             if let Ok(metadata) = path.metadata() {
                                 if let Ok(modified) = metadata.modified() {
@@ -258,9 +269,10 @@ pub async fn run_daemon(config: &Config, stats: Arc<Mutex<Stats>>, ff: &FfmpegPa
     let converter_shutdown = shutdown_tx.subscribe();
     let output_dir = config.output.dir.clone();
     let converter_ff = ff.clone();
-    let converter_resolution = config.output.resolution.clone();
+    let converter_streams = config.rtsp.streams.clone();
+    let converter_default_resolution = config.output.resolution.clone();
     tokio::spawn(async move {
-        background_converter(output_dir, converter_stats, converter_shutdown, converter_ff, converter_resolution).await;
+        background_converter(output_dir, converter_stats, converter_shutdown, converter_ff, converter_streams, converter_default_resolution).await;
         tracing::error!("[轉檔] 背景任務意外結束");
     });
 

rust/crates/shared/src/config.rs

@@ -26,6 +26,9 @@ pub struct RtspConfig {
 pub struct StreamConfig {
     pub name: String,
     pub url: String,
+    /// 此串流的輸出解析度（可選，留空使用全域設定）
+    #[serde(default)]
+    pub resolution: Option<String>,
 }
 
 #[derive(Debug, Clone, Deserialize)]