Replaced oddity_video with video_rs

oddity-rtsp-server/Cargo.toml

@@ -15,6 +15,6 @@ futures = "0.3"
 tokio = { version = "1", features = ["full"] }
 tokio-stream = { version = "0.1" }
 tokio-util = { version = "0.7.1", default-features = false, features = ["codec"] }
+video-rs = "0.1"
 oddity-rtsp-protocol = { path = "../oddity-rtsp-protocol", features = ["tokio-codec"] }
-oddity-sdp-protocol = { path = "../oddity-sdp-protocol" }
-oddity-video = { path = "../../oddity-video" } # Fix this weird dep path
+oddity-sdp-protocol = { path = "../oddity-sdp-protocol" }

oddity-rtsp-server/src/main.rs

@@ -17,7 +17,7 @@ use app::config::AppConfig;
 
 use tokio::signal::ctrl_c;
 
-use oddity_video as video;
+use video_rs as video;
 
 macro_rules! on_error_exit {
   ($expr:expr) => {

oddity-rtsp-server/src/media/mod.rs

@@ -1,14 +1,14 @@
 pub mod sdp;
 pub mod video;
 
-use oddity_video::StreamInfo;
+use video_rs::StreamInfo;
 
-pub use oddity_video::Packet;
+pub use video_rs::Packet;
 
 use std::path::PathBuf;
 use std::fmt;
 
-use oddity_video::{Reader, Locator, Url, Error};
+use video_rs::{Reader, Locator, Url, Error};
 
 type Result<T> = std::result::Result<T, Error>;
 

oddity-rtsp-server/src/media/video/reader.rs

@@ -3,7 +3,7 @@ use std::thread;
 use tokio::task;
 use tokio::sync::mpsc;
 
-use oddity_video as video;
+use video_rs as video;
 
 use crate::media::{MediaDescriptor, MediaInfo};
 
@@ -176,12 +176,12 @@ impl Times {
 
 }
 
-// Holds functions that deal with the video backend stuff in `oddity_video`.
+// Holds functions that deal with the video backend stuff in `video_rs`.
 pub mod backend {
 
   use tokio::task;
 
-  use oddity_video::{
+  use video_rs::{
     Reader,
     Options,
     Locator,

oddity-rtsp-server/src/media/video/rtp_muxer.rs

@@ -1,8 +1,8 @@
-//! Async wrapper functions for [`oddity_video::RtpMuxer`].
+//! Async wrapper functions for [`video_rs::RtpMuxer`].
 
 use tokio::task;
 
-use oddity_video::{self as video, RtpMuxer};
+use video_rs::{self as video, RtpMuxer};
 
 type Result<T> = std::result::Result<T, video::Error>;
 

oddity-rtsp-server/src/session/mod.rs

@@ -13,7 +13,7 @@ use tokio::sync::broadcast;
 use rand::Rng;
 
 use oddity_rtsp_protocol as rtsp;
-use oddity_video as video;
+use video_rs as video;
 
 use crate::runtime::Runtime;
 use crate::runtime::task_manager::{Task, TaskContext};

oddity-rtsp-server/src/session/setup.rs

@@ -2,7 +2,7 @@ use std::fmt;
 use std::error;
 use std::net::SocketAddr;
 
-use oddity_video as video;
+use video_rs as video;
 use oddity_rtsp_protocol as rtsp;
 
 use crate::net::connection::ResponseSenderTx;

oddity-rtsp-server/src/source/mod.rs

@@ -7,7 +7,7 @@ use tokio::time::timeout;
 use tokio::sync::mpsc;
 use tokio::sync::broadcast;
 
-use oddity_video as video;
+use video_rs as video;
 
 use crate::runtime::Runtime;
 use crate::runtime::task_manager::{Task, TaskContext};

oddity-rtsp-server/src/source/source_manager.rs

@@ -7,7 +7,7 @@ use tokio::select;
 use tokio::sync::Mutex;
 use tokio::sync::mpsc;
 
-use oddity_video::Error as MediaError;
+use video_rs::Error as MediaError;
 
 use crate::runtime::Runtime;
 use crate::runtime::task_manager::{Task, TaskContext};