Fmt
This commit is contained in:
12 files changed
+30
-29
No files matched your search
@@ -390,7 +390,7 @@ impl BcCamera {
|
||||
}),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// Wait for all thread to finish
|
||||
///
|
||||
/// If an error is returned in any thread it will return the first error
|
||||
|
||||
@@ -805,14 +805,14 @@ impl Discoverer {
|
||||
_ => None,
|
||||
})
|
||||
.await?;
|
||||
|
||||
|
||||
let result = ConnectResult {
|
||||
addr: final_addr,
|
||||
client_id: register_result.client_id,
|
||||
sid: register_result.sid,
|
||||
camera_id: local_did,
|
||||
};
|
||||
|
||||
|
||||
// Confirm relay to register
|
||||
let msg = UdpDiscovery {
|
||||
tid: 0,
|
||||
|
||||
@@ -214,8 +214,10 @@ impl NeoMediaFactoryImpl {
|
||||
bin.remove(&element)?;
|
||||
}
|
||||
|
||||
let mut client_data: ClientPipelineData = Default::default();
|
||||
client_data.start_time = self.shared.microseconds.load(Ordering::Relaxed);
|
||||
let mut client_data = ClientPipelineData {
|
||||
start_time: self.shared.microseconds.load(Ordering::Relaxed),
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
// Now contruct the actual ones
|
||||
match *self.shared.vid_format.blocking_read() {
|
||||
|
||||
@@ -13,17 +13,14 @@ use gstreamer_rtsp_server::{
|
||||
gio::{TlsAuthenticationMode, TlsCertificate},
|
||||
prelude::*,
|
||||
subclass::prelude::*,
|
||||
RTSPAuth, RTSPClient, RTSPServer, RTSPToken, RTSP_TOKEN_MEDIA_FACTORY_ROLE,
|
||||
RTSPAuth, RTSPServer, RTSPToken, RTSP_TOKEN_MEDIA_FACTORY_ROLE,
|
||||
};
|
||||
use log::*;
|
||||
use neolink_core::bcmedia::model::*;
|
||||
use std::{
|
||||
collections::{hash_map::Entry, HashMap, HashSet},
|
||||
fs,
|
||||
sync::{
|
||||
atomic::{AtomicU64, Ordering},
|
||||
Arc,
|
||||
},
|
||||
sync::Arc,
|
||||
};
|
||||
use tokio::{
|
||||
sync::{mpsc::Sender, RwLock},
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
//! components that manage a media stream
|
||||
use gstreamer_app::AppSrc;
|
||||
pub use gstreamer_rtsp_server::gio::{TlsAuthenticationMode, TlsCertificate};
|
||||
use std::sync::atomic::{AtomicU64, AtomicUsize, AtomicBool};
|
||||
use std::sync::atomic::{AtomicBool, AtomicU64, AtomicUsize};
|
||||
use tokio::sync::RwLock;
|
||||
|
||||
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
|
||||
|
||||
+14
-9
@@ -53,11 +53,11 @@
|
||||
// - `"none"`: Resends the last iframe the camera. This does not reencode at all. **Most use cases should use this one as it has the least effort on the cpu and gives what you would expect**
|
||||
//
|
||||
use anyhow::{anyhow, Context, Result};
|
||||
use log::*;
|
||||
use tokio_stream::StreamExt;
|
||||
use futures::stream::FuturesUnordered;
|
||||
use log::*;
|
||||
use std::sync::Arc;
|
||||
use std::time::Duration;
|
||||
use tokio_stream::StreamExt;
|
||||
|
||||
mod cmdline;
|
||||
mod gst;
|
||||
@@ -171,14 +171,20 @@ async fn camera_main(camera: Camera<Disconnected>) -> Result<(), CameraFailureKi
|
||||
.await
|
||||
.with_context(|| format!("{}: Could not start stream", name))
|
||||
.map_err(CameraFailureKind::Retry)?;
|
||||
|
||||
|
||||
let tags = streaming.shared.get_tags();
|
||||
let rtsp_thread = streaming.get_rtsp();
|
||||
|
||||
|
||||
let mut waiter = tokio::time::interval(Duration::from_micros(500));
|
||||
loop {
|
||||
waiter.tick().await;
|
||||
if tags.iter().map(|tag| rtsp_thread.buffer_ready(tag)).collect::<FuturesUnordered<_>>().all(|f| f.unwrap_or(false)).await {
|
||||
if tags
|
||||
.iter()
|
||||
.map(|tag| rtsp_thread.buffer_ready(tag))
|
||||
.collect::<FuturesUnordered<_>>()
|
||||
.all(|f| f.unwrap_or(false))
|
||||
.await
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -197,8 +203,7 @@ async fn camera_main(camera: Camera<Disconnected>) -> Result<(), CameraFailureKi
|
||||
// );
|
||||
// }
|
||||
// });
|
||||
|
||||
|
||||
|
||||
loop {
|
||||
// Wait for error or reason to pause
|
||||
tokio::select! {
|
||||
@@ -220,7 +225,7 @@ async fn camera_main(camera: Camera<Disconnected>) -> Result<(), CameraFailureKi
|
||||
v = async {
|
||||
// Wait for client to disconnect
|
||||
let mut inter = tokio::time::interval(tokio::time::Duration::from_secs_f32(0.01));
|
||||
|
||||
|
||||
info!("Await Client Pause");
|
||||
loop {
|
||||
inter.tick().await;
|
||||
@@ -255,7 +260,7 @@ async fn camera_main(camera: Camera<Disconnected>) -> Result<(), CameraFailureKi
|
||||
v = async {
|
||||
// Wait for client to connect
|
||||
let mut inter = tokio::time::interval(tokio::time::Duration::from_secs_f32(0.01));
|
||||
|
||||
|
||||
loop {
|
||||
inter.tick().await;
|
||||
let total_clients = tags.iter().map(|tag| rtsp_thread.get_number_of_clients(tag)).collect::<FuturesUnordered<_>>().fold(0usize, |acc, f| acc + f.unwrap_or(0usize)).await;
|
||||
|
||||
@@ -18,7 +18,7 @@ impl<T> Camera<T> {
|
||||
pub(crate) fn get_config(&self) -> &CameraConfig {
|
||||
&self.shared.config
|
||||
}
|
||||
|
||||
|
||||
pub(crate) fn get_rtsp(&self) -> Arc<super::super::gst::NeoRtspServer> {
|
||||
self.shared.rtsp.clone()
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@ pub(crate) struct Connected {
|
||||
}
|
||||
|
||||
impl Camera<Connected> {
|
||||
#[allow(dead_code)]
|
||||
pub(crate) async fn disconnect(self) -> Result<Camera<Disconnected>> {
|
||||
Ok(Camera {
|
||||
shared: self.shared,
|
||||
|
||||
@@ -15,6 +15,7 @@ pub(crate) struct LoggedIn {
|
||||
}
|
||||
|
||||
impl Camera<LoggedIn> {
|
||||
#[allow(dead_code)]
|
||||
pub(crate) async fn logout(self) -> Result<Camera<Connected>> {
|
||||
self.state.camera.logout().await?;
|
||||
Ok(Camera {
|
||||
|
||||
@@ -8,6 +8,4 @@ mod loggedin;
|
||||
mod shared;
|
||||
mod streaming;
|
||||
|
||||
pub(crate) use self::{
|
||||
camera::*, disconnected::*, loggedin::*, shared::*,
|
||||
};
|
||||
pub(crate) use self::{camera::*, disconnected::*, loggedin::*, shared::*};
|
||||
@@ -2,7 +2,7 @@
|
||||
//! Shared data between all states
|
||||
//!
|
||||
//!
|
||||
use anyhow::{Context, Error, Result};
|
||||
use anyhow::{Context, Result};
|
||||
use log::*;
|
||||
use std::collections::HashSet;
|
||||
use std::sync::Arc;
|
||||
|
||||
@@ -7,10 +7,7 @@ use log::*;
|
||||
use tokio::time::{timeout, Duration};
|
||||
use tokio::{sync::RwLock, task::JoinSet};
|
||||
|
||||
use neolink_core::{
|
||||
bc_protocol::{BcCamera, StreamKind as Stream},
|
||||
bcmedia::model::BcMedia,
|
||||
};
|
||||
use neolink_core::bc_protocol::{BcCamera, StreamKind as Stream};
|
||||
|
||||
use super::{camera::Camera, LoggedIn};
|
||||
|
||||
|
||||
Reference in new issue
Block a user