lesavka: keep source and 1080p distinct in 0.7.2
This commit is contained in:
parent
b7803dc432
commit
dddae51ac2
@ -4,7 +4,7 @@ path = "src/main.rs"
|
|||||||
|
|
||||||
[package]
|
[package]
|
||||||
name = "lesavka_client"
|
name = "lesavka_client"
|
||||||
version = "0.7.1"
|
version = "0.7.2"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@ -70,7 +70,7 @@ pub struct SnapshotReport {
|
|||||||
pub remote_active: bool,
|
pub remote_active: bool,
|
||||||
pub power_state: String,
|
pub power_state: String,
|
||||||
pub preview_source: String,
|
pub preview_source: String,
|
||||||
pub breakout_display: String,
|
pub client_display_limit: String,
|
||||||
pub left_surface: String,
|
pub left_surface: String,
|
||||||
pub left_capture_profile: String,
|
pub left_capture_profile: String,
|
||||||
pub left_capture_transport: String,
|
pub left_capture_transport: String,
|
||||||
@ -114,7 +114,7 @@ impl SnapshotReport {
|
|||||||
"{}x{} @ {} fps",
|
"{}x{} @ {} fps",
|
||||||
state.preview_source.width, state.preview_source.height, state.preview_source.fps
|
state.preview_source.width, state.preview_source.height, state.preview_source.fps
|
||||||
),
|
),
|
||||||
breakout_display: format!(
|
client_display_limit: format!(
|
||||||
"{}x{}",
|
"{}x{}",
|
||||||
state.breakout_display.width, state.breakout_display.height
|
state.breakout_display.width, state.breakout_display.height
|
||||||
),
|
),
|
||||||
@ -184,7 +184,7 @@ impl SnapshotReport {
|
|||||||
self.routing, self.view_mode, self.remote_active, self.power_state
|
self.routing, self.view_mode, self.remote_active, self.power_state
|
||||||
);
|
);
|
||||||
let _ = writeln!(text, "source feed: {}", self.preview_source);
|
let _ = writeln!(text, "source feed: {}", self.preview_source);
|
||||||
let _ = writeln!(text, "breakout display: {}", self.breakout_display);
|
let _ = writeln!(text, "client display limit: {}", self.client_display_limit);
|
||||||
let _ = writeln!(text);
|
let _ = writeln!(text);
|
||||||
let _ = writeln!(text, "left eye");
|
let _ = writeln!(text, "left eye");
|
||||||
let _ = writeln!(text, " surface: {}", self.left_surface);
|
let _ = writeln!(text, " surface: {}", self.left_surface);
|
||||||
|
|||||||
@ -686,7 +686,10 @@ fn capture_size_options(source: PreviewSourceSize) -> Vec<CaptureSizeChoice> {
|
|||||||
] {
|
] {
|
||||||
let choice = capture_size_choice(source, preset);
|
let choice = capture_size_choice(source, preset);
|
||||||
if options.iter().any(|existing: &CaptureSizeChoice| {
|
if options.iter().any(|existing: &CaptureSizeChoice| {
|
||||||
existing.width == choice.width
|
let existing_transport = existing.preset.transport_label();
|
||||||
|
let current_transport = choice.preset.transport_label();
|
||||||
|
existing_transport == current_transport
|
||||||
|
&& existing.width == choice.width
|
||||||
&& existing.height == choice.height
|
&& existing.height == choice.height
|
||||||
&& existing.fps == choice.fps
|
&& existing.fps == choice.fps
|
||||||
&& existing.max_bitrate_kbit == choice.max_bitrate_kbit
|
&& existing.max_bitrate_kbit == choice.max_bitrate_kbit
|
||||||
@ -933,6 +936,11 @@ mod tests {
|
|||||||
&& choice.width == 1920
|
&& choice.width == 1920
|
||||||
&& choice.height == 1080
|
&& choice.height == 1080
|
||||||
}));
|
}));
|
||||||
|
assert!(capture_options.iter().any(|choice| {
|
||||||
|
choice.preset == CaptureSizePreset::P1080
|
||||||
|
&& choice.width == 1920
|
||||||
|
&& choice.height == 1080
|
||||||
|
}));
|
||||||
|
|
||||||
let breakout_options = state.breakout_size_options();
|
let breakout_options = state.breakout_size_options();
|
||||||
assert!(breakout_options.len() >= 5);
|
assert!(breakout_options.len() >= 5);
|
||||||
|
|||||||
@ -839,7 +839,7 @@ pub fn sync_capture_size_combo(
|
|||||||
option.max_bitrate_kbit
|
option.max_bitrate_kbit
|
||||||
),
|
),
|
||||||
_ => format!(
|
_ => format!(
|
||||||
"{} • {}x{} @ {} fps • {} kbit",
|
"{} • {}x{} @ {} fps • {} kbit (Re-encode)",
|
||||||
option.preset.label(),
|
option.preset.label(),
|
||||||
option.width,
|
option.width,
|
||||||
option.height,
|
option.height,
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "lesavka_common"
|
name = "lesavka_common"
|
||||||
version = "0.7.1"
|
version = "0.7.2"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
build = "build.rs"
|
build = "build.rs"
|
||||||
|
|
||||||
|
|||||||
@ -17,6 +17,6 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn banner_includes_version() {
|
fn banner_includes_version() {
|
||||||
assert_eq!(banner("0.7.1"), "lesavka-common CLI (v0.7.1)");
|
assert_eq!(banner("0.7.2"), "lesavka-common CLI (v0.7.2)");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,7 +10,7 @@ bench = false
|
|||||||
|
|
||||||
[package]
|
[package]
|
||||||
name = "lesavka_server"
|
name = "lesavka_server"
|
||||||
version = "0.7.1"
|
version = "0.7.2"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
autobins = false
|
autobins = false
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user