Compare commits

..
Author SHA1 Message Date
QuantumEntangledAndy 786218a114 Make Stream Not Ready splash optional 2023-07-18 14:51:14 +07:00
5 changed files with 31 additions and 8 deletions

No files matched your search

Generated
+1 -1
View File
@@ -1417,7 +1417,7 @@ dependencies = [
[[package]]
name = "neolink"
version = "0.5.13"
version = "0.5.14"
dependencies = [
"anyhow",
"base64 0.21.2",
+3
View File
@@ -120,6 +120,9 @@ pub(crate) struct CameraConfig {
alias = "stretching"
)]
pub(crate) use_smoothing: bool,
#[serde(default = "default_true", alias = "splash")]
pub(crate) use_splash: bool,
}
#[derive(Debug, Deserialize, Validate, Clone)]
+12 -6
View File
@@ -41,16 +41,17 @@ glib::wrapper! {
impl Default for NeoMediaFactory {
fn default() -> Self {
Self::new(100, true)
Self::new(100, true, true)
}
}
impl NeoMediaFactory {
pub(crate) fn new(buffer_size: usize, use_smoothing: bool) -> Self {
pub(crate) fn new(buffer_size: usize, use_smoothing: bool, use_splash: bool) -> Self {
let factory = Object::new::<NeoMediaFactory>();
factory.set_shared(false);
factory.imp().shared.set_buffer_size(buffer_size);
factory.imp().shared.set_use_smoothing(use_smoothing);
factory.imp().shared.set_use_splash(use_splash);
factory.set_launch("videotestsrc pattern=\"snow\" ! video/x-raw,width=896,height=512,framerate=25/1 ! textoverlay name=\"inittextoverlay\" text=\"Stream not Ready\" valignment=top halignment=left font-desc=\"Sans, 32\" ! jpegenc ! rtpjpegpay name=pay0");
factory.set_suspend_mode(RTSPSuspendMode::None);
factory.set_transport_mode(RTSPTransportMode::PLAY);
@@ -183,7 +184,7 @@ impl ObjectImpl for NeoMediaFactoryImpl {}
impl RTSPMediaFactoryImpl for NeoMediaFactoryImpl {
fn create_element(&self, url: &RTSPUrl) -> Option<Element> {
self.parent_create_element(url)
.map(|orig| self.build_pipeline(orig).expect("Could not build pipeline"))
.and_then(|orig| self.build_pipeline(orig).expect("Could not build pipeline"))
}
}
@@ -259,7 +260,7 @@ impl NeoMediaFactoryImpl {
self.shared.number_of_clients.load(Ordering::Relaxed)
}
fn build_pipeline(&self, media: Element) -> AnyResult<Element> {
fn build_pipeline(&self, media: Element) -> AnyResult<Option<Element>> {
// debug!("Building PIPELINE");
let bin = media
.dynamic_cast::<Bin>()
@@ -282,6 +283,9 @@ impl NeoMediaFactoryImpl {
self.shared.buffer_ready.load(Ordering::Relaxed),
) {
(VidFormats::Unknown, true) | (_, false) => {
if !self.shared.get_use_splash() {
return Ok(None);
}
debug!("Building Unknown Pipeline");
let source = make_element("videotestsrc", "testvidsrc")?;
source.set_property_from_str("pattern", "snow");
@@ -588,8 +592,10 @@ impl NeoMediaFactoryImpl {
self.clientsender.blocking_send(client_data)?;
// debug!("Pipeline built");
bin.dynamic_cast::<Element>()
.map_err(|_| anyhow!("Cannot cast back"))
let element = bin
.dynamic_cast::<Element>()
.map_err(|_| anyhow!("Cannot cast back"))?;
Ok(Some(element))
}
async fn join(&self) -> AnyResult<()> {
+5 -1
View File
@@ -363,7 +363,11 @@ impl NeoRtspServerImpl {
match self.medias.write().await.entry(key.clone()) {
Entry::Occupied(_occ) => {}
Entry::Vacant(vac) => {
let media = NeoMediaFactory::new(config.buffer_size, config.use_smoothing);
let media = NeoMediaFactory::new(
config.buffer_size,
config.use_smoothing,
config.use_splash,
);
let thread_media = media.clone();
self.threads
.write()
+10
View File
@@ -25,6 +25,7 @@ pub(super) struct NeoMediaShared {
pub(super) buffer_ready: AtomicBool,
pub(super) buffer_size: AtomicUsize,
pub(super) use_smoothing: AtomicBool,
pub(super) splash: AtomicBool,
}
impl Default for NeoMediaShared {
@@ -36,6 +37,7 @@ impl Default for NeoMediaShared {
buffer_ready: AtomicBool::new(false),
buffer_size: AtomicUsize::new(100),
use_smoothing: AtomicBool::new(false),
splash: AtomicBool::new(true),
}
}
}
@@ -56,4 +58,12 @@ impl NeoMediaShared {
pub(super) fn set_use_smoothing(&self, new_value: bool) {
self.use_smoothing.store(new_value, Ordering::Relaxed)
}
pub(super) fn get_use_splash(&self) -> bool {
self.splash.load(Ordering::Relaxed)
}
pub(super) fn set_use_splash(&self, new_value: bool) {
self.splash.store(new_value, Ordering::Relaxed)
}
}