Restucture of rtsp crate into module
This commit is contained in:
12 files changed
+60
-84
No files matched your search
Generated
+21
-32
@@ -945,43 +945,12 @@ checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204"
|
||||
[[package]]
|
||||
name = "neolink"
|
||||
version = "0.4.0"
|
||||
dependencies = [
|
||||
"env_logger",
|
||||
"err-derive",
|
||||
"log",
|
||||
"neolink_core",
|
||||
"neolink_rtsp",
|
||||
"structopt",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "neolink_core"
|
||||
version = "0.4.0"
|
||||
dependencies = [
|
||||
"aes",
|
||||
"cfb-mode",
|
||||
"cookie-factory",
|
||||
"env_logger",
|
||||
"err-derive",
|
||||
"indoc",
|
||||
"log",
|
||||
"md5",
|
||||
"nom",
|
||||
"socket2",
|
||||
"time",
|
||||
"xml-rs",
|
||||
"yaserde",
|
||||
"yaserde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "neolink_rtsp"
|
||||
version = "0.4.0"
|
||||
dependencies = [
|
||||
"aes",
|
||||
"cfb-mode",
|
||||
"cookie-factory",
|
||||
"crossbeam",
|
||||
"env_logger",
|
||||
"err-derive",
|
||||
"gio",
|
||||
"glib 0.14.2",
|
||||
@@ -1008,6 +977,26 @@ dependencies = [
|
||||
"yaserde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "neolink_core"
|
||||
version = "0.4.0"
|
||||
dependencies = [
|
||||
"aes",
|
||||
"cfb-mode",
|
||||
"cookie-factory",
|
||||
"env_logger",
|
||||
"err-derive",
|
||||
"indoc",
|
||||
"log",
|
||||
"md5",
|
||||
"nom",
|
||||
"socket2",
|
||||
"time",
|
||||
"xml-rs",
|
||||
"yaserde",
|
||||
"yaserde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nom"
|
||||
version = "6.2.1"
|
||||
|
||||
+25
-2
@@ -12,8 +12,31 @@ members = [
|
||||
|
||||
[dependencies]
|
||||
neolink_core = { path = "crates/core", version = "0.4.0" }
|
||||
neolink_rtsp = { path = "crates/rtsp", version = "0.4.0" }
|
||||
env_logger = "*"
|
||||
aes = "0.6"
|
||||
cfb-mode = "0.6"
|
||||
cookie-factory = "0.3"
|
||||
crossbeam = "0.7"
|
||||
err-derive = "0.2"
|
||||
env_logger = "*"
|
||||
glib = ">=0.10.3"
|
||||
gio = "0.9"
|
||||
gstreamer = "0.16"
|
||||
gstreamer-app = "0.16"
|
||||
gstreamer-rtsp = "0.16"
|
||||
gstreamer-rtsp-server = { version = "0.16", features = ["v1_12", "v1_14"]}
|
||||
lazy_static = "1.4"
|
||||
log = { version = "0.4" }
|
||||
itertools = "0.9"
|
||||
md5 = "0.7"
|
||||
nom = "6.1.2"
|
||||
regex = "1"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
socket2 = "0.3"
|
||||
structopt = "0.3"
|
||||
time = "0.2"
|
||||
toml = "0.5"
|
||||
yaserde = "0.3.16"
|
||||
yaserde_derive = "0.3.16"
|
||||
xml-rs = "0.8"
|
||||
validator = "0.10"
|
||||
validator_derive = "0.10"
|
||||
@@ -1,36 +0,0 @@
|
||||
[package]
|
||||
name = "neolink_rtsp"
|
||||
description = "A standards-compliant bridge to Reolink IP cameras"
|
||||
version = "0.4.0"
|
||||
authors = ["George Hilliard <thirtythreeforty@gmail.com>"]
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
neolink_core = { path = "../core", version = "0.4.0" }
|
||||
aes = "0.6"
|
||||
cfb-mode = "0.6"
|
||||
cookie-factory = "0.3"
|
||||
crossbeam = "0.7"
|
||||
err-derive = "0.2"
|
||||
glib = ">=0.10.3"
|
||||
gio = "0.9"
|
||||
gstreamer = "0.16"
|
||||
gstreamer-app = "0.16"
|
||||
gstreamer-rtsp = "0.16"
|
||||
gstreamer-rtsp-server = { version = "0.16", features = ["v1_12", "v1_14"]}
|
||||
lazy_static = "1.4"
|
||||
log = { version = "0.4" }
|
||||
itertools = "0.9"
|
||||
md5 = "0.7"
|
||||
nom = "6.1.2"
|
||||
regex = "1"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
socket2 = "0.3"
|
||||
structopt = "0.3"
|
||||
time = "0.2"
|
||||
toml = "0.5"
|
||||
yaserde = "0.3.16"
|
||||
yaserde_derive = "0.3.16"
|
||||
xml-rs = "0.8"
|
||||
validator = "0.10"
|
||||
validator_derive = "0.10"
|
||||
+1
-1
@@ -10,5 +10,5 @@ pub struct Opt {
|
||||
|
||||
#[derive(StructOpt, Debug)]
|
||||
pub enum Command {
|
||||
Rtsp(neolink_rtsp::cmdline::Opt),
|
||||
Rtsp(super::rtsp::Opt),
|
||||
}
|
||||
+1
-1
@@ -4,5 +4,5 @@ use err_derive::Error;
|
||||
#[allow(clippy::large_enum_variant)]
|
||||
pub enum Error {
|
||||
#[error(display = "RTSP Error")]
|
||||
RtspError(#[error(source)] neolink_rtsp::errors::Error),
|
||||
RtspError(#[error(source)] super::rtsp::Error),
|
||||
}
|
||||
+2
-1
@@ -13,6 +13,7 @@ use structopt::StructOpt;
|
||||
|
||||
mod cmdline;
|
||||
mod errors;
|
||||
mod rtsp;
|
||||
|
||||
use cmdline::{Command, Opt};
|
||||
use errors::Error;
|
||||
@@ -30,7 +31,7 @@ fn main() -> Result<(), Error> {
|
||||
|
||||
match opt.cmd {
|
||||
Command::Rtsp(opts) => {
|
||||
neolink_rtsp::main(opts)?;
|
||||
rtsp::main(opts)?;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,10 +1,9 @@
|
||||
#![warn(missing_docs)]
|
||||
//!
|
||||
//! # Neolink RTSP
|
||||
//!
|
||||
//! This crate serves as the rtsp source for the
|
||||
//! `neolink rtsp` subcommand
|
||||
//!
|
||||
///
|
||||
/// # Neolink RTSP
|
||||
///
|
||||
/// This crate serves as the rtsp source for the
|
||||
/// `neolink rtsp` subcommand
|
||||
///
|
||||
use gio::TlsAuthenticationMode;
|
||||
use log::*;
|
||||
use neolink_core::bc_protocol::BcCamera;
|
||||
@@ -17,15 +16,15 @@ use validator::Validate;
|
||||
|
||||
mod adpcm;
|
||||
/// The command line parameters for this subcommand
|
||||
pub mod cmdline;
|
||||
mod cmdline;
|
||||
mod config;
|
||||
/// The errors this subcommand can raise
|
||||
pub mod errors;
|
||||
mod errors;
|
||||
mod gst;
|
||||
|
||||
use cmdline::Opt;
|
||||
pub(crate) use cmdline::Opt;
|
||||
use config::{CameraConfig, Config, UserConfig};
|
||||
use errors::Error;
|
||||
pub(crate) use errors::Error;
|
||||
use gst::{GstOutputs, RtspServer};
|
||||
|
||||
/// Entry point for the rtsp subcommand
|
||||
Reference in new issue
Block a user