From 92a365eb73cf96c9637b423ce34a705080ca9c29 Mon Sep 17 00:00:00 2001
From: Scott Lamb <slamb@slamb.org>
Date: Wed, 9 Jun 2021 14:36:14 -0700
Subject: [PATCH] use released versions of a few deps

---
 server/Cargo.lock    | 17 +++++++++++------
 server/Cargo.toml    |  4 ++--
 server/db/Cargo.toml |  4 ++--
 server/src/h264.rs   | 26 +-------------------------
 4 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/server/Cargo.lock b/server/Cargo.lock
index 9de1303..fd8d2dd 100644
--- a/server/Cargo.lock
+++ b/server/Cargo.lock
@@ -852,10 +852,12 @@ dependencies = [
 
 [[package]]
 name = "h264-reader"
-version = "0.4.0"
-source = "git+https://github.com/dholroyd/h264-reader#dd2d05d54bec596993be9a0833690b54219f6778"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8d87669bdeca3d51902f1bf1f2c71c8f514a8f3011d9b81e63719b374091da1"
 dependencies = [
  "bitreader",
+ "log",
  "memchr",
  "rfc6381-codec",
 ]
@@ -1101,8 +1103,9 @@ checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
 
 [[package]]
 name = "libpasta"
-version = "0.1.1"
-source = "git+https://github.com/scottlamb/libpasta?branch=pr-deps#6a556b7aa9969f2f3cd33d1abccf4c22f19d5d8d"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cafc9e4bd8d9be7c73e85751c09d8ada2d973473d0af7423ee037bd82efebc2e"
 dependencies = [
  "argon2rs",
  "bcrypt",
@@ -1873,7 +1876,8 @@ dependencies = [
 [[package]]
 name = "retina"
 version = "0.0.1"
-source = "git+https://github.com/scottlamb/retina?branch=main#1bcc864344cf54fdb691a0e11669a663d3c1d7c9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ac613fa999c0d1075a825705e01ab302f7bab09410ed8df5d65a63eb9e922da"
 dependencies = [
  "async-stream",
  "base64",
@@ -1954,7 +1958,8 @@ checksum = "e1110d695193d446e901de09921ffbf2d86ae351bbfde9c5b53863ce177e17f5"
 [[package]]
 name = "rtsp-types"
 version = "0.0.2"
-source = "git+https://github.com/sdroege/rtsp-types#53bdf9a74175946572eb3509a6343696724123eb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90e677628cb208d61181b19f9b0b01efd7fce158bfba1bcb6e57e00fda291d6d"
 dependencies = [
  "cookie-factory",
  "nom",
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 9c7f368..723ccd6 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -31,7 +31,7 @@ failure = "0.1.1"
 ffmpeg = { package = "moonfire-ffmpeg", version = "0.0.1" }
 futures = "0.3"
 fnv = "1.0"
-h264-reader = { git = "https://github.com/dholroyd/h264-reader" }
+h264-reader = "0.5.0"
 http = "0.2.3"
 http-serve = { version = "0.3.1", features = ["dir"] }
 hyper = { version = "0.14.2", features = ["http1", "server", "stream", "tcp"] }
@@ -45,7 +45,7 @@ nom = "6.0.0"
 parking_lot = { version = "0.11.1", features = [] }
 protobuf = { git = "https://github.com/stepancheg/rust-protobuf" }
 reffers = "0.6.0"
-retina = { git = "https://github.com/scottlamb/retina", branch = "main" }
+retina = "0.0.1"
 ring = "0.16.2"
 rusqlite = "0.25.3"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/server/db/Cargo.toml b/server/db/Cargo.toml
index fa93e1d..d6a0dee 100644
--- a/server/db/Cargo.toml
+++ b/server/db/Cargo.toml
@@ -21,11 +21,11 @@ cstr = "0.2.5"
 failure = "0.1.1"
 fnv = "1.0"
 futures = "0.3"
-h264-reader = { git = "https://github.com/dholroyd/h264-reader" }
+h264-reader = "0.5.0"
 hashlink = "0.7.0"
 lazy_static = "1.0"
 libc = "0.2"
-libpasta = { git = "https://github.com/scottlamb/libpasta", branch = "pr-deps" }
+libpasta = "0.1.2"
 log = "0.4"
 mylog = { git = "https://github.com/scottlamb/mylog" }
 nix = "0.20.0"
diff --git a/server/src/h264.rs b/server/src/h264.rs
index 68b7de4..123f619 100644
--- a/server/src/h264.rs
+++ b/server/src/h264.rs
@@ -126,30 +126,6 @@ fn parse_annex_b_extra_data(data: &[u8]) -> Result<(&[u8], &[u8]), Error> {
     }
 }
 
-/// Decodes a NAL unit (minus header byte) into its RBSP.
-/// Stolen from h264-reader's src/avcc.rs. This shouldn't last long, see:
-/// <https://github.com/dholroyd/h264-reader/issues/4>.
-fn decode(encoded: &[u8]) -> Vec<u8> {
-    struct NalRead(Vec<u8>);
-    use h264_reader::nal::NalHandler;
-    use h264_reader::Context;
-    impl NalHandler for NalRead {
-        type Ctx = ();
-        fn start(&mut self, _ctx: &mut Context<Self::Ctx>, _header: h264_reader::nal::NalHeader) {}
-
-        fn push(&mut self, _ctx: &mut Context<Self::Ctx>, buf: &[u8]) {
-            self.0.extend_from_slice(buf)
-        }
-
-        fn end(&mut self, _ctx: &mut Context<Self::Ctx>) {}
-    }
-    let mut decode = h264_reader::rbsp::RbspDecoder::new(NalRead(vec![]));
-    let mut ctx = Context::new(());
-    decode.push(&mut ctx, encoded);
-    let read = decode.into_handler();
-    read.0
-}
-
 /// Parsed representation of ffmpeg's "extradata".
 #[derive(Debug, PartialEq, Eq)]
 pub struct ExtraData {
@@ -172,7 +148,7 @@ impl ExtraData {
         if extradata.starts_with(b"\x00\x00\x00\x01") || extradata.starts_with(b"\x00\x00\x01") {
             // ffmpeg supplied "extradata" in Annex B format.
             let (s, p) = parse_annex_b_extra_data(extradata)?;
-            let rbsp = decode(&s[1..]);
+            let rbsp = h264_reader::rbsp::decode_nal(&s[1..]);
             sps_owner = h264_reader::nal::sps::SeqParameterSet::from_bytes(&rbsp)
                 .map_err(|e| format_err!("Bad SPS: {:?}", e))?;
             sps = &sps_owner;