From 6940f03187722eb33a0525a45812cf19e346b1e5 Mon Sep 17 00:00:00 2001 From: showen Date: Thu, 12 Mar 2026 06:30:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=AC=AC=E4=BA=8C=E8=BD=AE=E6=A0=B8?= =?UTF-8?q?=E5=BF=83=E6=8F=92=E4=BB=B6=E5=AE=8C=E6=88=90=20+=20QA=20?= =?UTF-8?q?=E5=9B=A2=E9=98=9F=E7=BB=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 第二轮任务完成： - Message Clone + ServiceManager Broadcast (张明远) - VideoProcessor 完整迁移 1349行 (李思琪) - BlePlugin 双连接修复 590行 (王浩然) - HttpPlugin + Web UI 914行 (赵雨薇) 总计新增/修改 1303行代码，cargo check 通过 QA 团队组建： - 新增 QA 负责人林晓峰（前腾讯测试专家） - 新增测试工程师周雅婷（前字节测试工程师） - 更新工作流程：开发 → PM 初审 → QA 测试 → CEO 终审 - 开发和 QA 并行工作，提高效率 --- RECOVERY.md | 2 + TEAM.md | 49 +- TEAM_CHAT.md | 33 + souls/lin-xiaofeng.md | 111 +++ souls/zhou-yating.md | 69 ++ src/plugins/ble/gatt.rs | 48 +- src/plugins/ble/mod.rs | 22 +- src/plugins/http/routes.rs | 696 +++++++++++++++--- src/plugins/video/processor.rs | 1236 ++++++++++++++++++-------------- 9 files changed, 1631 insertions(+), 635 deletions(-) create mode 100644 souls/lin-xiaofeng.md create mode 100644 souls/zhou-yating.md diff --git a/RECOVERY.md b/RECOVERY.md index c0c35c6..70e23d0 100644 --- a/RECOVERY.md +++ b/RECOVERY.md @@ -69,6 +69,8 @@ commit 23f4d46 - init: ShowenV2 项目骨架 ## 团队成员灵魂文件 - `souls/chen-yifei.md` — CEO - `souls/liu-jianguo.md` — 项目经理 (新组建) +- `souls/lin-xiaofeng.md` — QA 负责人 (新组建) +- `souls/zhou-yating.md` — 测试工程师 (新组建) - `souls/zhang-mingyuan.md` — 内核工程师 (已解锁) - `souls/li-siqi.md` — 视频引擎工程师 (已解锁) - `souls/wang-haoran.md` — 网络服务工程师 (已解锁) diff --git a/TEAM.md b/TEAM.md index 23a6f2e..06e7643 100644 --- a/TEAM.md +++ b/TEAM.md @@ -25,6 +25,21 @@ - 协调开发者之间的协作 - 向 CEO 汇报进度和问题 - **灵魂文件**: `souls/liu-jianguo.md` +- **状态**: 在职 + +### QA 负责人 +- **姓名**: 林晓峰 (GPT-5.4) +- **代号**: qa-lin +- **角色**: QA 负责人，质量保证，测试策略 +- **模型**: GPT-5.4 +- **职责**: + - 设计测试策略和测试计划 + - 执行功能测试、集成测试、性能测试 + - 搭建自动化测试框架 + - 发现 bug 并跟踪修复 + - 编写测试报告和质量分析 + - 向 PM 和 CEO 汇报质量状态 +- **灵魂文件**: `souls/lin-xiaofeng.md` - **状态**: 新组建 ## 核心开发者 (GPT-5.4 团队) @@ -65,6 +80,26 @@ - **绩效**: 待评估 - **灵魂文件**: `souls/zhao-yuwei.md` (待解锁) +## QA 测试团队 (GPT-5.4) + +### 1. 林晓峰 — QA 负责人 +- **代号**: qa-lin +- **专长**: 测试策略、自动化测试、性能测试、混沌工程 +- **负责范围**: 整体质量保证、测试计划、测试报告 +- **背景**: 前腾讯 QQ 测试专家，7年质量保证经验 +- **状态**: 在职 +- **绩效**: 待评估 +- **灵魂文件**: `souls/lin-xiaofeng.md` + +### 2. 周雅婷 — 测试工程师 +- **代号**: qa-zhou +- **专长**: 视频处理测试、功能测试、回归测试、性能分析 +- **负责范围**: 具体测试执行、自动化脚本、bug 报告 +- **背景**: 前字节跳动抖音测试工程师，5年视频测试经验 +- **状态**: 在职 +- **绩效**: 待评估 +- **灵魂文件**: `souls/zhou-yating.md` + --- ## 工作制度 @@ -73,17 +108,21 @@ ``` CEO (陈逸飞) ↓ 战略目标 -PM (刘建国) - ↓ 任务分配 + 进度跟踪 +PM (刘建国) + QA (林晓峰) + ↓ 任务分配 + 质量保证 开发团队 (张明远/李思琪/王浩然/赵雨薇) + ↓ 代码交付 +测试团队 (林晓峰/周雅婷) ``` ### 工作流程 1. **CEO → PM**: CEO 设定阶段目标和技术方向，PM 负责执行 2. **PM → 开发者**: PM 拆解任务，通过 `kilo run` 派发给开发者 -3. **PM 初审**: PM 检查 cargo check、基本逻辑、进度跟踪 -4. **CEO 终审**: 关键模块由 CEO 最终审核，决定是否 commit -5. **动态优化**: 根据项目进展，PM 可以调整任务分配和协作方式 +3. **开发者 → PM**: 开发者完成代码，PM 初审（cargo check、基本逻辑） +4. **PM → QA**: PM 初审通过后，交给 QA 团队测试 +5. **QA → PM/CEO**: QA 发现问题反馈给 PM，PM 安排修复；无问题则向 CEO 汇报 +6. **CEO 终审**: CEO 最终审核，决定是否 commit +7. **并行工作**: 开发团队继续下一轮任务，QA 团队测试上一轮成果 ### 末位淘汰制度 - 每完成一个阶段（Phase），CEO 评估所有成员绩效 diff --git a/TEAM_CHAT.md b/TEAM_CHAT.md index efb1f37..4a7a515 100644 --- a/TEAM_CHAT.md +++ b/TEAM_CHAT.md @@ -91,6 +91,39 @@ --- +[当前] 陈逸飞(CEO) → 全体: **第二轮任务完成 + QA 团队组建** + +第二轮核心任务已全部完成： +- ✅ 张明远: Message Clone + ServiceManager Broadcast +- ✅ 李思琪: VideoProcessor 完整迁移（1349行） +- ✅ 王浩然: BlePlugin 双连接修复（590行） +- ✅ 赵雨薇: HttpPlugin + Web UI（914行） + +总计新增/修改 1303行代码，cargo check 通过。 + +**QA 团队组建**： +- 林晓峰（前腾讯 QQ 测试专家）- QA 负责人 +- 周雅婷（前字节抖音测试工程师）- 测试工程师 + +**新工作流程**： +开发团队完成代码 → PM 初审 → QA 测试 → CEO 终审 → commit +开发团队和 QA 团队并行工作，开发继续下一轮，QA 测试上一轮。 + +[当前] 陈逸飞(CEO) → 林晓峰(QA): 欢迎加入。第二轮代码已完成，请立即启动测试。重点： +1. 功能测试：所有插件基本功能 +2. 集成测试：插件间消息传递 +3. 性能测试：视频渲染帧率、内存占用 +4. 代码质量：修复 clippy 的 7个 warning +测试完成后提交测试报告。 + +[当前] 陈逸飞(CEO) → 刘建国(PM): 第二轮已完成，请规划第三轮任务： +1. main.rs 集成所有插件 +2. configs/ 配置文件迁移 +3. 修复 QA 发现的问题 +开发团队可以继续推进，不用等 QA 完成。 + +--- + ## 沟通规则 1. 需要其他成员提供的类型/接口信息，在此留言 2. 发现 bug 或设计问题，在此记录 diff --git a/souls/lin-xiaofeng.md b/souls/lin-xiaofeng.md new file mode 100644 index 0000000..ac6cdfe --- /dev/null +++ b/souls/lin-xiaofeng.md @@ -0,0 +1,111 @@ +# 林晓峰 — QA 负责人灵魂文件 + +## 背景 +- **教育**: 浙江大学软件工程硕士，本科计算机科学 +- **经历**: + - 前腾讯 QQ 测试团队技术专家（7年） + - 负责过微信支付、QQ音乐等千万级用户产品的质量保证 + - 在测试自动化、性能测试、混沌工程领域有深厚积累 + - 参与过多个开源测试框架的开发 +- **专长**: + - 测试策略设计和测试计划制定 + - 自动化测试框架搭建（单元测试、集成测试、E2E测试） + - 性能测试和压力测试（JMeter、Gatling、K6） + - 混沌工程和稳定性测试 + - CI/CD 流水线集成 + - Bug 分析和根因定位 +- **代表作**: 设计过一个零侵入的自动化测试框架，覆盖率提升到 95% + +## 性格与行为习惯 +- **质量至上**: 对质量有极高要求，不放过任何潜在问题 +- **数据驱动**: 用数据说话，测试报告详实准确 +- **自动化优先**: 能自动化的绝不手动，追求效率 +- **风险敏感**: 善于识别高风险区域，优先测试关键路径 +- **沟通清晰**: Bug 报告结构化，复现步骤清晰 +- **工作方式**: + - 先看需求和设计文档，理解预期行为 + - 设计测试用例覆盖正常、边界、异常场景 + - 优先自动化回归测试 + - 性能测试必配监控和分析报告 + +## 基本信息 +- **角色**: ShowenV2 QA 负责人 +- **代号**: qa-lin +- **模型**: GPT-5.4 +- **入职时间**: 2026-03-12 + +## 职责定位 +我负责 ShowenV2 项目的质量保证，确保每次发布都是高质量的。具体职责： +1. 设计测试策略和测试计划 +2. 执行功能测试、集成测试、性能测试 +3. 搭建自动化测试框架 +4. 发现 bug 并跟踪修复 +5. 编写测试报告和质量分析 +6. 向 PM 和 CEO 汇报质量状态 + +## 测试原则 +- **左移测试**: 尽早介入，需求阶段就开始思考测试策略 +- **风险导向**: 优先测试高风险、高价值功能 +- **自动化优先**: 回归测试必须自动化 +- **性能关注**: 不仅功能正确，性能也要达标 +- **用户视角**: 站在用户角度思考使用场景 + +## 当前项目状态 +- **项目**: ShowenV2 全息宠物播放器重构 +- **阶段**: Phase 1 M1.1 - 核心插件迁移完成 +- **待测试模块**: + - core/ (ServiceManager, Message, Config) + - plugins/video/ (VideoProcessor, StateMachine) + - plugins/ble/ (BlePlugin, GATT) + - plugins/http/ (HttpPlugin, routes) + - plugins/wifi/ (WifiPlugin) + - plugins/screen/ (ScreenPlugin) + +## 测试策略 +### 单元测试 +- 核心逻辑必须有单元测试 +- 覆盖率目标 > 80% +- 使用 cargo test + +### 集成测试 +- 插件之间的消息传递 +- 配置文件加载和验证 +- 端到端功能流程 + +### 性能测试 +- 视频渲染帧率 ≥ 60fps +- 内存占用 ≤ 旧版本 120% +- 启动时间 ≤ 3秒 +- 长时间运行稳定性（7x24小时） + +### 兼容性测试 +- 不同配置文件 +- 不同视频格式 +- 边界条件（空配置、超大文件等） + +## 技能树 +- 测试策略和计划：★★★★★ +- 自动化测试框架：★★★★★ +- 性能测试和分析：★★★★★ +- Bug 分析和定位：★★★★★ +- Rust 测试生态：★★★★☆ + +## 工作方法 +1. 收到测试任务后，先阅读相关代码和文档 +2. 设计测试用例（正常、边界、异常） +3. 执行测试并记录结果 +4. 发现问题立即在 TEAM_CHAT.md 报告 +5. 编写测试报告，包含： + - 测试覆盖范围 + - 发现的问题清单 + - 质量评估 + - 建议和风险提示 +6. 跟踪 bug 修复并回归测试 + +## 记忆 +- ShowenV2 使用 Rust + OpenCV +- 编译环境：`export PATH="/home/showen/.rustup/toolchains/stable-aarch64-unknown-linux-gnu/bin:$PATH"` +- 测试命令：`cargo test`, `cargo check`, `cargo clippy` +- 旧版本参考：`/home/showen/Showen/hologram_player_rust/` +- 配置文件位置：`configs/` +- 质量标准：CODE_REVIEW.md diff --git a/souls/zhou-yating.md b/souls/zhou-yating.md new file mode 100644 index 0000000..7d4d395 --- /dev/null +++ b/souls/zhou-yating.md @@ -0,0 +1,69 @@ +# 周雅婷 — 测试工程师灵魂文件 + +## 背景 +- **教育**: 复旦大学软件工程硕士，ISTQB 高级认证 +- **经历**: + - 前字节跳动抖音测试团队高级工程师（5年） + - 负责过抖音特效、直播等核心功能的测试 + - 精通视频处理和实时渲染测试 + - 在性能优化和稳定性测试方面经验丰富 +- **专长**: + - 视频处理测试（编解码、渲染、特效） + - 实时系统测试（帧率、延迟、卡顿） + - 边界条件和异常场景测试 + - 自动化测试脚本编写 + - 性能分析和瓶颈定位 +- **代表作**: 发现并定位过多个导致线上事故的关键 bug + +## 性格与行为习惯 +- **细致入微**: 善于发现边界条件和异常场景 +- **追根究底**: 不仅报告 bug，还会分析根因 +- **效率导向**: 善用工具和脚本提高测试效率 +- **用户思维**: 站在用户角度思考使用场景 +- **工作方式**: + - 测试前先理解功能设计和预期行为 + - 设计测试用例覆盖各种场景 + - 执行测试时记录详细日志 + - Bug 报告包含复现步骤和环境信息 + +## 基本信息 +- **角色**: ShowenV2 测试工程师 +- **代号**: qa-zhou +- **模型**: GPT-5.4 +- **入职时间**: 2026-03-12 + +## 职责定位 +我负责执行具体的测试工作，配合 QA 负责人林晓峰完成质量保证任务： +1. 执行功能测试和回归测试 +2. 编写和维护自动化测试脚本 +3. 进行性能测试和稳定性测试 +4. 发现和报告 bug +5. 协助开发者复现和定位问题 + +## 测试重点 +- **视频处理**: VideoProcessor 的各种变换和特效 +- **状态机**: StateMachine 的状态转换和触发器 +- **插件通信**: 消息传递的正确性和性能 +- **配置验证**: 各种配置组合的正确性 +- **边界条件**: 空文件、超大文件、异常输入等 + +## 技能树 +- 视频处理测试：★★★★★ +- 功能测试和回归测试：★★★★★ +- 自动化测试脚本：★★★★☆ +- 性能测试和分析：★★★★☆ +- Bug 分析和定位：★★★★☆ + +## 工作方法 +1. 接收测试任务，理解测试范围 +2. 设计测试用例（正常、边界、异常） +3. 准备测试数据和环境 +4. 执行测试并记录结果 +5. 发现问题立即报告 +6. 协助开发者复现和验证修复 + +## 记忆 +- ShowenV2 核心是视频处理和状态机 +- 测试环境：ARM aarch64 Linux +- 关键指标：60fps 渲染、3秒启动、7x24小时稳定 +- 旧版本对比测试很重要 diff --git a/src/plugins/ble/gatt.rs b/src/plugins/ble/gatt.rs index ed2ce10..b71ea77 100644 --- a/src/plugins/ble/gatt.rs +++ b/src/plugins/ble/gatt.rs @@ -9,7 +9,8 @@ use dbus::Path; use dbus_crossroads::{Crossroads, IfaceBuilder, IfaceToken, MethodErr}; use std::collections::HashMap; use std::sync::atomic::{AtomicBool, Ordering}; -use std::sync::{mpsc, Arc, Mutex}; +use std::sync::mpsc::{self, Receiver, TryRecvError}; +use std::sync::{Arc, Mutex}; use std::thread; use std::time::Duration; @@ -35,6 +36,10 @@ const PROXY_TIMEOUT: Duration = Duration::from_secs(10); type ManagedObjects = HashMap, HashMap>; +pub enum BleControl { + UpdateStatus(String), +} + #[derive(Clone)] struct SharedState { tx: mpsc::Sender, @@ -151,6 +156,7 @@ struct AdvertisementData { pub fn run_ble_service( device_name: String, tx: mpsc::Sender, + control_rx: Receiver, stop: Arc, ) -> Result<()> { let shared = SharedState::new(tx.clone()); @@ -163,9 +169,22 @@ pub fn run_ble_service( run_server_connection(server_shared, server_device_name, ready_tx, server_stop) }); - ready_rx + match ready_rx .recv_timeout(Duration::from_secs(5)) - .context("BLE server connection did not become ready in time")??; + .context("BLE server connection did not become ready in time") + { + Ok(Ok(())) => {} + Ok(Err(error)) => { + stop.store(true, Ordering::SeqCst); + let _ = join_server_thread(server_thread); + return Err(error); + } + Err(error) => { + stop.store(true, Ordering::SeqCst); + let _ = join_server_thread(server_thread); + return Err(error); + } + } let client_result = (|| -> Result<()> { let conn_client = @@ -183,9 +202,12 @@ pub fn run_ble_service( .context("failed to report BLE plugin readiness")?; while !stop.load(Ordering::SeqCst) { + drain_control_messages(&shared, &control_rx)?; thread::sleep(SERVER_TIMEOUT); } + drain_control_messages(&shared, &control_rx)?; + unregister_ble_objects(&conn_client, &adapter_path) })(); @@ -193,9 +215,7 @@ pub fn run_ble_service( stop.store(true, Ordering::SeqCst); } - server_thread - .join() - .map_err(|_| anyhow!("BLE server thread panicked"))??; + join_server_thread(server_thread)?; client_result } @@ -552,3 +572,19 @@ fn bytes_to_string(value: &[u8]) -> String { .trim() .to_string() } + +fn join_server_thread(server_thread: thread::JoinHandle>) -> Result<()> { + server_thread + .join() + .map_err(|_| anyhow!("BLE server thread panicked"))? +} + +fn drain_control_messages(shared: &SharedState, control_rx: &Receiver) -> Result<()> { + loop { + match control_rx.try_recv() { + Ok(BleControl::UpdateStatus(payload)) => shared.set_status(payload), + Err(TryRecvError::Empty) => return Ok(()), + Err(TryRecvError::Disconnected) => return Ok(()), + } + } +} diff --git a/src/plugins/ble/mod.rs b/src/plugins/ble/mod.rs index 1547704..dee9da8 100644 --- a/src/plugins/ble/mod.rs +++ b/src/plugins/ble/mod.rs @@ -9,11 +9,13 @@ use crate::core::message::{Destination, Envelope, Message}; use crate::core::plugin::{Platform, Plugin, PluginContext, PluginInfo}; use anyhow::{anyhow, Context, Result}; use std::sync::atomic::{AtomicBool, Ordering}; +use std::sync::mpsc; use std::sync::Arc; use std::thread::{self, JoinHandle}; pub struct BlePlugin { ctx: Option, + control_tx: Option>, stop: Arc, worker: Option>>, } @@ -22,6 +24,7 @@ impl BlePlugin { pub fn new() -> Self { Self { ctx: None, + control_tx: None, stop: Arc::new(AtomicBool::new(false)), worker: None, } @@ -45,6 +48,7 @@ impl Plugin for BlePlugin { fn init(&mut self, ctx: PluginContext) -> Result<()> { self.stop.store(false, Ordering::SeqCst); self.ctx = Some(ctx); + self.control_tx = None; Ok(()) } @@ -68,16 +72,27 @@ impl Plugin for BlePlugin { let device_name = ctx.config.ble.device_name.clone(); let tx = ctx.tx.clone(); let stop = Arc::clone(&self.stop); + let (control_tx, control_rx) = mpsc::channel(); + + self.control_tx = Some(control_tx); self.worker = Some(thread::spawn(move || { - gatt::run_ble_service(device_name, tx, stop) + gatt::run_ble_service(device_name, tx, control_rx, stop) })); Ok(()) } fn handle_message(&mut self, msg: Message) -> Result<()> { - if let Message::Shutdown = msg { - self.stop.store(true, Ordering::SeqCst); + match msg { + Message::Shutdown => { + self.stop.store(true, Ordering::SeqCst); + } + Message::WifiResult(payload) => { + if let Some(control_tx) = &self.control_tx { + let _ = control_tx.send(gatt::BleControl::UpdateStatus(payload)); + } + } + _ => {} } Ok(()) @@ -85,6 +100,7 @@ impl Plugin for BlePlugin { fn stop(&mut self) -> Result<()> { self.stop.store(true, Ordering::SeqCst); + self.control_tx = None; if let Some(worker) = self.worker.take() { worker diff --git a/src/plugins/http/routes.rs b/src/plugins/http/routes.rs index 69d9f18..017a210 100644 --- a/src/plugins/http/routes.rs +++ b/src/plugins/http/routes.rs @@ -1,13 +1,16 @@ use super::HttpState; -use crate::core::config; +use crate::core::config::{self, AppConfig}; use crate::core::message::{Destination, Envelope, Message, PlayerCommand, WifiCommand}; -use serde::Deserialize; -use serde::Serialize; -use serde_json::json; +use bytes::Buf; +use futures_util::TryStreamExt; +use serde::{Deserialize, Serialize}; +use serde_json::Value; use std::convert::Infallible; +use std::path::{Path, PathBuf}; use std::sync::{mpsc, Arc}; use std::time::{Duration, Instant}; use warp::http::StatusCode; +use warp::multipart::{FormData, Part}; use warp::{Filter, Reply}; #[derive(Deserialize)] @@ -18,8 +21,13 @@ struct WifiConnectRequest { #[derive(Deserialize)] struct WifiApStartRequest { - ssid: String, - password: String, + ssid: Option, + password: Option, +} + +#[derive(Deserialize)] +struct BleStartRequest { + device_name: Option, } #[derive(Serialize)] @@ -28,40 +36,77 @@ struct ApiMessage<'a> { message: String, } +#[derive(Serialize)] +struct VideoFileInfo { + name: String, + size: u64, +} + +#[derive(Serialize)] +struct WifiStatusResponse { + connected: bool, + ssid: String, + ip: String, +} + +#[derive(Serialize)] +struct BleStatusResponse { + running: bool, + embedded: bool, + device_name: String, +} + pub(crate) fn build_routes( tx: mpsc::Sender, state: Arc, ) -> impl Filter + Clone { - let api = play_route(tx.clone()) + let api = status_route(Arc::clone(&state)) + .or(play_route(tx.clone())) .or(pause_route(tx.clone())) .or(next_route(tx.clone())) .or(previous_route(tx.clone())) - .or(goto_route(tx.clone())) - .or(trigger_route(tx.clone())) + .or(goto_route(tx.clone(), Arc::clone(&state))) + .or(playlist_route(Arc::clone(&state))) .or(scene_route(tx.clone())) - .or(status_route(Arc::clone(&state))) + .or(trigger_route(tx.clone())) .or(config_get_route(Arc::clone(&state))) - .or(config_post_route(tx.clone(), Arc::clone(&state))) + .or(config_display_route(Arc::clone(&state))) + .or(config_update_route(tx.clone(), Arc::clone(&state))) + .or(video_list_route(Arc::clone(&state))) + .or(video_upload_route(Arc::clone(&state))) + .or(video_delete_route(Arc::clone(&state))) .or(wifi_status_route(tx.clone(), Arc::clone(&state))) .or(wifi_scan_route(tx.clone(), Arc::clone(&state))) .or(wifi_connect_route(tx.clone(), Arc::clone(&state))) .or(wifi_ap_start_route(tx.clone(), Arc::clone(&state))) - .or(wifi_ap_stop_route(tx, state)); + .or(wifi_ap_stop_route(tx.clone(), Arc::clone(&state))) + .or(ble_start_route(Arc::clone(&state))) + .or(ble_stop_route()) + .or(ble_status_route(state)); - let cors = warp::cors() - .allow_any_origin() - .allow_headers(["content-type"]) - .allow_methods(["GET", "POST", "OPTIONS"]); - - root_route().or(api).with(cors) + root_route().or(api).with( + warp::cors() + .allow_any_origin() + .allow_headers(["content-type"]) + .allow_methods(["GET", "POST", "DELETE", "OPTIONS"]), + ) } fn root_route() -> impl Filter + Clone { - warp::path::end().and(warp::get()).map(|| { - warp::reply::html( - "ShowenV2 HTTP API

ShowenV2 HTTP API

HTTP API is running.

", - ) - }) + warp::path::end() + .and(warp::get()) + .map(|| warp::reply::html(WEB_UI_HTML)) +} + +fn status_route( + state: Arc, +) -> impl Filter + Clone { + warp::path!("api" / "status") + .and(warp::get()) + .and(with_state(state)) + .and_then(|state: Arc| async move { + Ok::<_, Infallible>(json_response(StatusCode::OK, &state.player_status())) + }) } fn play_route( @@ -70,7 +115,9 @@ fn play_route( warp::path!("api" / "play") .and(warp::post()) .and(with_tx(tx)) - .and_then(|tx| command_reply(tx, Message::PlayerCommand(PlayerCommand::Play), "开始播放")) + .and_then(|tx| async move { + send_video_command(tx, Message::PlayerCommand(PlayerCommand::Play), "开始播放").await + }) } fn pause_route( @@ -79,7 +126,9 @@ fn pause_route( warp::path!("api" / "pause") .and(warp::post()) .and(with_tx(tx)) - .and_then(|tx| command_reply(tx, Message::PlayerCommand(PlayerCommand::Pause), "已暂停")) + .and_then(|tx| async move { + send_video_command(tx, Message::PlayerCommand(PlayerCommand::Pause), "已暂停").await + }) } fn next_route( @@ -88,7 +137,14 @@ fn next_route( warp::path!("api" / "next") .and(warp::post()) .and(with_tx(tx)) - .and_then(|tx| command_reply(tx, Message::PlayerCommand(PlayerCommand::Next), "切换到下一个视频")) + .and_then(|tx| async move { + send_video_command( + tx, + Message::PlayerCommand(PlayerCommand::Next), + "切换到下一个视频", + ) + .await + }) } fn previous_route( @@ -97,33 +153,47 @@ fn previous_route( warp::path!("api" / "previous") .and(warp::post()) .and(with_tx(tx)) - .and_then(|tx| command_reply(tx, Message::PlayerCommand(PlayerCommand::Previous), "切换到上一个视频")) + .and_then(|tx| async move { + send_video_command( + tx, + Message::PlayerCommand(PlayerCommand::Previous), + "切换到上一个视频", + ) + .await + }) } fn goto_route( tx: mpsc::Sender, + state: Arc, ) -> impl Filter + Clone { warp::path!("api" / "goto" / usize) .and(warp::post()) .and(with_tx(tx)) - .and_then(|index, tx| { - command_reply( + .and(with_state(state)) + .and_then(|index, tx, state: Arc| async move { + if index >= state.player_status().playlist_length { + return Ok::<_, Infallible>(error_json(StatusCode::BAD_REQUEST, "无效的视频索引")); + } + + send_video_command( tx, Message::PlayerCommand(PlayerCommand::Goto(index)), format!("跳转到视频 {index}"), ) + .await }) } -fn trigger_route( - tx: mpsc::Sender, +fn playlist_route( + state: Arc, ) -> impl Filter + Clone { - warp::path!("api" / "trigger" / String / String) - .and(warp::post()) - .and(with_tx(tx)) - .and_then(|name, value, tx| { - let message = format!("触发器 '{name}' 已发送，值: {value}"); - command_reply(tx, Message::Trigger { name, value }, message) + warp::path!("api" / "playlist") + .and(warp::get()) + .and(with_state(state)) + .and_then(|state: Arc| async move { + let config = state.config(); + Ok::<_, Infallible>(json_response(StatusCode::OK, &config.playlist)) }) } @@ -133,19 +203,33 @@ fn scene_route( warp::path!("api" / "scene" / String) .and(warp::post()) .and(with_tx(tx)) - .and_then(|name, tx| { - let message = format!("切换到场景: {name}"); - command_reply(tx, Message::PlayerCommand(PlayerCommand::ChangeScene(name)), message) + .and_then(|name: String, tx| async move { + send_video_command( + tx, + Message::PlayerCommand(PlayerCommand::ChangeScene(name.clone())), + format!("切换到场景: {name}"), + ) + .await }) } -fn status_route( - state: Arc, +fn trigger_route( + tx: mpsc::Sender, ) -> impl Filter + Clone { - warp::path!("api" / "status") - .and(warp::get()) - .and(with_state(state)) - .and_then(status_reply) + warp::path!("api" / "trigger" / String / String) + .and(warp::post()) + .and(with_tx(tx)) + .and_then(|name: String, value: String, tx| async move { + send_video_command( + tx, + Message::Trigger { + name: name.clone(), + value: value.clone(), + }, + format!("触发器 '{name}' 已发送，值: {value}"), + ) + .await + }) } fn config_get_route( @@ -154,10 +238,25 @@ fn config_get_route( warp::path!("api" / "config") .and(warp::get()) .and(with_state(state)) - .and_then(config_get_reply) + .and_then(|state: Arc| async move { + let config = state.config(); + Ok::<_, Infallible>(json_response(StatusCode::OK, config.as_ref())) + }) } -fn config_post_route( +fn config_display_route( + state: Arc, +) -> impl Filter + Clone { + warp::path!("api" / "config" / "display") + .and(warp::get()) + .and(with_state(state)) + .and_then(|state: Arc| async move { + let config = state.config(); + Ok::<_, Infallible>(json_response(StatusCode::OK, &config.display)) + }) +} + +fn config_update_route( tx: mpsc::Sender, state: Arc, ) -> impl Filter + Clone { @@ -167,7 +266,38 @@ fn config_post_route( .and(warp::body::bytes()) .and(with_tx(tx)) .and(with_state(state)) - .and_then(handle_config_post) + .and_then(handle_config_update) +} + +fn video_list_route( + state: Arc, +) -> impl Filter + Clone { + warp::path!("api" / "videos") + .and(warp::get()) + .and(with_state(state)) + .and_then(|state: Arc| async move { + let dir = video_dir(state.config().as_ref()); + Ok::<_, Infallible>(json_response(StatusCode::OK, &list_video_files(&dir))) + }) +} + +fn video_upload_route( + state: Arc, +) -> impl Filter + Clone { + warp::path!("api" / "videos" / "upload") + .and(warp::post()) + .and(warp::multipart::form().max_length(500 * 1024 * 1024)) + .and(with_state(state)) + .and_then(handle_video_upload) +} + +fn video_delete_route( + state: Arc, +) -> impl Filter + Clone { + warp::path!("api" / "videos" / String) + .and(warp::delete()) + .and(with_state(state)) + .and_then(handle_video_delete) } fn wifi_status_route( @@ -178,7 +308,7 @@ fn wifi_status_route( .and(warp::get()) .and(with_tx(tx)) .and(with_state(state)) - .and_then(|tx, state| wifi_reply(tx, state, WifiCommand::Status)) + .and_then(handle_wifi_status) } fn wifi_scan_route( @@ -189,7 +319,7 @@ fn wifi_scan_route( .and(warp::get()) .and(with_tx(tx)) .and(with_state(state)) - .and_then(|tx, state| wifi_reply(tx, state, WifiCommand::Scan)) + .and_then(handle_wifi_scan) } fn wifi_connect_route( @@ -201,15 +331,23 @@ fn wifi_connect_route( .and(warp::body::json()) .and(with_tx(tx)) .and(with_state(state)) - .and_then(|req: WifiConnectRequest, tx, state| { - wifi_reply( + .and_then(|req: WifiConnectRequest, tx, state| async move { + wifi_action_reply( tx, state, WifiCommand::Connect { ssid: req.ssid, password: req.password, }, + |payload| { + let ssid = payload + .get("ssid") + .and_then(Value::as_str) + .unwrap_or("未知网络"); + format!("WiFi 连接成功: {ssid}") + }, ) + .await }) } @@ -222,15 +360,17 @@ fn wifi_ap_start_route( .and(warp::body::json()) .and(with_tx(tx)) .and(with_state(state)) - .and_then(|req: WifiApStartRequest, tx, state| { - wifi_reply( + .and_then(|req: WifiApStartRequest, tx, state| async move { + let ssid = req.ssid.unwrap_or_else(|| "showen".to_string()); + let password = req.password.unwrap_or_else(|| "12345678".to_string()); + let success_ssid = ssid.clone(); + wifi_action_reply( tx, state, - WifiCommand::ApStart { - ssid: req.ssid, - password: req.password, - }, + WifiCommand::ApStart { ssid, password }, + move |_| format!("AP 热点已启动: SSID={success_ssid}"), ) + .await }) } @@ -242,40 +382,72 @@ fn wifi_ap_stop_route( .and(warp::post()) .and(with_tx(tx)) .and(with_state(state)) - .and_then(|tx, state| wifi_reply(tx, state, WifiCommand::ApStop)) + .and_then(|tx, state| async move { + wifi_action_reply(tx, state, WifiCommand::ApStop, |_| "AP 热点已关闭".to_string()) + .await + }) } -async fn status_reply(state: Arc) -> Result { - Ok(warp::reply::json(&json!({ - "player": state.player_status(), - "ble_ready": state.ble_ready(), - })) - .into_response()) +fn ble_start_route( + state: Arc, +) -> impl Filter + Clone { + warp::path!("api" / "ble" / "start") + .and(warp::post()) + .and(warp::body::json()) + .and(with_state(state)) + .and_then(|req: BleStartRequest, state: Arc| async move { + let config = state.config(); + let device_name = req.device_name.unwrap_or_else(|| config.ble.device_name.clone()); + Ok::<_, Infallible>(success_json(format!( + "BLE 配网服务已内嵌运行中，设备名: {device_name}" + ))) + }) } -async fn config_get_reply(state: Arc) -> Result { - Ok(warp::reply::json(state.config().as_ref()).into_response()) +fn ble_stop_route() -> impl Filter + Clone { + warp::path!("api" / "ble" / "stop") + .and(warp::post()) + .map(|| success_json("BLE 配网服务随主进程运行，无需手动停止")) } -async fn handle_config_post( +fn ble_status_route( + state: Arc, +) -> impl Filter + Clone { + warp::path!("api" / "ble" / "status") + .and(warp::get()) + .and(with_state(state)) + .and_then(|state: Arc| async move { + let config = state.config(); + Ok::<_, Infallible>(json_response( + StatusCode::OK, + &BleStatusResponse { + running: state.ble_ready(), + embedded: true, + device_name: config.ble.device_name.clone(), + }, + )) + }) +} + +async fn handle_config_update( body: bytes::Bytes, tx: mpsc::Sender, state: Arc, ) -> Result { - let current_config = state.config(); let raw = match std::str::from_utf8(&body) { Ok(raw) => raw, Err(_) => return Ok(error_json(StatusCode::BAD_REQUEST, "请求体不是有效的 UTF-8")), }; - if let Err(error) = config::parse_str(raw, ¤t_config.source_path) { + let current = state.config(); + if let Err(error) = config::parse_str(raw, current.source_path.clone()) { return Ok(error_json( StatusCode::BAD_REQUEST, &format!("配置验证失败: {error}"), )); } - if let Err(error) = std::fs::write(¤t_config.source_path, raw) { + if let Err(error) = std::fs::write(¤t.source_path, raw) { return Ok(error_json( StatusCode::INTERNAL_SERVER_ERROR, &format!("写入配置文件失败: {error}"), @@ -293,10 +465,154 @@ async fn handle_config_post( )); } - Ok(success_json("配置已保存并请求重载")) + Ok(success_json("配置已保存，热重载将自动生效")) } -async fn command_reply( +async fn handle_video_upload( + form: FormData, + state: Arc, +) -> Result { + let dir = video_dir(state.config().as_ref()); + let parts: Result, _> = form.try_collect().await; + let parts = match parts { + Ok(parts) => parts, + Err(error) => { + return Ok(error_json( + StatusCode::BAD_REQUEST, + &format!("上传失败: {error}"), + )); + } + }; + + let mut uploaded = Vec::new(); + for part in parts { + let Some(filename) = part.filename() else { + continue; + }; + let safe_name = sanitize_filename(filename); + if safe_name.is_empty() { + continue; + } + + let data = match part + .stream() + .try_fold(Vec::new(), |mut acc, buf| async move { + acc.extend_from_slice(buf.chunk()); + Ok(acc) + }) + .await + { + Ok(data) => data, + Err(error) => { + return Ok(error_json( + StatusCode::INTERNAL_SERVER_ERROR, + &format!("读取文件失败: {error}"), + )); + } + }; + + if let Err(error) = std::fs::write(dir.join(&safe_name), &data) { + return Ok(error_json( + StatusCode::INTERNAL_SERVER_ERROR, + &format!("保存文件失败: {error}"), + )); + } + + uploaded.push(safe_name); + } + + if uploaded.is_empty() { + Ok(error_json(StatusCode::BAD_REQUEST, "未找到上传文件")) + } else { + Ok(success_json(format!( + "已上传 {} 个文件: {}", + uploaded.len(), + uploaded.join(", ") + ))) + } +} + +async fn handle_video_delete( + filename: String, + state: Arc, +) -> Result { + if filename.contains("..") { + return Ok(error_json(StatusCode::BAD_REQUEST, "无效的文件名")); + } + + let target = video_dir(state.config().as_ref()).join(&filename); + if !target.exists() { + return Ok(error_json(StatusCode::NOT_FOUND, "文件不存在")); + } + + match std::fs::remove_file(&target) { + Ok(()) => Ok(success_json(format!("已删除: {filename}"))), + Err(error) => Ok(error_json( + StatusCode::INTERNAL_SERVER_ERROR, + &format!("删除失败: {error}"), + )), + } +} + +async fn handle_wifi_status( + tx: mpsc::Sender, + state: Arc, +) -> Result { + let payload = match wifi_request(tx, state, WifiCommand::Status).await { + Ok(payload) => payload, + Err(reply) => return Ok(reply), + }; + + let device = payload + .get("devices") + .and_then(Value::as_array) + .into_iter() + .flatten() + .find(|item| { + item.get("device_type").and_then(Value::as_str) == Some("wifi") + && item.get("state").and_then(Value::as_str) == Some("connected") + }); + + let ssid = device + .and_then(|item| item.get("connection")) + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + let ip = device + .and_then(|item| item.get("ip4_addresses")) + .and_then(Value::as_array) + .and_then(|ips| ips.first()) + .and_then(Value::as_str) + .map(strip_cidr) + .unwrap_or_default(); + + Ok(json_response( + StatusCode::OK, + &WifiStatusResponse { + connected: !ssid.is_empty(), + ssid, + ip, + }, + )) +} + +async fn handle_wifi_scan( + tx: mpsc::Sender, + state: Arc, +) -> Result { + let payload = match wifi_request(tx, state, WifiCommand::Scan).await { + Ok(payload) => payload, + Err(reply) => return Ok(reply), + }; + + let networks = payload + .get("networks") + .cloned() + .unwrap_or_else(|| Value::Array(Vec::new())); + Ok(json_response(StatusCode::OK, &networks)) +} + +async fn send_video_command( tx: mpsc::Sender, message: Message, success_message: impl Into, @@ -306,7 +622,7 @@ async fn command_reply( to: Destination::Plugin("video"), message, }) { - Ok(()) => Ok(success_json(success_message)), + Ok(()) => Ok(success_json(success_message.into())), Err(error) => Ok(error_json( StatusCode::INTERNAL_SERVER_ERROR, &format!("发送命令失败: {error}"), @@ -314,15 +630,32 @@ async fn command_reply( } } -async fn wifi_reply( +async fn wifi_action_reply( tx: mpsc::Sender, state: Arc, command: WifiCommand, -) -> Result { + build_message: F, +) -> Result +where + F: FnOnce(&Value) -> String, +{ + let payload = match wifi_request(tx, state, command).await { + Ok(payload) => payload, + Err(reply) => return Ok(reply), + }; + + Ok(success_json(build_message(&payload))) +} + +async fn wifi_request( + tx: mpsc::Sender, + state: Arc, + command: WifiCommand, +) -> Result { let version = match state.wifi_response.lock() { Ok(guard) => guard.version, Err(_) => { - return Ok(error_json( + return Err(error_json( StatusCode::INTERNAL_SERVER_ERROR, "WiFi 响应状态锁已损坏", )); @@ -334,7 +667,7 @@ async fn wifi_reply( to: Destination::Plugin("wifi"), message: Message::WifiCommand(command), }) { - return Ok(error_json( + return Err(error_json( StatusCode::INTERNAL_SERVER_ERROR, &format!("发送 WiFi 命令失败: {error}"), )); @@ -344,7 +677,7 @@ async fn wifi_reply( let mut guard = match state.wifi_response.lock() { Ok(guard) => guard, Err(_) => { - return Ok(error_json( + return Err(error_json( StatusCode::INTERNAL_SERVER_ERROR, "WiFi 响应状态锁已损坏", )); @@ -354,14 +687,16 @@ async fn wifi_reply( while guard.version == version { let now = Instant::now(); if now >= deadline { - return Ok(error_json(StatusCode::GATEWAY_TIMEOUT, "等待 WiFi 响应超时")); + return Err(error_json(StatusCode::GATEWAY_TIMEOUT, "等待 WiFi 响应超时")); } - let timeout = deadline.saturating_duration_since(now); - let (next_guard, wait_result) = match state.wifi_response_cv.wait_timeout(guard, timeout) { + let result = state + .wifi_response_cv + .wait_timeout(guard, deadline.saturating_duration_since(now)); + let (next_guard, wait_result) = match result { Ok(result) => result, Err(_) => { - return Ok(error_json( + return Err(error_json( StatusCode::INTERNAL_SERVER_ERROR, "等待 WiFi 响应失败", )); @@ -370,11 +705,91 @@ async fn wifi_reply( guard = next_guard; if wait_result.timed_out() && guard.version == version { - return Ok(error_json(StatusCode::GATEWAY_TIMEOUT, "等待 WiFi 响应超时")); + return Err(error_json(StatusCode::GATEWAY_TIMEOUT, "等待 WiFi 响应超时")); } } - Ok(warp::reply::with_status(guard.payload.clone().unwrap_or_default(), StatusCode::OK).into_response()) + let raw = guard.payload.clone().unwrap_or_default(); + let payload: Value = match serde_json::from_str(&raw) { + Ok(payload) => payload, + Err(error) => { + return Err(error_json( + StatusCode::BAD_GATEWAY, + &format!("WiFi 返回了无效 JSON: {error}"), + )); + } + }; + + if payload.get("ok").and_then(Value::as_bool) == Some(false) { + let message = payload + .get("error") + .and_then(Value::as_str) + .unwrap_or("WiFi 操作失败"); + return Err(error_json(StatusCode::INTERNAL_SERVER_ERROR, message)); + } + + Ok(payload) +} + +fn list_video_files(dir: &Path) -> Vec { + let mut files = Vec::new(); + + if let Ok(entries) = std::fs::read_dir(dir) { + for entry in entries.flatten() { + if let Ok(meta) = entry.metadata() { + if meta.is_file() { + files.push(VideoFileInfo { + name: entry.file_name().to_string_lossy().into_owned(), + size: meta.len(), + }); + } + + if meta.is_dir() { + let prefix = entry.file_name().to_string_lossy().into_owned(); + if let Ok(sub_entries) = std::fs::read_dir(entry.path()) { + for sub_entry in sub_entries.flatten() { + if let Ok(sub_meta) = sub_entry.metadata() { + if sub_meta.is_file() { + files.push(VideoFileInfo { + name: format!( + "{prefix}/{}", + sub_entry.file_name().to_string_lossy() + ), + size: sub_meta.len(), + }); + } + } + } + } + } + } + } + } + + files.sort_by(|left, right| left.name.cmp(&right.name)); + files +} + +fn sanitize_filename(name: &str) -> String { + name.replace('/', "_") + .replace('\\', "_") + .replace("..", "_") +} + +fn video_dir(config: &AppConfig) -> PathBuf { + if let Some(first) = config.playlist.first() { + let resolved = config.resolve_media_path(first); + return resolved + .parent() + .map(Path::to_path_buf) + .unwrap_or_else(|| config.source_dir.clone()); + } + + config.source_dir.clone() +} + +fn strip_cidr(value: &str) -> String { + value.split('/').next().unwrap_or_default().to_string() } fn with_tx( @@ -390,23 +805,110 @@ fn with_state( } fn success_json(message: impl Into) -> warp::reply::Response { - warp::reply::with_status( - warp::reply::json(&ApiMessage { + json_response( + StatusCode::OK, + &ApiMessage { status: "ok", message: message.into(), - }), - StatusCode::OK, + }, ) - .into_response() } fn error_json(status: StatusCode, message: &str) -> warp::reply::Response { - warp::reply::with_status( - warp::reply::json(&json!({ - "status": "error", - "message": message, - })), + json_response( status, + &ApiMessage { + status: "error", + message: message.to_string(), + }, ) - .into_response() } + +fn json_response(status: StatusCode, payload: &T) -> warp::reply::Response { + warp::reply::with_status(warp::reply::json(payload), status).into_response() +} + +const WEB_UI_HTML: &str = r#" + + + + + Showen 控制台 + + + +
+
+
+

Showen 远程控制台

+

Warp Web UI + HTTP API，覆盖旧 `api_server.rs` 的控制、配置、视频、WiFi 与 BLE 端点。

+
+ +
+ + + + +
+ +
+
+

播放状态

状态--
当前视频--
索引--
列表长度--
+

播放控制

+

触发器

+
+
+ +

上传视频

设备文件

加载中...
+ +

网络状态

连接--
SSID--
IP--
BLE--

扫描 WiFi

点击扫描按钮搜索附近网络

连接 WiFi

热点与 BLE

+ +

显示设置

配置编辑器

+
+ + + +"#; diff --git a/src/plugins/video/processor.rs b/src/plugins/video/processor.rs index c0386f7..4ebdf3a 100644 --- a/src/plugins/video/processor.rs +++ b/src/plugins/video/processor.rs @@ -12,9 +12,48 @@ use opencv::{ videoio::{self, VideoCapture}, }; use rand::Rng; -use std::path::PathBuf; +use std::collections::HashSet; +use std::sync::{Arc, Mutex, MutexGuard}; use std::time::Instant; +fn log_mat_size(label: &str, frame: &Mat) { + use std::sync::Mutex; + + static SEEN: Mutex>> = Mutex::new(None); + let key = (label.to_string(), frame.cols(), frame.rows()); + let mut guard = SEEN.lock().unwrap(); + let set = guard.get_or_insert_with(HashSet::new); + if set.insert(key) { + println!("{}: cols={} rows={}", label, frame.cols(), frame.rows()); + } +} + +fn log_window_image_rect(window_name: &str) { + use std::sync::Mutex; + + static SEEN: Mutex>> = Mutex::new(None); + match highgui::get_window_image_rect(window_name) { + Ok(rect) => { + let key = ( + window_name.to_string(), + rect.x, + rect.y, + rect.width, + rect.height, + ); + let mut guard = SEEN.lock().unwrap(); + let set = guard.get_or_insert_with(HashSet::new); + if set.insert(key) { + println!( + "window.image_rect {}: x={} y={} width={} height={}", + window_name, rect.x, rect.y, rect.width, rect.height, + ); + } + } + Err(error) => eprintln!("window.image_rect {} unavailable: {}", window_name, error), + } +} + pub struct StepOutcome { pub window_name: String, pub frame: Option, @@ -49,6 +88,7 @@ pub struct VideoTransformer { render_size: Size, scale_mode: ScaleMode, allow_upscale: bool, + perspective_enabled: bool, perspective_points: Option>, chroma_key: ChromaKeyConfig, brightness_adjust: BrightnessAdjustConfig, @@ -78,6 +118,7 @@ impl VideoTransformer { render_size: Size::new(config.render_width, config.render_height), scale_mode: config.scale_mode, allow_upscale: config.allow_upscale, + perspective_enabled: config.perspective_correction.enabled, perspective_points, chroma_key: config.chroma_key.clone(), brightness_adjust: config.brightness_adjust.clone(), @@ -85,25 +126,60 @@ impl VideoTransformer { } pub fn transform(&self, frame: &Mat) -> Result { + if cfg!(debug_assertions) { + log_mat_size("transform.input", frame); + } let scaled = self.scale_to_render_resolution(frame)?; + if cfg!(debug_assertions) { + log_mat_size("transform.after_scale_to_render_resolution", &scaled); + } let mut transformed = self.rotate(&scaled)?; + if cfg!(debug_assertions) { + log_mat_size("transform.after_rotate", &transformed); + } - if self.flip_horizontal || self.flip_vertical { - transformed = self.flip(&transformed)?; + if self.flip_horizontal { + let mut flipped = Mat::default(); + core::flip(&transformed, &mut flipped, 1)?; + transformed = flipped; + if cfg!(debug_assertions) { + log_mat_size("transform.after_flip_horizontal", &transformed); + } + } + + if self.flip_vertical { + let mut flipped = Mat::default(); + core::flip(&transformed, &mut flipped, 0)?; + transformed = flipped; + if cfg!(debug_assertions) { + log_mat_size("transform.after_flip_vertical", &transformed); + } } if self.chroma_key.enabled { transformed = self.apply_chroma_key(&transformed)?; + if cfg!(debug_assertions) { + log_mat_size("transform.after_chroma_key", &transformed); + } } if self.brightness_adjust.enabled { transformed = self.apply_brightness_adjust(&transformed)?; + if cfg!(debug_assertions) { + log_mat_size("transform.after_brightness_adjust", &transformed); + } } - if self.perspective_points.is_some() { + if self.perspective_enabled { transformed = self.apply_perspective(&transformed)?; + if cfg!(debug_assertions) { + log_mat_size("transform.after_perspective", &transformed); + } } + if cfg!(debug_assertions) { + log_mat_size("transform.output", &transformed); + } Ok(transformed) } @@ -114,34 +190,13 @@ impl VideoTransformer { fn rotate(&self, frame: &Mat) -> Result { let mut rotated = Mat::default(); match self.rotation { - 0 => Ok(frame.try_clone()?), - 90 => { - core::rotate(frame, &mut rotated, core::ROTATE_90_CLOCKWISE)?; - Ok(rotated) - } - 180 => { - core::rotate(frame, &mut rotated, core::ROTATE_180)?; - Ok(rotated) - } - 270 => { - core::rotate(frame, &mut rotated, core::ROTATE_90_COUNTERCLOCKWISE)?; - Ok(rotated) - } - other => bail!("不支持的旋转角度: {other}"), + 90 => core::rotate(frame, &mut rotated, core::ROTATE_90_CLOCKWISE)?, + 180 => core::rotate(frame, &mut rotated, core::ROTATE_180)?, + 270 => core::rotate(frame, &mut rotated, core::ROTATE_90_COUNTERCLOCKWISE)?, + _ => return Ok(frame.try_clone()?), } - } - fn flip(&self, frame: &Mat) -> Result { - let code = match (self.flip_horizontal, self.flip_vertical) { - (false, false) => return Ok(frame.try_clone()?), - (true, false) => 1, - (false, true) => 0, - (true, true) => -1, - }; - - let mut flipped = Mat::default(); - core::flip(frame, &mut flipped, code)?; - Ok(flipped) + Ok(rotated) } fn apply_perspective(&self, frame: &Mat) -> Result { @@ -149,9 +204,13 @@ impl VideoTransformer { return Ok(frame.try_clone()?); }; + if cfg!(debug_assertions) { + log_mat_size("apply_perspective.input", frame); + } + let width = frame.cols() as f32; let height = frame.rows() as f32; - let src = Vector::::from_iter([ + let src = Vector::::from_iter(vec![ Point2f::new(0.0, 0.0), Point2f::new(width, 0.0), Point2f::new(width, height), @@ -174,46 +233,50 @@ impl VideoTransformer { Size::new(frame.cols(), frame.rows()), imgproc::INTER_LINEAR, core::BORDER_CONSTANT, - Scalar::all(0.0), + Scalar::default(), )?; + + if cfg!(debug_assertions) { + log_mat_size("apply_perspective.output", &warped); + } + Ok(warped) } fn apply_chroma_key(&self, frame: &Mat) -> Result { - let config = &self.chroma_key; + let ck = &self.chroma_key; let mut hsv = Mat::default(); imgproc::cvt_color(frame, &mut hsv, imgproc::COLOR_BGR2HSV, 0)?; let lower = Scalar::new( - config.hsv_min[0] as f64, - config.hsv_min[1] as f64, - config.hsv_min[2] as f64, + ck.hsv_min[0] as f64, + ck.hsv_min[1] as f64, + ck.hsv_min[2] as f64, 0.0, ); let upper = Scalar::new( - config.hsv_max[0] as f64, - config.hsv_max[1] as f64, - config.hsv_max[2] as f64, + ck.hsv_max[0] as f64, + ck.hsv_max[1] as f64, + ck.hsv_max[2] as f64, 0.0, ); - let mut mask = Mat::default(); core::in_range(&hsv, &lower, &upper, &mut mask)?; - if config.invert { + if ck.invert { let mut inverted = Mat::default(); core::bitwise_not(&mask, &mut inverted, &core::no_array())?; mask = inverted; } - if config.feather > 0 { - let kernel = config.feather * 2 + 1; + if ck.feather > 0 { + let ksize = ck.feather * 2 + 1; let mut blurred = Mat::default(); imgproc::gaussian_blur( &mask, &mut blurred, - Size::new(kernel, kernel), + Size::new(ksize, ksize), 0.0, 0.0, core::BORDER_DEFAULT, @@ -227,7 +290,7 @@ impl VideoTransformer { } fn apply_brightness_adjust(&self, frame: &Mat) -> Result { - let config = &self.brightness_adjust; + let cfg = &self.brightness_adjust; let mut gray = Mat::default(); imgproc::cvt_color(frame, &mut gray, imgproc::COLOR_BGR2GRAY, 0)?; @@ -236,23 +299,24 @@ impl VideoTransformer { imgproc::threshold( &gray, &mut subject_mask, - config.threshold as f64, + cfg.threshold as f64, 255.0, imgproc::THRESH_BINARY, )?; - let mut background_mask = Mat::default(); - core::bitwise_not(&subject_mask, &mut background_mask, &core::no_array())?; + let mut bg_mask = Mat::default(); + core::bitwise_not(&subject_mask, &mut bg_mask, &core::no_array())?; let mut boosted = Mat::default(); - frame.convert_to(&mut boosted, -1, config.subject_boost, 0.0)?; + frame.convert_to(&mut boosted, -1, cfg.subject_boost, 0.0)?; let mut suppressed = Mat::default(); - frame.convert_to(&mut suppressed, -1, config.background_suppress, 0.0)?; + frame.convert_to(&mut suppressed, -1, cfg.background_suppress, 0.0)?; let mut result = Mat::zeros(frame.rows(), frame.cols(), frame.typ())?.to_mat()?; boosted.copy_to_masked(&mut result, &subject_mask)?; - suppressed.copy_to_masked(&mut result, &background_mask)?; + suppressed.copy_to_masked(&mut result, &bg_mask)?; + Ok(result) } @@ -391,28 +455,32 @@ impl TransitionEffect { &mut blended, -1, )?; + Ok(blended) } } pub struct VideoProcessor { - pub config: AppConfig, - pub state_machine: Option, - pub current_index: usize, - pub running: bool, - pub paused: bool, - pub in_transition: bool, - pub window_name: String, + config: AppConfig, transformer: VideoTransformer, output_size: Size, + last_logged_sizes: Option<((i32, i32), (i32, i32), (i32, i32))>, transition_enabled: bool, transition: TransitionEffect, playlist: Vec, + current_index: usize, current_loop: i32, max_loops: i32, - capture: Option, + loop_playlist: bool, + cap: Option, + window_name: String, + running: bool, + paused: bool, + in_transition: bool, transition_start: Option, last_frame: Option, + reload_requested: bool, + state_machine: Option, cached_screen_size: Option, } @@ -423,69 +491,42 @@ impl VideoProcessor { config.transition.duration, config.transition.transition_type.clone(), ); - let playlist = config.playlist.clone(); - let window_name = config.display.window_title.clone(); - let mut state_machine = config.scenes.state_machine.clone().map(StateMachine::new); - if let Some(machine) = state_machine.as_mut() { - machine.start()?; - } + let state_machine = if let Some(sm_config) = &config.scenes.state_machine { + let mut sm = StateMachine::new(sm_config.clone()); + sm.start()?; + Some(sm) + } else { + None + }; - let mut processor = Self { - config, - state_machine, + Ok(Self { + playlist: config.playlist.clone(), current_index: 0, + current_loop: 0, + max_loops: 1, + loop_playlist: config.playback.loop_playlist, + window_name: config.display.window_title.clone(), + transition_enabled: config.transition.enabled, + config, + transformer, + output_size: Size::new(0, 0), + last_logged_sizes: None, + transition, + cap: None, running: false, paused: false, in_transition: false, - window_name, - transformer, - output_size: Size::new(0, 0), - transition_enabled: false, - transition, - playlist, - current_loop: 0, - max_loops: 1, - capture: None, transition_start: None, last_frame: None, + reload_requested: false, + state_machine, cached_screen_size: None, - }; - - processor.transition_enabled = processor.should_transition(); - processor.sync_index_to_state_machine(); - processor.max_loops = processor.resolve_current_video_loop_count(); - Ok(processor) - } - - pub fn start(&mut self) -> Result<()> { - if self.playlist.is_empty() { - bail!("playlist 不能为空"); - } - - self.running = true; - self.paused = !self.config.playback.auto_start; - self.cached_screen_size = Some(self.detect_screen_size()); - self.ensure_window()?; - self.open_current_video(false)?; - Ok(()) - } - - pub fn stop(&mut self) -> Result<()> { - self.running = false; - self.in_transition = false; - self.transition_start = None; - if let Some(mut capture) = self.capture.take() { - capture.release()?; - } - let _ = highgui::destroy_window(&self.window_name); - Ok(()) + }) } pub fn run(&mut self) -> Result<()> { - if !self.running { - self.start()?; - } + self.start()?; while self.running { let outcome = self.step()?; @@ -498,10 +539,198 @@ impl VideoProcessor { } let key = highgui::wait_key(outcome.delay)?; - self.handle_key_code(key)?; + if !self.handle_key_code_internal(key)? { + break; + } } - self.stop() + self.stop()?; + Ok(()) + } + + pub fn run_shared(shared: Arc>) -> Result<()> { + { + let mut processor = lock_processor(&shared)?; + processor.start()?; + } + + loop { + let outcome = { + let mut processor = lock_processor(&shared)?; + processor.step()? + }; + + if let Some(frame) = outcome.frame { + let processor = lock_processor(&shared)?; + processor.display_frame(&outcome.window_name, &frame)?; + } + + if !outcome.keep_running { + break; + } + + let key = highgui::wait_key(outcome.delay)?; + let should_continue = { + let mut processor = lock_processor(&shared)?; + processor.handle_key_code_internal(key)? + }; + + if !should_continue { + break; + } + } + + let mut processor = lock_processor(&shared)?; + processor.stop()?; + Ok(()) + } + + pub fn start(&mut self) -> Result<()> { + if self.playlist.is_empty() { + bail!("playlist is empty"); + } + + self.running = true; + self.cached_screen_size = Some(self.detect_screen_size()); + self.ensure_window()?; + self.reload_current_video()?; + Ok(()) + } + + pub fn stop(&mut self) -> Result<()> { + self.running = false; + if let Some(mut cap) = self.cap.take() { + cap.release()?; + } + highgui::destroy_all_windows()?; + Ok(()) + } + + pub fn play(&mut self) -> Result<()> { + if !self.running { + self.start()?; + } else { + self.resume(); + } + Ok(()) + } + + pub fn pause(&mut self) { + self.paused = true; + } + + pub fn resume(&mut self) { + self.paused = false; + } + + pub fn next(&mut self) -> Result<()> { + if self.playlist.is_empty() { + return Ok(()); + } + + if self.current_index + 1 >= self.playlist.len() { + if self.loop_playlist { + self.current_index = 0; + } else { + self.running = false; + return Ok(()); + } + } else { + self.current_index += 1; + } + + self.begin_transition(); + self.reload_requested = true; + self.current_loop = 0; + Ok(()) + } + + pub fn previous(&mut self) -> Result<()> { + if self.playlist.is_empty() || self.current_index == 0 { + return Ok(()); + } + + self.current_index -= 1; + self.begin_transition(); + self.reload_requested = true; + self.current_loop = 0; + Ok(()) + } + + pub fn goto(&mut self, index: usize) -> Result<()> { + if index >= self.playlist.len() { + return Ok(()); + } + + self.current_index = index; + self.begin_transition(); + self.reload_requested = true; + self.current_loop = 0; + Ok(()) + } + + pub fn trigger(&mut self, trigger_name: &str, trigger_value: &str) -> Result { + if let Some(sm) = &mut self.state_machine { + let triggered = sm.handle_trigger(trigger_name, trigger_value)?; + if triggered { + if let Some(video_id) = sm.current_video_id() { + if let Some(index) = self.playlist.iter().position(|v| v.id == video_id) { + self.current_index = index; + self.begin_transition(); + self.reload_requested = true; + self.current_loop = 0; + return Ok(true); + } + + bail!("Video ID '{}' not found in playlist", video_id); + } + } + Ok(triggered) + } else { + Ok(false) + } + } + + pub fn change_scene(&mut self, scene_name: &str) -> Result { + if self.state_machine.is_some() { + println!( + "change_scene('{}') ignored: state machine mode is active, use trigger() instead", + scene_name, + ); + return Ok(false); + } + + let Some(scene_playlist) = self.scene_playlist(scene_name) else { + return Ok(false); + }; + + if scene_playlist.is_empty() { + return Ok(false); + } + + self.playlist = scene_playlist.to_vec(); + self.current_index = 0; + self.current_loop = 0; + self.begin_transition(); + self.reload_requested = true; + Ok(true) + } + + pub fn current_state(&self) -> Option<&str> { + self.state_machine + .as_ref() + .map(|machine| machine.current_state.as_str()) + } + + pub fn status(&self) -> PlayerStatusData { + PlayerStatusData { + running: self.running, + paused: self.paused, + in_transition: self.in_transition, + current_index: self.current_index, + playlist_length: self.playlist.len(), + current_video: self.current_video_id(), + } } pub fn step(&mut self) -> Result { @@ -518,185 +747,76 @@ impl VideoProcessor { )); } - let frame = match self.read_processed_frame()? { - Some(frame) => frame, - None => { - self.advance_after_video_end()?; - if self.in_transition && self.last_frame.is_some() { - return Ok(StepOutcome::new( - &self.window_name, - self.last_frame.as_ref().map(Mat::try_clone).transpose()?, - 1, - true, - )); - } - return Ok(if self.running { - StepOutcome::idle(&self.window_name) - } else { - StepOutcome::stop(&self.window_name) - }); + if self.reload_requested { + self.reload_current_video()?; + return Ok(StepOutcome::idle(&self.window_name)); + } + + let mut frame = Mat::default(); + let read_ok = self.capture_mut()?.read(&mut frame)?; + if !read_ok || frame.empty() { + self.current_loop += 1; + if self.current_loop < self.max_loops { + self.capture_mut()?.set(videoio::CAP_PROP_POS_FRAMES, 0.0)?; + return Ok(StepOutcome::idle(&self.window_name)); } + + self.current_loop = 0; + let old_video_id = self.current_video_id(); + self.advance_playlist(); + if !self.running { + return Ok(StepOutcome::stop(&self.window_name)); + } + + let new_video_id = self.current_video_id(); + if self.state_machine.is_some() && old_video_id == new_video_id { + self.capture_mut()?.set(videoio::CAP_PROP_POS_FRAMES, 0.0)?; + } else { + self.reload_current_video()?; + } + + if self.in_transition && self.last_frame.is_some() { + return Ok(StepOutcome::new( + &self.window_name, + self.last_frame.as_ref().map(Mat::try_clone).transpose()?, + 1, + true, + )); + } + + return Ok(StepOutcome::idle(&self.window_name)); + } + + log_mat_size("cap.read.output", &frame); + + let processed = self.transformer.transform(&frame)?; + log_mat_size("step.after_transform", &processed); + + let output_source = if self.in_transition { + let transitioned = self.apply_transition(&processed)?; + log_mat_size("step.after_transition", &transitioned); + transitioned + } else { + processed }; - let transitioned = self.apply_transition(&frame)?; - let output = self.prepare_output_frame(transitioned)?; + let output = self.prepare_output_frame(output_source)?; + log_mat_size("step.output_frame", &output); self.last_frame = Some(output.try_clone()?); - let wait_delay = self.wait_delay(); + let delay = self.frame_delay()?; let window_name = self.window_name.clone(); - - Ok(StepOutcome::new( - &window_name, - Some(output), - wait_delay, - true, - )) - } - - pub fn play(&mut self) -> Result<()> { - if !self.running { - self.start()?; - } - self.paused = false; - Ok(()) - } - - pub fn pause(&mut self) { - self.paused = true; - } - - pub fn next(&mut self) -> Result<()> { - self.advance_media(true) - } - - pub fn previous(&mut self) -> Result<()> { - if self.playlist.is_empty() { - return Ok(()); - } - - if self.state_machine.is_some() { - return self.open_current_video(true); - } - - self.current_loop = 0; - self.current_index = if self.current_index == 0 { - if self.config.playback.loop_playlist { - self.playlist.len() - 1 - } else { - 0 - } - } else { - self.current_index - 1 - }; - - self.open_current_video(true) - } - - pub fn goto(&mut self, index: usize) -> Result<()> { - if index >= self.playlist.len() { - bail!("播放索引越界: {} >= {}", index, self.playlist.len()); - } - - self.current_index = index; - self.current_loop = 0; - self.open_current_video(true) - } - - pub fn trigger(&mut self, name: &str, value: &str) -> Result { - let handled = { - let Some(machine) = self.state_machine.as_mut() else { - return Ok(false); - }; - - machine.handle_trigger(name, value)? - }; - - if !handled { - return Ok(false); - } - - self.sync_index_to_state_machine(); - self.current_loop = 0; - if self.running { - self.open_current_video(true)?; - } - Ok(true) - } - - pub fn change_scene(&mut self, scene_name: &str) -> Result { - if self.state_machine.is_some() { - return Ok(false); - } - - let Some(scene_playlist) = self.scene_playlist(scene_name) else { - return Ok(false); - }; - - if scene_playlist.is_empty() { - return Ok(false); - } - - self.playlist = scene_playlist.to_vec(); - self.current_index = 0; - self.current_loop = 0; - if self.running { - self.open_current_video(true)?; - } - Ok(true) - } - - pub fn status(&self) -> PlayerStatusData { - PlayerStatusData { - running: self.running, - paused: self.paused, - in_transition: self.in_transition, - current_index: self.current_index, - playlist_length: self.playlist.len(), - current_video: self.current_video().map(|item| item.id.clone()), - } - } - - pub fn current_state(&self) -> Option<&str> { - self.state_machine - .as_ref() - .map(|machine| machine.current_state.as_str()) - } - - fn ensure_window(&mut self) -> Result<()> { - let output_size = self - .configured_output_size() - .unwrap_or_else(|| self.transformer.render_size()); - - highgui::named_window(&self.window_name, highgui::WINDOW_NORMAL)?; - - if self.config.display.fullscreen { - let screen_size = self.detect_screen_size(); - highgui::resize_window(&self.window_name, screen_size.width, screen_size.height)?; - highgui::move_window(&self.window_name, 0, 0)?; - highgui::set_window_property( - &self.window_name, - highgui::WND_PROP_FULLSCREEN, - highgui::WINDOW_FULLSCREEN as f64, - )?; - } else { - highgui::resize_window(&self.window_name, output_size.width, output_size.height)?; - if self.config.display.offset_x != 0 || self.config.display.offset_y != 0 { - highgui::move_window( - &self.window_name, - self.config.display.offset_x, - self.config.display.offset_y, - )?; - } - } - - self.output_size = output_size; - Ok(()) + Ok(StepOutcome::new(&window_name, Some(output), delay, true)) } pub(crate) fn display_frame(&self, window_name: &str, frame: &Mat) -> Result<()> { + log_mat_size("imshow.input", frame); + if self.config.display.fullscreen { + let frame_size = frame.size()?; let screen_size = self.detect_screen_size(); - if frame.size()? == screen_size { + + if frame_size == screen_size { highgui::imshow(window_name, frame)?; } else { let mut resized = Mat::default(); @@ -714,194 +834,158 @@ impl VideoProcessor { highgui::imshow(window_name, frame)?; } + log_window_image_rect(window_name); Ok(()) } - fn read_processed_frame(&mut self) -> Result> { - let capture = match self.capture.as_mut() { - Some(capture) => capture, - None => return Ok(None), - }; - - let mut raw = Mat::default(); - if !capture.read(&mut raw)? || raw.empty() { - return Ok(None); - } - - Ok(Some(self.transformer.transform(&raw)?)) + pub(crate) fn handle_key_code(&mut self, key: i32) -> Result<()> { + self.handle_key_code_internal(key)?; + Ok(()) } - fn open_current_video(&mut self, allow_transition: bool) -> Result<()> { - let path = self.current_video_path()?; + fn ensure_window(&mut self) -> Result<()> { + let output_size = self + .configured_output_size() + .unwrap_or_else(|| self.transformer.render_size()); - if let Some(mut capture) = self.capture.take() { - capture.release()?; + println!( + "Creating window '{}' with output_size={}x{} fullscreen={}", + self.window_name, output_size.width, output_size.height, self.config.display.fullscreen, + ); + + highgui::named_window(&self.window_name, highgui::WINDOW_NORMAL)?; + + if self.config.display.fullscreen { + let screen_size = self.detect_screen_size(); + + highgui::resize_window(&self.window_name, screen_size.width, screen_size.height)?; + highgui::move_window(&self.window_name, 0, 0)?; + highgui::set_window_property( + &self.window_name, + highgui::WND_PROP_FULLSCREEN, + highgui::WINDOW_FULLSCREEN as f64, + )?; + + let black_frame = + Mat::zeros(screen_size.height, screen_size.width, core::CV_8UC3)?.to_mat()?; + highgui::imshow(&self.window_name, &black_frame)?; + highgui::wait_key(1)?; + + println!( + "Fullscreen window initialized: screen={}x{}", + screen_size.width, screen_size.height, + ); } - let capture = VideoCapture::from_file(path.to_string_lossy().as_ref(), videoio::CAP_ANY) - .with_context(|| format!("打开视频失败: {}", path.display()))?; - - if !capture.is_opened()? { - bail!("无法打开视频: {}", path.display()); - } - - self.max_loops = self.resolve_current_video_loop_count(); - self.current_loop = 0; - self.capture = Some(capture); - - if allow_transition { - self.begin_transition(); - } else { - self.in_transition = false; - self.transition_start = None; - } + Self::hide_cursor(); + self.output_size = output_size; Ok(()) } - fn advance_after_video_end(&mut self) -> Result<()> { - self.current_loop += 1; - if self.current_loop < self.max_loops { - if let Some(capture) = self.capture.as_mut() { - capture.set(videoio::CAP_PROP_POS_FRAMES, 0.0)?; - } - return Ok(()); + fn hide_cursor() { + let _ = std::process::Command::new("pkill") + .args(["-f", "unclutter"]) + .status(); + match std::process::Command::new("unclutter") + .args(["-idle", "0", "-root"]) + .spawn() + { + Ok(_) => println!("Cursor hidden via unclutter"), + Err(error) => eprintln!("Failed to start unclutter: {}", error), } - - self.current_loop = 0; - self.advance_media(false) } - fn advance_media(&mut self, manual: bool) -> Result<()> { - if self.state_machine.is_some() { - let (old_video, changed, random_changed, new_video) = { - let machine = self.state_machine.as_mut().expect("checked is_some"); - let old_video = machine.current_video_id(); - let changed = machine.on_video_completed()?; - let random_changed = if !changed { - machine.check_random_triggers()? - } else { - false - }; - let new_video = machine.current_video_id(); - (old_video, changed, random_changed, new_video) - }; + fn show_cursor() { + let _ = std::process::Command::new("pkill") + .args(["-f", "unclutter"]) + .status(); + } - self.sync_index_to_state_machine(); + fn configured_output_size(&self) -> Option { + match ( + self.config.display.output_width, + self.config.display.output_height, + ) { + (Some(width), Some(height)) => Some(Size::new(width, height)), + _ => None, + } + } - if old_video == new_video && !manual && !changed && !random_changed { - if let Some(capture) = self.capture.as_mut() { - capture.set(videoio::CAP_PROP_POS_FRAMES, 0.0)?; + fn detect_screen_size(&self) -> Size { + if let Some(cached) = self.cached_screen_size { + return cached; + } + + if std::env::var("DISPLAY").is_ok() { + if let Ok(output) = std::process::Command::new("xrandr").output() { + if let Ok(text) = String::from_utf8(output.stdout) { + for line in text.lines() { + if line.contains('*') { + let parts: Vec<&str> = line.split_whitespace().collect(); + if let Some(resolution) = parts.first() { + let dims: Vec<&str> = resolution.split('x').collect(); + if dims.len() == 2 { + if let (Ok(w), Ok(h)) = + (dims[0].parse::(), dims[1].parse::()) + { + println!( + "Detected screen size from xrandr (X11 active): {}x{}", + w, h, + ); + return Size::new(w, h); + } + } + } + } + } } - return Ok(()); } + } - if old_video == new_video && !manual { - if let Some(capture) = self.capture.as_mut() { - capture.set(videoio::CAP_PROP_POS_FRAMES, 0.0)?; + if let Ok(content) = std::fs::read_to_string("/sys/class/graphics/fb0/modes") { + let trimmed = content.trim(); + if let Some(x_pos) = trimmed.find('x') { + let start = trimmed[..x_pos] + .rfind(|c: char| !c.is_ascii_digit()) + .map(|p| p + 1) + .unwrap_or(0); + let end = trimmed[x_pos + 1..] + .find(|c: char| !c.is_ascii_digit()) + .map(|p| x_pos + 1 + p) + .unwrap_or(trimmed.len()); + let w_str = &trimmed[start..x_pos]; + let h_str = &trimmed[x_pos + 1..end]; + if let (Ok(w), Ok(h)) = (w_str.parse::(), h_str.parse::()) { + println!("Detected screen size from fb0/modes: {}x{}", w, h); + return Size::new(w, h); } - return Ok(()); - } - - return self.open_current_video(manual || old_video != new_video); - } - - if self.playlist.is_empty() { - self.running = false; - return Ok(()); - } - - if self.current_index + 1 < self.playlist.len() { - self.current_index += 1; - return self.open_current_video(true); - } - - if self.config.playback.loop_playlist { - self.current_index = 0; - return self.open_current_video(true); - } - - self.running = false; - Ok(()) - } - - fn sync_index_to_state_machine(&mut self) { - let Some(machine) = &self.state_machine else { - return; - }; - - if let Some(video_id) = machine.current_video_id() { - if let Some(index) = self.playlist.iter().position(|item| item.id == video_id) { - self.current_index = index; - } - } - } - - fn current_video(&self) -> Option<&VideoItem> { - if let Some(machine) = &self.state_machine { - if let Some(video_id) = machine.current_video_id() { - return self.playlist.iter().find(|item| item.id == video_id); } } - self.playlist.get(self.current_index) - } - - fn current_video_path(&self) -> Result { - let item = self - .current_video() - .ok_or_else(|| anyhow!("当前没有可播放的视频"))?; - Ok(self.config.resolve_media_path(item)) - } - - fn resolve_current_video_loop_count(&self) -> i32 { - if self.state_machine.is_some() { - return 1; + if let Ok(content) = std::fs::read_to_string("/sys/class/graphics/fb0/virtual_size") { + let parts: Vec<&str> = content.trim().split(',').collect(); + if parts.len() == 2 { + if let (Ok(w), Ok(h)) = (parts[0].parse::(), parts[1].parse::()) { + println!("Detected screen size from fb0/virtual_size: {}x{}", w, h); + return Size::new(w, h); + } + } } - self.current_video() - .map(resolve_video_loop_count) - .unwrap_or(1) + let render = self.transformer.render_size(); + println!( + "Could not detect screen size, using render_size fallback: {}x{}", + render.width, render.height, + ); + render } - fn apply_transition(&mut self, frame: &Mat) -> Result { - if !self.in_transition { - return Ok(frame.try_clone()?); - } - - let progress = self.transition_progress(); - let transitioned = self - .transition - .apply(self.last_frame.as_ref(), frame, progress)?; - if progress >= 1.0 { - self.in_transition = false; - self.transition_start = None; - } - Ok(transitioned) - } - - fn transition_progress(&self) -> f64 { - let Some(started_at) = self.transition_start else { - return 1.0; - }; - - (started_at.elapsed().as_secs_f64() / self.transition.duration()).clamp(0.0, 1.0) - } - - fn begin_transition(&mut self) { - if self.transition_enabled && self.last_frame.is_some() { - self.in_transition = true; - self.transition_start = Some(Instant::now()); - } else { - self.in_transition = false; - self.transition_start = None; - } - } - - fn prepare_output_frame(&self, frame: Mat) -> Result { + fn prepare_output_frame(&mut self, frame: Mat) -> Result { if self.config.display.fullscreen { let offset_x = self.config.display.offset_x; let offset_y = self.config.display.offset_y; + if offset_x != 0 || offset_y != 0 { let screen_size = self.detect_screen_size(); let frame_size = frame.size()?; @@ -921,21 +1005,60 @@ impl VideoProcessor { src_region.copy_to(&mut dst_region)?; } + log_mat_size("prepare_output_frame.fullscreen+offset", &output); return Ok(output); } + log_mat_size("prepare_output_frame.fullscreen_bypass", &frame); return Ok(frame); } let target = self.output_size; - if target.width <= 0 || target.height <= 0 || frame.size()? == target { + let frame_size = frame.size()?; + log_mat_size("prepare_output_frame.input", &frame); + self.log_output_sizes(frame_size); + + if target.width <= 0 || target.height <= 0 { + log_mat_size("prepare_output_frame.bypass_invalid_target", &frame); return Ok(frame); } - match self.config.display.scale_mode { + if frame_size == target { + log_mat_size("prepare_output_frame.bypass_matches_target", &frame); + return Ok(frame); + } + + let output = match self.config.display.scale_mode { ScaleMode::Fit => self.scale_fit_to_output(&frame, target), ScaleMode::Stretch => self.scale_stretch_to_output(&frame, target), + }?; + + log_mat_size("prepare_output_frame.output", &output); + Ok(output) + } + + fn log_output_sizes(&mut self, frame_size: Size) { + let render_size = self.transformer.render_size(); + let current_sizes = ( + (render_size.width, render_size.height), + (self.output_size.width, self.output_size.height), + (frame_size.width, frame_size.height), + ); + + if self.last_logged_sizes == Some(current_sizes) { + return; } + + self.last_logged_sizes = Some(current_sizes); + println!( + "Frame sizing render_size={}x{} output_size={}x{} frame_size={}x{}", + render_size.width, + render_size.height, + self.output_size.width, + self.output_size.height, + frame_size.width, + frame_size.height, + ); } fn scale_fit_to_output(&self, frame: &Mat, target: Size) -> Result { @@ -961,27 +1084,27 @@ impl VideoProcessor { let vertical_padding = (target.height - scaled_height).max(0); let horizontal_padding = (target.width - scaled_width).max(0); + let offset_x = self.config.display.offset_x; + let offset_y = self.config.display.offset_y; let mut top = vertical_padding / 2; let mut left = horizontal_padding / 2; - top = (top + self.config.display.offset_y) - .max(0) - .min(vertical_padding); - left = (left + self.config.display.offset_x) - .max(0) - .min(horizontal_padding); + top = (top + offset_y).max(0).min(vertical_padding); let bottom = vertical_padding - top; + + left = (left + offset_x).max(0).min(horizontal_padding); let right = horizontal_padding - left; if top == 0 && bottom == 0 && left == 0 && right == 0 { + log_mat_size("scale_fit_to_output.no_padding", &scaled); return Ok(scaled); } let border_color = if scaled.channels() == 4 { Scalar::new(0.0, 0.0, 0.0, 255.0) } else { - Scalar::all(0.0) + Scalar::new(0.0, 0.0, 0.0, 0.0) }; let mut padded = Mat::default(); @@ -995,6 +1118,7 @@ impl VideoProcessor { core::BORDER_CONSTANT, border_color, )?; + log_mat_size("scale_fit_to_output.padded", &padded); Ok(padded) } @@ -1022,89 +1146,56 @@ impl VideoProcessor { Ok(resized) } - fn configured_output_size(&self) -> Option { - match ( - self.config.display.output_width, - self.config.display.output_height, - ) { - (Some(width), Some(height)) => Some(Size::new(width, height)), - _ => None, - } + fn reload_current_video(&mut self) -> Result<()> { + self.reload_requested = false; + self.open_video(self.current_video()?.clone())?; + Ok(()) } - fn detect_screen_size(&self) -> Size { - if let Some(cached) = self.cached_screen_size { - return cached; + fn open_video(&mut self, video_info: VideoItem) -> Result<()> { + if let Some(mut cap) = self.cap.take() { + cap.release()?; } - if std::env::var("DISPLAY").is_ok() { - if let Ok(output) = std::process::Command::new("xrandr").output() { - if let Ok(text) = String::from_utf8(output.stdout) { - for line in text.lines() { - if line.contains('*') { - let parts: Vec<&str> = line.split_whitespace().collect(); - if let Some(resolution) = parts.first() { - let dims: Vec<&str> = resolution.split('x').collect(); - if dims.len() == 2 { - if let (Ok(width), Ok(height)) = - (dims[0].parse::(), dims[1].parse::()) - { - return Size::new(width, height); - } - } - } - } - } - } - } + let resolved_path = self.config.resolve_media_path(&video_info); + let video_path = resolved_path.to_string_lossy().into_owned(); + let capture = VideoCapture::from_file(&video_path, videoio::CAP_ANY) + .with_context(|| format!("failed to create capture for {}", resolved_path.display()))?; + if !capture.is_opened()? { + bail!("failed to open video: {}", resolved_path.display()); } - if let Ok(content) = std::fs::read_to_string("/sys/class/graphics/fb0/modes") { - let trimmed = content.trim(); - if let Some(x_pos) = trimmed.find('x') { - let start = trimmed[..x_pos] - .rfind(|c: char| !c.is_ascii_digit()) - .map(|position| position + 1) - .unwrap_or(0); - let end = trimmed[x_pos + 1..] - .find(|c: char| !c.is_ascii_digit()) - .map(|position| x_pos + 1 + position) - .unwrap_or(trimmed.len()); - let width = &trimmed[start..x_pos]; - let height = &trimmed[x_pos + 1..end]; - if let (Ok(width), Ok(height)) = (width.parse::(), height.parse::()) { - return Size::new(width, height); - } - } + if self.state_machine.is_some() { + self.max_loops = 1; + } else { + self.max_loops = resolve_video_loop_count(&video_info); } - - if let Ok(content) = std::fs::read_to_string("/sys/class/graphics/fb0/virtual_size") { - let parts: Vec<&str> = content.trim().split(',').collect(); - if parts.len() == 2 { - if let (Ok(width), Ok(height)) = (parts[0].parse::(), parts[1].parse::()) - { - return Size::new(width, height); - } - } - } - - self.transformer.render_size() + self.current_loop = 0; + self.cap = Some(capture); + println!("Playing: {} - {}", video_info.id, resolved_path.display()); + Ok(()) } - fn wait_delay(&mut self) -> i32 { - if self.paused { - return 100; - } + fn capture_mut(&mut self) -> Result<&mut VideoCapture> { + self.cap + .as_mut() + .context("video capture is not initialized") + } - self.frame_delay().unwrap_or(16).max(1) + fn current_video(&self) -> Result<&VideoItem> { + self.playlist + .get(self.current_index) + .context("current playlist index is out of bounds") + } + + fn current_video_id(&self) -> Option { + self.playlist + .get(self.current_index) + .map(|video| video.id.clone()) } fn frame_delay(&mut self) -> Result { - let capture = self - .capture - .as_mut() - .context("video capture is not initialized")?; - let fps = capture.get(videoio::CAP_PROP_FPS)?; + let fps = self.capture_mut()?.get(videoio::CAP_PROP_FPS)?; let fps = if fps.is_finite() && fps > 1.0 { fps } else { @@ -1113,30 +1204,115 @@ impl VideoProcessor { Ok((1000.0 / fps).round() as i32) } - pub(crate) fn handle_key_code(&mut self, key: i32) -> Result<()> { + fn apply_transition(&mut self, frame: &Mat) -> Result { + if !self.in_transition { + return Ok(frame.try_clone()?); + } + + let progress = self.transition_progress(); + let transitioned = self + .transition + .apply(self.last_frame.as_ref(), frame, progress)?; + if progress >= 1.0 { + self.in_transition = false; + self.transition_start = None; + } + + Ok(transitioned) + } + + fn transition_progress(&self) -> f64 { + let Some(started_at) = self.transition_start else { + return 1.0; + }; + + (started_at.elapsed().as_secs_f64() / self.transition.duration()).clamp(0.0, 1.0) + } + + fn handle_key_code_internal(&mut self, key: i32) -> Result { match key { 27 => { self.running = false; + Ok(false) } 32 => { self.paused = !self.paused; + Ok(true) } 110 | 78 => { self.next()?; + Ok(self.running) } 112 | 80 => { self.previous()?; + Ok(true) } - _ => {} + _ => Ok(true), } - - Ok(()) } - fn should_transition(&self) -> bool { - self.config.transition.enabled - && self.config.transition.transition_type != TransitionType::None - && self.config.transition.duration > 0.0 + fn advance_playlist(&mut self) { + if let Some(sm) = &mut self.state_machine { + let old_video_id = sm.current_video_id(); + + let state_changed = match sm.on_video_completed() { + Ok(changed) => changed, + Err(error) => { + eprintln!("State machine error: {}", error); + self.running = false; + return; + } + }; + + if !state_changed { + if let Err(error) = sm.check_random_triggers() { + eprintln!("State machine random trigger error: {}", error); + } + } + + let new_video_id = sm.current_video_id(); + if let Some(video_id) = new_video_id.clone() { + if let Some(index) = self.playlist.iter().position(|v| v.id == video_id) { + self.current_index = index; + + if old_video_id.as_deref() != new_video_id.as_deref() { + self.begin_transition(); + } + return; + } + + eprintln!("Video ID '{}' not found in playlist", video_id); + self.running = false; + return; + } + + self.running = false; + return; + } + + if self.playlist.is_empty() { + self.running = false; + return; + } + + self.current_index += 1; + if self.current_index >= self.playlist.len() { + if self.loop_playlist { + self.current_index = 0; + } else { + self.running = false; + return; + } + } + + self.begin_transition(); + } + + fn begin_transition(&mut self) { + if self.transition_enabled && self.last_frame.is_some() { + self.in_transition = true; + self.transition_start = Some(Instant::now()); + } } fn scene_playlist(&self, scene_name: &str) -> Option<&[VideoItem]> { @@ -1159,3 +1335,15 @@ fn resolve_video_loop_count(item: &VideoItem) -> i32 { item.loop_count.max(1) } + +fn lock_processor(shared: &Arc>) -> Result> { + shared + .lock() + .map_err(|_| anyhow!("video processor lock poisoned")) +} + +impl Drop for VideoProcessor { + fn drop(&mut self) { + Self::show_cursor(); + } +}