GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-07-29 09:41:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

del: 删除 MJPEG 输入格式自动切换功能

Browse Source
This commit is contained in:
mofeng-git
2026-07-06 20:51:58 +08:00
parent 618599266e
commit f6e97a06f5
1 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/video/stream_manager.rs
View File

@@ -37,7 +37,6 @@ use crate::events::{EventBus, SystemEvent, VideoDeviceInfo};
use crate::hid::HidController; use crate::hid::HidController;
use crate::stream::MjpegStreamHandler; use crate::stream::MjpegStreamHandler;
use crate::video::codec_constraints::StreamCodecConstraints; use crate::video::codec_constraints::StreamCodecConstraints;
use crate::video::device::is_csi_hdmi_bridge;
use crate::video::format::{PixelFormat, Resolution}; use crate::video::format::{PixelFormat, Resolution};
use crate::video::streamer::{Streamer, StreamerState, StreamerStats}; use crate::video::streamer::{Streamer, StreamerState, StreamerStats};
use crate::video::traits::VideoOutput; use crate::video::traits::VideoOutput;
@@ -439,33 +438,6 @@ impl VideoStreamManager {
StreamMode::Mjpeg => { StreamMode::Mjpeg => {
info!("Starting MJPEG streaming"); info!("Starting MJPEG streaming");
// Auto-switch to MJPEG format if device supports it
if let Some(device) = self.streamer.current_device().await {
let (current_format, resolution, fps) =
self.streamer.current_video_config().await;
let available_formats: Vec<PixelFormat> =
device.formats.iter().map(|f| f.format).collect();
// If current format is not MJPEG and device supports MJPEG, switch to it
if !is_csi_hdmi_bridge(&device)
&& current_format != PixelFormat::Mjpeg
&& available_formats.contains(&PixelFormat::Mjpeg)
{
info!("Auto-switching to MJPEG format for MJPEG mode");
let device_path = device.path.to_string_lossy().to_string();
if let Err(e) = self
.streamer
.apply_video_config(&device_path, PixelFormat::Mjpeg, resolution, fps)
.await
{
warn!(
"Failed to auto-switch to MJPEG format: {}, keeping current format",
e
);
}
}
}
if let Err(e) = self.streamer.start().await { if let Err(e) = self.streamer.start().await {
error!("Failed to start MJPEG streamer: {}", e); error!("Failed to start MJPEG streamer: {}", e);
return Err(e); return Err(e);