Add splash_pattern config

This commit is contained in:
QuantumEntangledAndy committed 2023-10-17 12:47:23 +07:00
1 parent 0cf5b1e8f2
commit 86456335f0
3 files changed
+110 -6

No files matched your search

+98
View File
@@ -193,6 +193,9 @@ pub(crate) struct CameraConfig {
#[serde(default = "default_true", alias = "splash")]
pub(crate) use_splash: bool,
#[serde(default = "default_splash", alias = "patter")]
pub(crate) splash_pattern: SplashPattern,
#[serde(
default = "default_max_discovery_retries",
alias = "retries",
@@ -317,6 +320,97 @@ pub(crate) struct PauseConfig {
pub(crate) mode: String,
}
#[derive(Debug, Deserialize, Serialize, Clone, Copy, Eq, PartialEq)]
pub(crate) enum SplashPattern {
#[serde(alias = "smpte")]
Smpte,
#[serde(alias = "snow")]
Snow,
#[serde(alias = "black")]
Black,
#[serde(alias = "white")]
White,
#[serde(alias = "red")]
Red,
#[serde(alias = "green")]
Green,
#[serde(alias = "blue")]
Blue,
#[serde(alias = "checkers-1")]
Checkers1,
#[serde(alias = "checkers-2")]
Checkers2,
#[serde(alias = "checkers-4")]
Checkers4,
#[serde(alias = "checkers-8")]
Checkers8,
#[serde(alias = "circular")]
Circular,
#[serde(alias = "blink")]
Blink,
#[serde(alias = "smpte75")]
Smpte75,
#[serde(alias = "zone-plate")]
ZonePlate,
#[serde(alias = "gamut")]
Gamut,
#[serde(alias = "chroma-zone-plate")]
ChromaZonePlate,
#[serde(alias = "solid-color")]
SolidColor,
#[serde(alias = "ball")]
Ball,
#[serde(alias = "smpte100")]
Smpte100,
#[serde(alias = "bar")]
Bar,
#[serde(alias = "pinwheel")]
Pinwheel,
#[serde(alias = "spokes")]
Spokes,
#[serde(alias = "gradient")]
Gradient,
#[serde(alias = "colors")]
Colors,
#[serde(alias = "smpte-rp-219")]
SmpteRp219,
}
impl std::fmt::Display for SplashPattern {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
let s = match self {
SplashPattern::Smpte => "smpte",
SplashPattern::Snow => "snow",
SplashPattern::Black => "black",
SplashPattern::White => "white",
SplashPattern::Red => "red",
SplashPattern::Green => "green",
SplashPattern::Blue => "blue",
SplashPattern::Checkers1 => "checkers-1",
SplashPattern::Checkers2 => "checkers-2",
SplashPattern::Checkers4 => "checkers-4",
SplashPattern::Checkers8 => "checkers-8",
SplashPattern::Circular => "circular",
SplashPattern::Blink => "blink",
SplashPattern::Smpte75 => "smpte75",
SplashPattern::ZonePlate => "zone-plate",
SplashPattern::Gamut => "gamut",
SplashPattern::ChromaZonePlate => "chroma-zone-plate",
SplashPattern::SolidColor => "solid-color",
SplashPattern::Ball => "ball",
SplashPattern::Smpte100 => "smpte100",
SplashPattern::Bar => "bar",
SplashPattern::Pinwheel => "pinwheel",
SplashPattern::Spokes => "spokes",
SplashPattern::Gradient => "gradient",
SplashPattern::Colors => "colors",
SplashPattern::SmpteRp219 => "smpte-rp-219",
}
.to_string();
write!(f, "{}", s)
}
}
fn default_bind_addr() -> String {
"0.0.0.0".to_string()
}
@@ -390,6 +484,10 @@ fn default_2000() -> u64 {
2000
}
fn default_splash() -> SplashPattern {
SplashPattern::Snow
}
pub(crate) static RESERVED_NAMES: &[&str] = &["anyone", "anonymous"];
fn validate_username(name: &str) -> Result<(), ValidationError> {
if name.trim().is_empty() {
+10 -5
View File
@@ -19,13 +19,16 @@ pub(super) struct ClientData {
pub(super) aud: Option<ClientSourceData>,
}
pub(super) async fn make_dummy_factory(use_splash: bool) -> AnyResult<NeoMediaFactory> {
pub(super) async fn make_dummy_factory(
use_splash: bool,
pattern: String,
) -> AnyResult<NeoMediaFactory> {
NeoMediaFactory::new_with_callback(move |element| {
clear_bin(&element)?;
if !use_splash {
Ok(None)
} else {
build_unknown(&element)?;
build_unknown(&element, &pattern)?;
Ok(Some(element))
}
})
@@ -43,7 +46,9 @@ pub(super) async fn make_factory(
clear_bin(&element)?;
let vid = match stream_config.vid_format {
VidFormat::None => {
build_unknown(&element)?;
// This should not be reachable
log::debug!("Building unknown during normal make factory");
build_unknown(&element, "black")?;
AnyResult::Ok(None)
}
VidFormat::H264 => {
@@ -118,14 +123,14 @@ fn clear_bin(bin: &Element) -> Result<()> {
Ok(())
}
fn build_unknown(bin: &Element) -> Result<()> {
fn build_unknown(bin: &Element, pattern: &str) -> Result<()> {
let bin = bin
.clone()
.dynamic_cast::<Bin>()
.map_err(|_| anyhow!("Media source's element should be a bin"))?;
log::debug!("Building Unknown Pipeline");
let source = make_element("videotestsrc", "testvidsrc")?;
source.set_property_from_str("pattern", "snow");
source.set_property_from_str("pattern", pattern);
source.set_property("num-buffers", 500i32); // Send buffers then EOS
let queue = make_queue("queue0", 1024 * 1024 * 4)?;
+2 -1
View File
@@ -302,6 +302,7 @@ async fn camera_main(camera: NeoInstance, rtsp: &NeoRtspServer) -> Result<()> {
.drain(..)
.collect::<HashSet<_>>();
let use_splash = camera_config.borrow().use_splash;
let splash_pattern = camera_config.borrow().splash_pattern.to_string();
// This select is for changes to camera_config.stream
break tokio::select! {
@@ -332,7 +333,7 @@ async fn camera_main(camera: NeoInstance, rtsp: &NeoRtspServer) -> Result<()> {
};
// Create the dummy factory
let dummy_factory = make_dummy_factory(use_splash).await?;
let dummy_factory = make_dummy_factory(use_splash, splash_pattern).await?;
dummy_factory.add_permitted_roles(&permitted_users);
let mut supported_streams_1 = supported_streams.clone();
let mut supported_streams_2 = supported_streams.clone();