From 120c62964dbc26f89caaf4b346b5e48df9242a7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Sun, 20 Oct 2024 21:35:55 +0300
Subject: [PATCH] Update to bitstream-io 2.5

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1864>
---
 .gitlab-ci.yml                  | 3 +--
 Cargo.lock                      | 4 ++--
 net/rtp/Cargo.toml              | 2 +-
 net/rtp/src/vp8/bool_decoder.rs | 7 +++++++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 36995735..b9a4caa3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -383,8 +383,7 @@ outdated:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
   script:
     - cargo update --color=always
-    # Ignore bitstream-io until we can update MSRV to 1.80
-    - cargo outdated --color=always --root-deps-only --exit-code 1 -v -i bitstream-io
+    - cargo outdated --color=always --root-deps-only --exit-code 1 -v
 
 coverage:
   allow_failure: true
diff --git a/Cargo.lock b/Cargo.lock
index 1fbf82d1..50d23a83 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -880,9 +880,9 @@ checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "bitstream-io"
-version = "2.3.0"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e"
+checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452"
 
 [[package]]
 name = "block-buffer"
diff --git a/net/rtp/Cargo.toml b/net/rtp/Cargo.toml
index e5b543f0..4c4e52cd 100644
--- a/net/rtp/Cargo.toml
+++ b/net/rtp/Cargo.toml
@@ -11,7 +11,7 @@ rust-version.workspace = true
 [dependencies]
 anyhow = "1"
 atomic_refcell = "0.1"
-bitstream-io = "2.1, < 2.4.0"
+bitstream-io = "2.4"
 byte-slice-cast = "1.2"
 chrono = { version = "0.4", default-features = false }
 gst       = { workspace = true, features = ["v1_20"] }
diff --git a/net/rtp/src/vp8/bool_decoder.rs b/net/rtp/src/vp8/bool_decoder.rs
index 65e96bf0..0460d7f0 100644
--- a/net/rtp/src/vp8/bool_decoder.rs
+++ b/net/rtp/src/vp8/bool_decoder.rs
@@ -139,6 +139,13 @@ impl<R: io::Read> BitRead for BoolDecoder<R> {
         BigEndian::read_signed(self, bits)
     }
 
+    fn read_signed_in<const BITS: u32, S>(&mut self) -> std::io::Result<S>
+    where
+        S: bitstream_io::SignedNumeric,
+    {
+        BigEndian::read_signed(self, BITS)
+    }
+
     fn read_to<V>(&mut self) -> std::io::Result<V>
     where
         V: bitstream_io::Primitive,