mirror of
https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git
synced 2025-09-03 02:03:48 +00:00
Update to rand 0.9
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/2082>
This commit is contained in:
parent
c1d6431113
commit
9d6272b8e0
17 changed files with 44 additions and 42 deletions
16
Cargo.lock
generated
16
Cargo.lock
generated
|
@ -2515,7 +2515,7 @@ dependencies = [
|
|||
"gstreamer-check",
|
||||
"gstreamer-video",
|
||||
"percent-encoding",
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
"serde",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
|
@ -2576,7 +2576,7 @@ dependencies = [
|
|||
"pango",
|
||||
"pangocairo",
|
||||
"pretty_assertions",
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"smallvec",
|
||||
|
@ -2624,7 +2624,7 @@ dependencies = [
|
|||
"gstreamer-video",
|
||||
"gtk4",
|
||||
"parking_lot",
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -2969,7 +2969,7 @@ dependencies = [
|
|||
"gstreamer-base",
|
||||
"gstreamer-check",
|
||||
"gstreamer-rtp",
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
"raptorq",
|
||||
]
|
||||
|
||||
|
@ -3051,7 +3051,7 @@ dependencies = [
|
|||
"gstreamer-video",
|
||||
"hex",
|
||||
"log",
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
"rtcp-types",
|
||||
"rtp-types",
|
||||
"slab",
|
||||
|
@ -3096,7 +3096,7 @@ dependencies = [
|
|||
"gstreamer-check",
|
||||
"hex",
|
||||
"pretty_assertions",
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"smallvec",
|
||||
|
@ -3190,7 +3190,7 @@ dependencies = [
|
|||
"pin-project-lite",
|
||||
"pkg-config",
|
||||
"polling",
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
"rustix",
|
||||
"slab",
|
||||
"socket2",
|
||||
|
@ -3340,7 +3340,7 @@ dependencies = [
|
|||
"livekit-api",
|
||||
"livekit-protocol",
|
||||
"parse_link_header",
|
||||
"rand 0.8.5",
|
||||
"rand 0.9.0",
|
||||
"regex",
|
||||
"reqwest 0.11.27",
|
||||
"serde",
|
||||
|
|
|
@ -22,7 +22,7 @@ serde_json = { version = "1.0", optional = true }
|
|||
|
||||
[dev-dependencies]
|
||||
pretty_assertions = "1"
|
||||
rand = "0.8"
|
||||
rand = "0.9"
|
||||
gst-check.workspace = true
|
||||
gst-app.workspace = true
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@ gst-net.workspace = true
|
|||
gst-rtp.workspace = true
|
||||
pin-project-lite = "0.2.0"
|
||||
polling = "3.1.0"
|
||||
rand = "0.8"
|
||||
rand = "0.9"
|
||||
rustix = { version = "0.38.2", default-features = false, features = ["std", "fs", "net"] }
|
||||
slab = "0.4.7"
|
||||
socket2 = {features = ["all"], version = "0.5"}
|
||||
|
|
|
@ -41,7 +41,7 @@ anyhow = "1"
|
|||
chrono = { version = "0.4", features = [ "alloc" ] }
|
||||
env_logger = "0.11"
|
||||
gst-check = { workspace = true, features = ["v1_18"] }
|
||||
rand = "0.8"
|
||||
rand = "0.9"
|
||||
test-with = { version = "0.14", default-features = false }
|
||||
|
||||
[lib]
|
||||
|
|
|
@ -16,7 +16,7 @@ raptorq = "1.7"
|
|||
|
||||
[dev-dependencies]
|
||||
gst-check = { workspace = true, features = ["v1_18"] }
|
||||
rand = "0.8"
|
||||
rand = "0.9"
|
||||
|
||||
[lib]
|
||||
name = "gstraptorq"
|
||||
|
|
|
@ -146,13 +146,13 @@ impl RaptorqTest {
|
|||
h_dec.set_src_caps_str("application/x-rtp");
|
||||
h_dec_fec.set_src_caps(caps);
|
||||
|
||||
let mut rng = rand::thread_rng();
|
||||
let mut rng = rand::rng();
|
||||
|
||||
let input_buffers = (0..self.input_buffers)
|
||||
.map(|i| {
|
||||
// payload size without RTP Header and ADUI Header
|
||||
let size = rng.gen_range(1..self.mtu - 12 - 3);
|
||||
let data = (0..size).map(|_| rng.gen()).collect::<Vec<u8>>();
|
||||
let size = rng.random_range(1..self.mtu - 12 - 3);
|
||||
let data = (0..size).map(|_| rng.random()).collect::<Vec<u8>>();
|
||||
|
||||
let mut buf = gst::Buffer::new_rtp_with_sizes(size as u32, 0, 0).unwrap();
|
||||
{
|
||||
|
|
|
@ -24,7 +24,7 @@ futures = "0.3"
|
|||
gio.workspace = true
|
||||
hex = "0.4.3"
|
||||
log = "0.4"
|
||||
rand = { version = "0.8", default-features = false, features = ["std", "std_rng" ] }
|
||||
rand = { version = "0.9", default-features = false, features = ["std", "std_rng" ] }
|
||||
rtp-types = { version = "0.1" }
|
||||
rtcp-types = { version = "0.1" }
|
||||
slab = "0.4.9"
|
||||
|
|
|
@ -1090,7 +1090,7 @@ impl RtpBasePay2 {
|
|||
let ssrc_collision = self.ssrc_collision.lock().unwrap().take();
|
||||
if state.stream.is_none() {
|
||||
use rand::prelude::*;
|
||||
let mut rng = rand::thread_rng();
|
||||
let mut rng = rand::rng();
|
||||
let settings = self.settings.lock().unwrap();
|
||||
|
||||
let pt = if settings.pt_set {
|
||||
|
@ -1101,11 +1101,13 @@ impl RtpBasePay2 {
|
|||
let ssrc = ssrc_collision
|
||||
.or(settings.ssrc)
|
||||
.or(caps_ssrc)
|
||||
.unwrap_or_else(|| rng.gen::<u32>());
|
||||
.unwrap_or_else(|| rng.random::<u32>());
|
||||
let timestamp_offset = settings
|
||||
.timestamp_offset
|
||||
.unwrap_or_else(|| rng.gen::<u32>());
|
||||
let seqnum_offset = settings.seqnum_offset.unwrap_or_else(|| rng.gen::<u16>());
|
||||
.unwrap_or_else(|| rng.random::<u32>());
|
||||
let seqnum_offset = settings
|
||||
.seqnum_offset
|
||||
.unwrap_or_else(|| rng.random::<u16>());
|
||||
let stream = Stream {
|
||||
pt,
|
||||
ssrc,
|
||||
|
@ -1336,10 +1338,10 @@ impl RtpBasePay2 {
|
|||
suggested_ssrc
|
||||
} else {
|
||||
use rand::prelude::*;
|
||||
let mut rng = rand::thread_rng();
|
||||
let mut rng = rand::rng();
|
||||
|
||||
loop {
|
||||
let new_ssrc = rng.gen::<u32>();
|
||||
let new_ssrc = rng.random::<u32>();
|
||||
if new_ssrc != stats.ssrc {
|
||||
break new_ssrc;
|
||||
}
|
||||
|
|
|
@ -1463,8 +1463,8 @@ impl Session {
|
|||
RequestEarlyRtcpResult::NotScheduled
|
||||
}
|
||||
} else {
|
||||
let mut rng = rand::thread_rng();
|
||||
self.next_early_rtcp_time = Some(now + t_dither_max.mul_f64(rng.gen()) + offset);
|
||||
let mut rng = rand::rng();
|
||||
self.next_early_rtcp_time = Some(now + t_dither_max.mul_f64(rng.random()) + offset);
|
||||
debug!("early RTCP scheduled at {:?}", self.next_early_rtcp_time);
|
||||
RequestEarlyRtcpResult::TimerReconsideration
|
||||
}
|
||||
|
@ -1588,21 +1588,21 @@ impl Session {
|
|||
}
|
||||
|
||||
fn generate_cname() -> String {
|
||||
let mut rng = rand::thread_rng();
|
||||
let user = rng.gen::<u32>();
|
||||
let host = rng.gen::<u32>();
|
||||
let mut rng = rand::rng();
|
||||
let user = rng.random::<u32>();
|
||||
let host = rng.random::<u32>();
|
||||
format!("user{user}@{host:#}")
|
||||
}
|
||||
|
||||
fn generate_ssrc() -> u32 {
|
||||
let mut rng = rand::thread_rng();
|
||||
rng.gen::<u32>()
|
||||
let mut rng = rand::rng();
|
||||
rng.random::<u32>()
|
||||
}
|
||||
|
||||
fn rtcp_dither(dur: Duration) -> Duration {
|
||||
let mut rng = rand::thread_rng();
|
||||
let mut rng = rand::rng();
|
||||
// need a factor in [0.5, 1.5]
|
||||
let factor = rng.gen::<f64>();
|
||||
let factor = rng.random::<f64>();
|
||||
dur.mul_f64(factor + 0.5)
|
||||
}
|
||||
|
||||
|
|
|
@ -224,8 +224,8 @@ impl crate::basepay::RtpBasePay2Impl for RtpVp8Pay {
|
|||
let picture_id_offset = settings.picture_id_offset.unwrap_or_else(|| {
|
||||
use rand::Rng as _;
|
||||
|
||||
let mut rng = rand::thread_rng();
|
||||
rng.gen::<u16>()
|
||||
let mut rng = rand::rng();
|
||||
rng.random::<u16>()
|
||||
});
|
||||
|
||||
let picture_id = PictureId::new(settings.picture_id_mode, picture_id_offset);
|
||||
|
|
|
@ -202,8 +202,8 @@ impl crate::basepay::RtpBasePay2Impl for RtpVp9Pay {
|
|||
let picture_id_offset = settings.picture_id_offset.unwrap_or_else(|| {
|
||||
use rand::Rng as _;
|
||||
|
||||
let mut rng = rand::thread_rng();
|
||||
rng.gen::<u16>()
|
||||
let mut rng = rand::rng();
|
||||
rng.random::<u16>()
|
||||
});
|
||||
|
||||
let picture_id = PictureId::new(settings.picture_id_mode, picture_id_offset);
|
||||
|
|
|
@ -36,7 +36,7 @@ fastrand = "2.0"
|
|||
gst_plugin_webrtc_protocol = { path="protocol", package = "gst-plugin-webrtc-signalling-protocol" }
|
||||
gst_plugin_webrtc_signalling = { path="signalling", package = "gst-plugin-webrtc-signalling" }
|
||||
human_bytes = "0.4"
|
||||
rand = "0.8"
|
||||
rand = "0.9"
|
||||
url = "2"
|
||||
|
||||
aws-config = { version = "1.0", optional = true }
|
||||
|
|
|
@ -34,8 +34,8 @@ static CAT: LazyLock<gst::DebugCategory> = LazyLock::new(|| {
|
|||
});
|
||||
|
||||
fn transaction_id() -> String {
|
||||
thread_rng()
|
||||
.sample_iter(&rand::distributions::Alphanumeric)
|
||||
rand::rng()
|
||||
.sample_iter(&rand::distr::Alphanumeric)
|
||||
.map(char::from)
|
||||
.take(30)
|
||||
.collect()
|
||||
|
|
|
@ -17,7 +17,7 @@ gst-plugin-gtk4 = { path = "../../video/gtk4", optional = true }
|
|||
gtk = { workspace = true, optional = true }
|
||||
gio = { workspace = true, optional = true }
|
||||
parking_lot = "0.12"
|
||||
rand = "0.8"
|
||||
rand = "0.9"
|
||||
|
||||
[dev-dependencies]
|
||||
gst-app.workspace = true
|
||||
|
|
|
@ -32,7 +32,7 @@ itertools = "0.13"
|
|||
|
||||
[dev-dependencies]
|
||||
pretty_assertions = "1"
|
||||
rand = { version = "0.8", features = ["small_rng"] }
|
||||
rand = { version = "0.9", features = ["small_rng"] }
|
||||
gst-check.workspace = true
|
||||
clap = { version = "4", features = ["derive"] }
|
||||
|
||||
|
|
|
@ -54,7 +54,7 @@ fn test_parse() {
|
|||
let l = if data.len() == 1 {
|
||||
1
|
||||
} else {
|
||||
rnd.gen_range(1..=data.len())
|
||||
rnd.random_range(1..=data.len())
|
||||
};
|
||||
let buf = gst::Buffer::from_mut_slice(Vec::from(&data[0..l]));
|
||||
input_len += buf.size();
|
||||
|
|
|
@ -55,7 +55,7 @@ fn test_parse() {
|
|||
let l = if data.len() == 1 {
|
||||
1
|
||||
} else {
|
||||
rnd.gen_range(1..=data.len())
|
||||
rnd.random_range(1..=data.len())
|
||||
};
|
||||
let buf = gst::Buffer::from_mut_slice(Vec::from(&data[0..l]));
|
||||
input_len += buf.size();
|
||||
|
|
Loading…
Reference in a new issue