Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2022-12-13 12:43:16 +0300
committerSebastian Dröge <sebastian@centricular.com>2022-12-13 12:43:16 +0300
commit3f904553ea1336fc73333ec680493c41250a03fe (patch)
treeea270ea2f9b5484fc729a4a174ea2a0261e89f9a /generic
parent289e8a08c31610fbf62056f8a156eb647e9c3a2a (diff)
Fix various new clippy warnings
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1011>
Diffstat (limited to 'generic')
-rw-r--r--generic/sodium/src/decrypter/imp.rs2
-rw-r--r--generic/threadshare/examples/benchmark.rs2
-rw-r--r--generic/threadshare/src/jitterbuffer/imp.rs8
3 files changed, 6 insertions, 6 deletions
diff --git a/generic/sodium/src/decrypter/imp.rs b/generic/sodium/src/decrypter/imp.rs
index 1e0fd5f7a..f01ee29b8 100644
--- a/generic/sodium/src/decrypter/imp.rs
+++ b/generic/sodium/src/decrypter/imp.rs
@@ -498,7 +498,7 @@ impl Decrypter {
gst::debug!(CAT, obj: pad, "Requested offset: {}", offset);
gst::debug!(CAT, obj: pad, "Requested size: {}", requested_size);
- let chunk_index = offset as u64 / block_size as u64;
+ let chunk_index = offset / block_size as u64;
gst::debug!(CAT, obj: pad, "Stream Block index: {}", chunk_index);
let pull_offset = offset - (chunk_index * block_size as u64);
diff --git a/generic/threadshare/examples/benchmark.rs b/generic/threadshare/examples/benchmark.rs
index c7e98af75..3903f7a1f 100644
--- a/generic/threadshare/examples/benchmark.rs
+++ b/generic/threadshare/examples/benchmark.rs
@@ -158,7 +158,7 @@ fn main() {
let context = build_context();
let source = gst::ElementFactory::make("ts-tonesrc")
.name(format!("source-{}", i).as_str())
- .property("samples-per-buffer", (wait as u32) * 8000 / 1000)
+ .property("samples-per-buffer", wait * 8000 / 1000)
.property("context", &context)
.property("context-wait", wait)
.build()
diff --git a/generic/threadshare/src/jitterbuffer/imp.rs b/generic/threadshare/src/jitterbuffer/imp.rs
index 7105720a0..289739bcc 100644
--- a/generic/threadshare/src/jitterbuffer/imp.rs
+++ b/generic/threadshare/src/jitterbuffer/imp.rs
@@ -28,7 +28,7 @@ use gst_rtp::RTPBuffer;
use once_cell::sync::Lazy;
-use std::cmp::{max, min, Ordering};
+use std::cmp::Ordering;
use std::collections::{BTreeSet, VecDeque};
use std::mem;
use std::sync::Arc;
@@ -412,7 +412,7 @@ impl SinkHandler {
}
if let Some(last_in_seqnum) = inner.last_in_seqnum {
- let gap = gst_rtp::compare_seqnum(last_in_seqnum as u16, seq);
+ let gap = gst_rtp::compare_seqnum(last_in_seqnum, seq);
if gap == 1 {
self.calculate_packet_spacing(inner, &mut state, rtptime, pts);
} else {
@@ -463,7 +463,7 @@ impl SinkHandler {
state.equidistant += 1;
}
- state.equidistant = min(max(state.equidistant, -7), 7);
+ state.equidistant = state.equidistant.clamp(-7, 7);
inner.last_rtptime = Some(rtptime);
@@ -679,7 +679,7 @@ impl SrcHandler {
// FIXME reason why we can expect Some for the 2 lines below
let mut last_popped_pts = state.last_popped_pts.unwrap();
let interval = pts.into().unwrap().saturating_sub(last_popped_pts);
- let spacing = interval / (gap as u64 + 1);
+ let spacing = interval / (gap + 1);
*discont = true;