🔧 load webcam params from config file

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ornithology-pi"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 authors = ["Christian <[email protected]>"]
 description = "Capture birds in your garden, running on raspberry pi."
@@ -33,8 +33,8 @@ base64 = { version = "0.13.0", optional = true }
 bluer = { version = "0.13", optional = true }
 bytes = "1.1.0"
 chrono = "0.4"
+figment = "0.10.6"
 format-bytes = "0.1"
-
 futures = "0.3"
 
 image = { version = "0.23.14", default-features = false, features = [

Rocket.toml

@@ -2,6 +2,11 @@
 ctrlc = false
 signals = ["term", "hup"]
 
+[default.camera]
+width = 640
+height = 480
+fps = 30
+
 [release]
 port = 8000
 address = "0.0.0.0"

ornithology-pi.toml

@@ -2,6 +2,11 @@
 ctrlc = false
 signals = ["term", "hup"]
 
+[default.camera]
+width = 640
+height = 480
+fps = 30
+
 [release]
 port = 8000
 address = "0.0.0.0"

src/capture/webcam.rs

@@ -15,16 +15,25 @@ use std::time::Duration;
 use super::Capture;
 
 pub struct WebCam {
+    width: u32,
+    height: u32,
+    fps: u32,
     frame: Arc<Mutex<ImageBuffer<Rgb<u8>, Vec<u8>>>>,
     running: Arc<Mutex<bool>>,
 }
 
 impl WebCam {
-    pub fn new(width: u32, height: u32) -> Result<Self, Box<dyn Error>> {
+    pub fn new(width: u32, height: u32, fps: u32) -> Result<Self, Box<dyn Error>> {
         let frame = Arc::new(Mutex::new(ImageBuffer::new(width, height)));
         let running = Arc::new(Mutex::new(false));
 
-        let mut webcam = Self { frame, running };
+        let mut webcam = Self {
+            width,
+            height,
+            fps,
+            frame,
+            running,
+        };
         webcam.start();
         Ok(webcam)
     }
@@ -38,8 +47,9 @@ impl WebCam {
     }
 
     pub fn start(&mut self) {
-        let width = self.frame.lock().unwrap().width();
-        let height = self.frame.lock().unwrap().height();
+        let width = self.width;
+        let height = self.height;
+        let fps = self.fps;
         let running = self.running.clone();
         let frame = self.frame.clone();
 
@@ -50,7 +60,7 @@ impl WebCam {
                     width,
                     height,
                     FrameFormat::MJPEG,
-                    30,
+                    fps,
                 )),
             )
             .unwrap();
@@ -72,7 +82,7 @@ impl WebCam {
 
 impl Default for WebCam {
     fn default() -> Self {
-        Self::new(1920, 1080).unwrap()
+        Self::new(1920, 1080, 30).unwrap()
     }
 }
 

src/config.rs

@@ -0,0 +1,35 @@
+use figment::{
+    providers::{Env, Format, Toml},
+    Figment,
+};
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct Camera {
+    pub width: u32,
+    pub height: u32,
+    pub fps: u32,
+}
+
+impl Default for Camera {
+    fn default() -> Self {
+        Camera {
+            width: 640,
+            height: 480,
+            fps: 30,
+        }
+    }
+}
+
+#[derive(Default, Debug, Deserialize, Serialize)]
+pub struct Config {
+    pub camera: Camera,
+}
+
+pub fn load_config() -> Config {
+    Figment::new()
+        .merge(Toml::file(Env::var_or("ROCKET_CONFIG", "Rocket.toml")).nested())
+        .merge(Env::prefixed("ROCKET_").ignore(&["PROFILE"]).global())
+        .extract()
+        .unwrap_or_default()
+}

src/lib.rs

@@ -6,6 +6,10 @@ pub use detector::BirdDetector;
 pub mod capture;
 pub use capture::Capture;
 pub use capture::WebCam;
+
+pub mod config;
+pub use config::Config;
+
 pub mod mjpeg;
 pub use mjpeg::MJpeg;
 

src/main.rs

@@ -1,5 +1,6 @@
 #[cfg(feature = "bluetooth")]
 use ornithology_pi::bluetooth::run_bluetooth;
+use ornithology_pi::config;
 #[cfg(feature = "hotspot")]
 use ornithology_pi::hotspot::Hotspot;
 #[cfg(feature = "server")]
@@ -59,8 +60,15 @@ async fn run_detector(sightings: Arc<Mutex<Vec<Sighting>>>, capture: Arc<Mutex<W
 
 #[tokio::main]
 async fn main() {
+    let config = config::load_config();
     let sightings: Arc<Mutex<Vec<Sighting>>> = Arc::new(Mutex::new(Vec::new()));
-    let capture: Arc<Mutex<WebCam>> = Arc::new(Mutex::new(WebCam::default()));
+    let capture: Arc<Mutex<WebCam>> = Arc::new(Mutex::new(WebCam::new(
+        config.camera.width.clone(),
+        config.camera.height.clone(),
+        config.camera.fps.clone(),
+    ).unwrap()));
+
+    println!("Loaded Config: {:?}", config);
 
     #[cfg(feature = "bluetooth")]
     let bluetooth_thread = tokio::spawn(run_bluetooth(sightings.clone()));