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>2021-07-30 13:53:35 +0300
committerSebastian Dröge <sebastian@centricular.com>2021-07-30 13:53:35 +0300
commit052365ba1ade85dd10490cb156741226c66e6de5 (patch)
tree659856f3715b41ad27f6769db02c248065dde392 /generic
parent67f566dd287bf19c3e51a2f893dec5b70c27b6a1 (diff)
Fix various needless-borrow clippy warnings and others
Diffstat (limited to 'generic')
-rw-r--r--generic/file/src/filesink/imp.rs2
-rw-r--r--generic/file/src/filesrc/imp.rs2
-rw-r--r--generic/sodium/src/decrypter/imp.rs11
-rw-r--r--generic/sodium/src/encrypter/imp.rs4
-rw-r--r--generic/threadshare/src/appsrc/imp.rs2
-rw-r--r--generic/threadshare/src/inputselector/imp.rs6
-rw-r--r--generic/threadshare/src/jitterbuffer/imp.rs2
-rw-r--r--generic/threadshare/src/proxy/imp.rs2
-rw-r--r--generic/threadshare/src/queue/imp.rs4
-rw-r--r--generic/threadshare/src/runtime/task.rs2
-rw-r--r--generic/threadshare/src/tcpclientsrc/imp.rs2
-rw-r--r--generic/threadshare/src/udpsink/imp.rs16
-rw-r--r--generic/threadshare/src/udpsrc/imp.rs2
-rw-r--r--generic/threadshare/tests/pad.rs18
-rw-r--r--generic/threadshare/tests/udpsink.rs2
15 files changed, 38 insertions, 39 deletions
diff --git a/generic/file/src/filesink/imp.rs b/generic/file/src/filesink/imp.rs
index 7a0dd9e77..26225493a 100644
--- a/generic/file/src/filesink/imp.rs
+++ b/generic/file/src/filesink/imp.rs
@@ -313,7 +313,7 @@ impl URIHandlerImpl for FileSink {
if uri != "file://" {
let file_location = FileLocation::try_from_uri_str(uri)?;
- self.set_location(&element, Some(file_location))
+ self.set_location(element, Some(file_location))
} else {
Ok(())
}
diff --git a/generic/file/src/filesrc/imp.rs b/generic/file/src/filesrc/imp.rs
index be01cb902..ca4bef712 100644
--- a/generic/file/src/filesrc/imp.rs
+++ b/generic/file/src/filesrc/imp.rs
@@ -366,7 +366,7 @@ impl URIHandlerImpl for FileSrc {
if uri != "file://" {
let file_location = FileLocation::try_from_uri_str(uri)?;
- self.set_location(&element, Some(file_location))
+ self.set_location(element, Some(file_location))
} else {
Ok(())
}
diff --git a/generic/sodium/src/decrypter/imp.rs b/generic/sodium/src/decrypter/imp.rs
index 428b252c1..050470c49 100644
--- a/generic/sodium/src/decrypter/imp.rs
+++ b/generic/sodium/src/decrypter/imp.rs
@@ -58,7 +58,7 @@ impl State {
let sender_key = props
.sender_key
.as_ref()
- .and_then(|k| box_::PublicKey::from_slice(&k))
+ .and_then(|k| box_::PublicKey::from_slice(k))
.ok_or_else(|| {
gst::error_msg!(
gst::ResourceError::NotFound,
@@ -73,7 +73,7 @@ impl State {
let receiver_key = props
.receiver_key
.as_ref()
- .and_then(|k| box_::SecretKey::from_slice(&k))
+ .and_then(|k| box_::SecretKey::from_slice(k))
.ok_or_else(|| {
gst::error_msg!(
gst::ResourceError::NotFound,
@@ -121,16 +121,15 @@ impl State {
let block_size = self.block_size.expect("Block size wasn't set") as usize + box_::MACBYTES;
for subbuffer in map.chunks(block_size) {
- let plain = box_::open_precomputed(&subbuffer, &nonce, &self.precomputed_key).map_err(
- |_| {
+ let plain =
+ box_::open_precomputed(subbuffer, &nonce, &self.precomputed_key).map_err(|_| {
gst::element_error!(
element,
gst::StreamError::Format,
["Failed to decrypt buffer"]
);
gst::FlowError::Error
- },
- )?;
+ })?;
// assumes little endian
nonce.increment_le_inplace();
self.adapter.push(gst::Buffer::from_mut_slice(plain));
diff --git a/generic/sodium/src/encrypter/imp.rs b/generic/sodium/src/encrypter/imp.rs
index ac1f1f402..d2bf78cb7 100644
--- a/generic/sodium/src/encrypter/imp.rs
+++ b/generic/sodium/src/encrypter/imp.rs
@@ -73,7 +73,7 @@ impl State {
let sender_key = props
.sender_key
.as_ref()
- .and_then(|k| box_::SecretKey::from_slice(&k))
+ .and_then(|k| box_::SecretKey::from_slice(k))
.ok_or_else(|| {
gst::error_msg!(
gst::ResourceError::NotFound,
@@ -88,7 +88,7 @@ impl State {
let receiver_key = props
.receiver_key
.as_ref()
- .and_then(|k| box_::PublicKey::from_slice(&k))
+ .and_then(|k| box_::PublicKey::from_slice(k))
.ok_or_else(|| {
gst::error_msg!(
gst::ResourceError::NotFound,
diff --git a/generic/threadshare/src/appsrc/imp.rs b/generic/threadshare/src/appsrc/imp.rs
index 2fdf6cff8..2f5dd4284 100644
--- a/generic/threadshare/src/appsrc/imp.rs
+++ b/generic/threadshare/src/appsrc/imp.rs
@@ -134,7 +134,7 @@ impl AppSrcPadHandler {
pad.push_event(stream_start_evt).await;
if let Some(ref caps) = state.caps {
- pad.push_event(gst::event::Caps::new(&caps)).await;
+ pad.push_event(gst::event::Caps::new(caps)).await;
*self.0.configured_caps.lock().unwrap() = Some(caps.clone());
}
diff --git a/generic/threadshare/src/inputselector/imp.rs b/generic/threadshare/src/inputselector/imp.rs
index 080816fd2..0bccc227b 100644
--- a/generic/threadshare/src/inputselector/imp.rs
+++ b/generic/threadshare/src/inputselector/imp.rs
@@ -110,7 +110,7 @@ impl InputSelectorPadSinkHandler {
if let Some(segment) = &inner.segment {
if let Some(segment) = segment.downcast_ref::<gst::format::Time>() {
let rtime = segment.to_running_time(buffer.pts());
- let (sync_fut, abort_handle) = abortable(self.sync(&element, rtime));
+ let (sync_fut, abort_handle) = abortable(self.sync(element, rtime));
inner.abort_handle = Some(abort_handle);
sync_future = Some(sync_fut.map_err(|_| gst::FlowError::Flushing));
}
@@ -479,7 +479,7 @@ impl ObjectImpl for InputSelector {
let pads = self.pads.lock().unwrap();
let mut old_pad = None;
if let Some(ref pad) = pad {
- if pads.sink_pads.get(&pad).is_some() {
+ if pads.sink_pads.get(pad).is_some() {
old_pad = state.active_sinkpad.clone();
state.active_sinkpad = Some(pad.clone());
state.switched_pad = true;
@@ -607,7 +607,7 @@ impl ElementImpl for InputSelector {
let mut state = self.state.lock().unwrap();
let mut pads = self.pads.lock().unwrap();
let sink_pad =
- gst::Pad::from_template(&templ, Some(format!("sink_{}", pads.pad_serial).as_str()));
+ gst::Pad::from_template(templ, Some(format!("sink_{}", pads.pad_serial).as_str()));
pads.pad_serial += 1;
sink_pad.set_active(true).unwrap();
element.add_pad(&sink_pad).unwrap();
diff --git a/generic/threadshare/src/jitterbuffer/imp.rs b/generic/threadshare/src/jitterbuffer/imp.rs
index 22204befc..a27e1fa07 100644
--- a/generic/threadshare/src/jitterbuffer/imp.rs
+++ b/generic/threadshare/src/jitterbuffer/imp.rs
@@ -525,7 +525,7 @@ impl SinkHandler {
// Reschedule if needed
let (_, next_wakeup) =
jb.src_pad_handler
- .next_wakeup(&element, &state, latency, context_wait);
+ .next_wakeup(element, &state, latency, context_wait);
if let Some((next_wakeup, _)) = next_wakeup {
if let Some((previous_next_wakeup, ref abort_handle)) = state.wait_handle {
if previous_next_wakeup.is_none()
diff --git a/generic/threadshare/src/proxy/imp.rs b/generic/threadshare/src/proxy/imp.rs
index b24fe5802..0e5904594 100644
--- a/generic/threadshare/src/proxy/imp.rs
+++ b/generic/threadshare/src/proxy/imp.rs
@@ -902,7 +902,7 @@ impl TaskImpl for ProxySrcTask {
let pad = self.src_pad.upgrade().expect("PadSrc no longer exists");
let proxysrc = ProxySrc::from_instance(&self.element);
- let res = ProxySrcPadHandler::push_item(&pad, &proxysrc, item).await;
+ let res = ProxySrcPadHandler::push_item(&pad, proxysrc, item).await;
match res {
Ok(()) => {
gst_log!(SRC_CAT, obj: &self.element, "Successfully pushed item");
diff --git a/generic/threadshare/src/queue/imp.rs b/generic/threadshare/src/queue/imp.rs
index b4501cb02..ec8f89513 100644
--- a/generic/threadshare/src/queue/imp.rs
+++ b/generic/threadshare/src/queue/imp.rs
@@ -368,7 +368,7 @@ impl TaskImpl for QueueTask {
let pad = self.src_pad.upgrade().expect("PadSrc no longer exists");
let queue = Queue::from_instance(&self.element);
- let res = QueuePadSrcHandler::push_item(&pad, &queue, item).await;
+ let res = QueuePadSrcHandler::push_item(&pad, queue, item).await;
match res {
Ok(()) => {
gst_log!(CAT, obj: &self.element, "Successfully pushed item");
@@ -558,7 +558,7 @@ impl Queue {
let mut pending_queue = self.pending_queue.lock().unwrap();
- if let Err(item) = self.queue_until_full(&dataqueue, &mut pending_queue, item) {
+ if let Err(item) = self.queue_until_full(dataqueue, &mut pending_queue, item) {
if pending_queue
.as_ref()
.map(|pq| !pq.scheduled)
diff --git a/generic/threadshare/src/runtime/task.rs b/generic/threadshare/src/runtime/task.rs
index 7c2ff2568..aa6497959 100644
--- a/generic/threadshare/src/runtime/task.rs
+++ b/generic/threadshare/src/runtime/task.rs
@@ -1027,7 +1027,7 @@ impl StateMachine {
task_inner: &Arc<Mutex<TaskInner>>,
context: &Context,
) -> Self {
- let task_inner_clone = Arc::clone(&task_inner);
+ let task_inner_clone = Arc::clone(task_inner);
let loop_fut = async move {
let mut res = self.task_impl.start().await;
if res.is_ok() {
diff --git a/generic/threadshare/src/tcpclientsrc/imp.rs b/generic/threadshare/src/tcpclientsrc/imp.rs
index 748f5eadb..b832ee9fd 100644
--- a/generic/threadshare/src/tcpclientsrc/imp.rs
+++ b/generic/threadshare/src/tcpclientsrc/imp.rs
@@ -148,7 +148,7 @@ impl TcpClientSrcPadHandler {
pad.push_event(stream_start_evt).await;
if let Some(ref caps) = state.caps {
- pad.push_event(gst::event::Caps::new(&caps)).await;
+ pad.push_event(gst::event::Caps::new(caps)).await;
*self.0.configured_caps.lock().unwrap() = Some(caps.clone());
}
diff --git a/generic/threadshare/src/udpsink/imp.rs b/generic/threadshare/src/udpsink/imp.rs
index 7e147def3..2d6bcb8e2 100644
--- a/generic/threadshare/src/udpsink/imp.rs
+++ b/generic/threadshare/src/udpsink/imp.rs
@@ -441,7 +441,7 @@ impl UdpSinkPadHandler {
if !clients_to_configure.is_empty() {
for client in &clients_to_configure {
- self.configure_client(&settings, &mut socket, &mut socket_v6, &client)
+ self.configure_client(&settings, &mut socket, &mut socket_v6, client)
.map_err(|err| {
element_error!(
element,
@@ -456,7 +456,7 @@ impl UdpSinkPadHandler {
if !clients_to_unconfigure.is_empty() {
for client in &clients_to_unconfigure {
- self.unconfigure_client(&settings, &mut socket, &mut socket_v6, &client)
+ self.unconfigure_client(&settings, &mut socket, &mut socket_v6, client)
.map_err(|err| {
element_error!(
element,
@@ -470,7 +470,7 @@ impl UdpSinkPadHandler {
}
if do_sync {
- self.sync(&element, rtime).await;
+ self.sync(element, rtime).await;
}
let data = buffer.map_readable().map_err(|_| {
@@ -876,7 +876,7 @@ impl UdpSink {
self.prepare_socket(SocketFamily::Ipv6, &context, element)?;
self.task
- .prepare(UdpSinkTask::new(&element, &self.sink_pad_handler), context)
+ .prepare(UdpSinkTask::new(element, &self.sink_pad_handler), context)
.map_err(|err| {
error_msg!(
gst::ResourceError::OpenRead,
@@ -916,17 +916,17 @@ impl UdpSink {
impl UdpSink {
fn clear_clients(&self, clients_to_add: impl Iterator<Item = SocketAddr>) {
self.sink_pad_handler
- .clear_clients(&self.sink_pad.gst_pad(), clients_to_add);
+ .clear_clients(self.sink_pad.gst_pad(), clients_to_add);
}
fn remove_client(&self, addr: SocketAddr) {
self.sink_pad_handler
- .remove_client(&self.sink_pad.gst_pad(), addr);
+ .remove_client(self.sink_pad.gst_pad(), addr);
}
fn add_client(&self, addr: SocketAddr) {
self.sink_pad_handler
- .add_client(&self.sink_pad.gst_pad(), addr);
+ .add_client(self.sink_pad.gst_pad(), addr);
}
}
@@ -1249,7 +1249,7 @@ impl ObjectImpl for UdpSink {
.map_err(|err| {
gst_error!(CAT, obj: obj, "Invalid port {}: {}", rsplit[0], err);
})
- .and_then(|port| try_into_socket_addr(&obj, rsplit[1], port))
+ .and_then(|port| try_into_socket_addr(obj, rsplit[1], port))
.ok()
} else {
None
diff --git a/generic/threadshare/src/udpsrc/imp.rs b/generic/threadshare/src/udpsrc/imp.rs
index 8facdb493..cccf7c17f 100644
--- a/generic/threadshare/src/udpsrc/imp.rs
+++ b/generic/threadshare/src/udpsrc/imp.rs
@@ -165,7 +165,7 @@ impl UdpSrcPadHandler {
pad.push_event(stream_start_evt).await;
if let Some(ref caps) = state.caps {
- pad.push_event(gst::event::Caps::new(&caps)).await;
+ pad.push_event(gst::event::Caps::new(caps)).await;
*self.0.configured_caps.lock().unwrap() = Some(caps.clone());
}
diff --git a/generic/threadshare/tests/pad.rs b/generic/threadshare/tests/pad.rs
index 1c7b84c60..6f9a51824 100644
--- a/generic/threadshare/tests/pad.rs
+++ b/generic/threadshare/tests/pad.rs
@@ -524,7 +524,7 @@ mod imp_sink {
match event.view() {
EventView::FlushStart(..) => {
- elem_sink_test.stop(&element.downcast_ref::<super::ElementSinkTest>().unwrap());
+ elem_sink_test.stop(element.downcast_ref::<super::ElementSinkTest>().unwrap());
true
}
_ => false,
@@ -953,9 +953,9 @@ fn nominal_scenario(
fn src_sink_nominal() {
let name = "src_sink_nominal";
- let (pipeline, src_element, _sink_element, receiver) = setup(&name, None, None);
+ let (pipeline, src_element, _sink_element, receiver) = setup(name, None, None);
- nominal_scenario(&name, pipeline, src_element, receiver);
+ nominal_scenario(name, pipeline, src_element, receiver);
}
#[test]
@@ -974,7 +974,7 @@ fn src_tsqueue_sink_nominal() {
let (pipeline, src_element, _sink_element, receiver) = setup(name, Some(ts_queue), None);
- nominal_scenario(&name, pipeline, src_element, receiver);
+ nominal_scenario(name, pipeline, src_element, receiver);
}
#[test]
@@ -986,7 +986,7 @@ fn src_queue_sink_nominal() {
let queue = gst::ElementFactory::make("queue", Some("queue")).unwrap();
let (pipeline, src_element, _sink_element, receiver) = setup(name, Some(queue), None);
- nominal_scenario(&name, pipeline, src_element, receiver);
+ nominal_scenario(name, pipeline, src_element, receiver);
}
#[test]
@@ -1014,7 +1014,7 @@ fn src_tsproxy_sink_nominal() {
let (pipeline, src_element, _sink_element, receiver) =
setup(name, Some(ts_proxy_sink), Some(ts_proxy_src));
- nominal_scenario(&name, pipeline, src_element, receiver);
+ nominal_scenario(name, pipeline, src_element, receiver);
}
#[test]
@@ -1023,7 +1023,7 @@ fn start_pause_start() {
let scenario_name = "start_pause_start";
- let (pipeline, src_element, _sink_element, mut receiver) = setup(&scenario_name, None, None);
+ let (pipeline, src_element, _sink_element, mut receiver) = setup(scenario_name, None, None);
let elem_src_test = imp_src::ElementSrcTest::from_instance(&src_element);
@@ -1101,7 +1101,7 @@ fn start_stop_start() {
let scenario_name = "start_stop_start";
- let (pipeline, src_element, _sink_element, mut receiver) = setup(&scenario_name, None, None);
+ let (pipeline, src_element, _sink_element, mut receiver) = setup(scenario_name, None, None);
let elem_src_test = imp_src::ElementSrcTest::from_instance(&src_element);
@@ -1214,7 +1214,7 @@ fn start_flush() {
let scenario_name = "start_flush";
- let (pipeline, src_element, sink_element, mut receiver) = setup(&scenario_name, None, None);
+ let (pipeline, src_element, sink_element, mut receiver) = setup(scenario_name, None, None);
let elem_src_test = imp_src::ElementSrcTest::from_instance(&src_element);
diff --git a/generic/threadshare/tests/udpsink.rs b/generic/threadshare/tests/udpsink.rs
index 4590ceef7..1673adec7 100644
--- a/generic/threadshare/tests/udpsink.rs
+++ b/generic/threadshare/tests/udpsink.rs
@@ -122,7 +122,7 @@ fn test_chain() {
init();
let mut h = gst_check::Harness::new("ts-udpsink");
- h.set_src_caps_str(&"foo/bar");
+ h.set_src_caps_str("foo/bar");
{
let udpsink = h.element().unwrap();
udpsink.set_property("clients", &"127.0.0.1:5005").unwrap();