Compare commits

..
Author SHA1 Message Date
QuantumEntangledAndy 6925736030 Funding yml 2023-07-18 18:47:01 +07:00
Andrew King edfacc7eba Update README.md 2023-07-18 18:45:03 +07:00
6 changed files with 21 additions and 31 deletions

No files matched your search

+13
View File
@@ -0,0 +1,13 @@
# These are supported funding model platforms
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: qesoul
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+1 -1
View File
@@ -1,6 +1,6 @@
# Neolink
![CI](https://github.com/QuantumEntangledAndy/neolink/workflows/CI/badge.svg)
![CI](https://github.com/QuantumEntangledAndy/neolink/workflows/CI/badge.svg) [![dependency status](https://deps.rs/repo/github/QuantumEntangledAndy/neolink/status.svg)](https://deps.rs/repo/github/QuantumEntangledAndy/neolink) <a href='https://ko-fi.com/G2G5HOYIZ' target='_blank'><img height='12' style='border:0px;height:30px;' src='https://storage.ko-fi.com/cdn/kofi2.png?v=3' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a>
Neolink is a small program that acts as a proxy between Reolink IP cameras and
normal RTSP clients.
-3
View File
@@ -120,9 +120,6 @@ 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)]
+6 -12
View File
@@ -41,17 +41,16 @@ glib::wrapper! {
impl Default for NeoMediaFactory {
fn default() -> Self {
Self::new(100, true, true)
Self::new(100, true)
}
}
impl NeoMediaFactory {
pub(crate) fn new(buffer_size: usize, use_smoothing: bool, use_splash: bool) -> Self {
pub(crate) fn new(buffer_size: usize, use_smoothing: 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);
@@ -184,7 +183,7 @@ impl ObjectImpl for NeoMediaFactoryImpl {}
impl RTSPMediaFactoryImpl for NeoMediaFactoryImpl {
fn create_element(&self, url: &RTSPUrl) -> Option<Element> {
self.parent_create_element(url)
.and_then(|orig| self.build_pipeline(orig).expect("Could not build pipeline"))
.map(|orig| self.build_pipeline(orig).expect("Could not build pipeline"))
}
}
@@ -260,7 +259,7 @@ impl NeoMediaFactoryImpl {
self.shared.number_of_clients.load(Ordering::Relaxed)
}
fn build_pipeline(&self, media: Element) -> AnyResult<Option<Element>> {
fn build_pipeline(&self, media: Element) -> AnyResult<Element> {
// debug!("Building PIPELINE");
let bin = media
.dynamic_cast::<Bin>()
@@ -283,9 +282,6 @@ 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");
@@ -592,10 +588,8 @@ impl NeoMediaFactoryImpl {
self.clientsender.blocking_send(client_data)?;
// debug!("Pipeline built");
let element = bin
.dynamic_cast::<Element>()
.map_err(|_| anyhow!("Cannot cast back"))?;
Ok(Some(element))
bin.dynamic_cast::<Element>()
.map_err(|_| anyhow!("Cannot cast back"))
}
async fn join(&self) -> AnyResult<()> {
+1 -5
View File
@@ -363,11 +363,7 @@ 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,
config.use_splash,
);
let media = NeoMediaFactory::new(config.buffer_size, config.use_smoothing);
let thread_media = media.clone();
self.threads
.write()
-10
View File
@@ -25,7 +25,6 @@ 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 {
@@ -37,7 +36,6 @@ impl Default for NeoMediaShared {
buffer_ready: AtomicBool::new(false),
buffer_size: AtomicUsize::new(100),
use_smoothing: AtomicBool::new(false),
splash: AtomicBool::new(true),
}
}
}
@@ -58,12 +56,4 @@ 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)
}
}