2023 upgrade (#21)

* format * fixing up
security-union · Oct 21, 2023 · 42f3338 · 42f3338
1 parent 58705c4
commit 42f3338
Show file tree

Hide file tree

Showing 8 changed files with 665 additions and 607 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-
+respolver = 2
 members = [
     "video-streaming"
 ]
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/rust:1.65.0-bullseye
+FROM rust:1.73.0-bookworm
 
 RUN wget https://github.com/ryankurte/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-gnu.tgz && \
     tar zxvf cargo-binstall-x86_64-unknown-linux-gnu.tgz -C /usr/bin/ && \

diff --git a/README.md b/README.md
@@ -16,9 +16,7 @@ Use the latest and greatest open source technology to live stream from a Raspber
 
 1. Start Docker `docker-compose up`
 
-2. Download Chrome Canary from https://www.chromium.org/getting-involved/dev-channel/ for your OS, (App tested with Linux)
-
-3. Go to `localhost:3000`
+2. Go to `localhost:3000`
 
 ### Customization
 

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -8,7 +8,7 @@ services:
     environment:
       - RUST_LOG=info
       - FRAMERATE=30
-      - VIDEO_DEVICE_INDEX=${VIDEO_DEVICE_INDEX:-0}
+      - VIDEO_DEVICE_INDEX=${VIDEO_DEVICE_INDEX:-2}
       - ENCODER=MJPEG
     volumes:
       - /app/target
@@ -33,4 +33,4 @@ services:
     environment:
       - REACT_APP_USE_LOCALHOST=false
       - REACT_APP_BROWSER_TEST=false
-      - REACT_APP_RASPBERRY_PI_IP=192.168.18.39
+      - REACT_APP_RASPBERRY_PI_IP=192.168.0.110
diff --git a/install_dependencies.sh b/install_dependencies.sh
@@ -0,0 +1 @@
+sudo apt-get install v4l-utils
diff --git a/video-streaming/Cargo.toml b/video-streaming/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0.56"
-rav1e = "0.6.1"
+rav1e = "0.6.6"
 serde = { version = "1.0.136", features = ["derive"] }
 base64 = "0.13.0"
 serde_json = "1.0"

diff --git a/video-streaming/src/main.rs b/video-streaming/src/main.rs
@@ -146,7 +146,7 @@ async fn main() -> Result<()> {
                     height as u32,
                     FrameFormat::MJPEG,
                     framerate,
-                ))
+                )),
             )
             .unwrap();
             camera.open_stream().unwrap();