mirror of
https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git
synced 2024-09-24 13:00:12 +00:00
Fix various clippy warnings
This commit is contained in:
parent
bb1e1b1529
commit
4e93604fe9
4 changed files with 15 additions and 28 deletions
|
@ -1,6 +1,4 @@
|
|||
use glib;
|
||||
use glib::subclass;
|
||||
use gst;
|
||||
use gst::prelude::*;
|
||||
use gst::subclass::prelude::*;
|
||||
use gst::{gst_error, gst_log, gst_trace};
|
||||
|
|
|
@ -1,11 +1,7 @@
|
|||
use glib;
|
||||
use glib::subclass;
|
||||
use gst;
|
||||
use gst::prelude::*;
|
||||
use gst::subclass::prelude::*;
|
||||
use gst::{gst_debug, gst_element_error, gst_error, gst_error_msg};
|
||||
use gst_audio;
|
||||
use gst_base;
|
||||
use gst_base::prelude::*;
|
||||
use gst_base::subclass::base_src::CreateSuccess;
|
||||
use gst_base::subclass::prelude::*;
|
||||
|
@ -413,8 +409,8 @@ impl BaseSrcImpl for NdiAudioSrc {
|
|||
let receiver = connect_ndi(
|
||||
self.cat,
|
||||
element,
|
||||
settings.ndi_name.as_ref().map(String::as_str),
|
||||
settings.url_address.as_ref().map(String::as_str),
|
||||
settings.ndi_name.as_deref(),
|
||||
settings.url_address.as_deref(),
|
||||
&settings.receiver_ndi_name,
|
||||
settings.connect_timeout,
|
||||
settings.bandwidth,
|
||||
|
|
|
@ -1,14 +1,10 @@
|
|||
use glib;
|
||||
use glib::subclass;
|
||||
use gst;
|
||||
use gst::prelude::*;
|
||||
use gst::subclass::prelude::*;
|
||||
use gst::{gst_debug, gst_element_error, gst_error, gst_error_msg};
|
||||
use gst_base;
|
||||
use gst_base::prelude::*;
|
||||
use gst_base::subclass::base_src::CreateSuccess;
|
||||
use gst_base::subclass::prelude::*;
|
||||
use gst_video;
|
||||
|
||||
use std::sync::Mutex;
|
||||
use std::{i32, u32};
|
||||
|
@ -448,8 +444,8 @@ impl BaseSrcImpl for NdiVideoSrc {
|
|||
let receiver = connect_ndi(
|
||||
self.cat,
|
||||
element,
|
||||
settings.ndi_name.as_ref().map(String::as_str),
|
||||
settings.url_address.as_ref().map(String::as_str),
|
||||
settings.ndi_name.as_deref(),
|
||||
settings.url_address.as_deref(),
|
||||
&settings.receiver_ndi_name,
|
||||
settings.connect_timeout,
|
||||
settings.bandwidth,
|
||||
|
|
|
@ -1,9 +1,6 @@
|
|||
use glib;
|
||||
use glib::prelude::*;
|
||||
use gst;
|
||||
use gst::prelude::*;
|
||||
use gst::{gst_debug, gst_element_error, gst_error, gst_log, gst_warning};
|
||||
use gst_video;
|
||||
use gst_video::prelude::*;
|
||||
|
||||
use byte_slice_cast::AsMutSliceOf;
|
||||
|
@ -545,14 +542,14 @@ where
|
|||
// then that one has to match and the other one does not matter
|
||||
if (ndi_name.is_some()
|
||||
&& url_address.is_some()
|
||||
&& receiver.ndi_name.as_ref().map(String::as_str) == ndi_name
|
||||
&& receiver.url_address.as_ref().map(String::as_str) == url_address)
|
||||
&& receiver.ndi_name.as_deref() == ndi_name
|
||||
&& receiver.url_address.as_deref() == url_address)
|
||||
|| (ndi_name.is_some()
|
||||
&& url_address.is_none()
|
||||
&& receiver.ndi_name.as_ref().map(String::as_str) == ndi_name)
|
||||
&& receiver.ndi_name.as_deref() == ndi_name)
|
||||
|| (ndi_name.is_none()
|
||||
&& url_address.is_some()
|
||||
&& receiver.url_address.as_ref().map(String::as_str) == url_address)
|
||||
&& receiver.url_address.as_deref() == url_address)
|
||||
{
|
||||
if (receiver.video.is_some() || !T::IS_VIDEO)
|
||||
&& (receiver.audio.is_some() || T::IS_VIDEO)
|
||||
|
@ -951,7 +948,7 @@ impl Receiver<VideoReceiver> {
|
|||
|
||||
let info = self.create_video_info(element, &video_frame)?;
|
||||
|
||||
let buffer = self.create_video_buffer(element, pts, duration, &info, &video_frame)?;
|
||||
let buffer = self.create_video_buffer(element, pts, duration, &info, &video_frame);
|
||||
|
||||
gst_log!(self.0.cat, obj: element, "Produced buffer {:?}", buffer);
|
||||
|
||||
|
@ -1104,7 +1101,7 @@ impl Receiver<VideoReceiver> {
|
|||
duration: gst::ClockTime,
|
||||
info: &gst_video::VideoInfo,
|
||||
video_frame: &VideoFrame,
|
||||
) -> Result<gst::Buffer, gst::FlowError> {
|
||||
) -> gst::Buffer {
|
||||
let mut buffer = gst::Buffer::with_size(info.size()).unwrap();
|
||||
{
|
||||
let buffer = buffer.get_mut().unwrap();
|
||||
|
@ -1175,7 +1172,7 @@ impl Receiver<VideoReceiver> {
|
|||
info: &gst_video::VideoInfo,
|
||||
buffer: gst::Buffer,
|
||||
video_frame: &VideoFrame,
|
||||
) -> Result<gst::Buffer, gst::FlowError> {
|
||||
) -> gst::Buffer {
|
||||
let mut vframe = gst_video::VideoFrame::from_buffer_writable(buffer, info).unwrap();
|
||||
|
||||
match info.format() {
|
||||
|
@ -1290,7 +1287,7 @@ impl Receiver<VideoReceiver> {
|
|||
_ => unreachable!(),
|
||||
}
|
||||
|
||||
Ok(vframe.into_buffer())
|
||||
vframe.into_buffer()
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1379,7 +1376,7 @@ impl Receiver<AudioReceiver> {
|
|||
|
||||
let info = self.create_audio_info(element, &audio_frame)?;
|
||||
|
||||
let buffer = self.create_audio_buffer(element, pts, duration, &info, &audio_frame)?;
|
||||
let buffer = self.create_audio_buffer(element, pts, duration, &info, &audio_frame);
|
||||
|
||||
gst_log!(self.0.cat, obj: element, "Produced buffer {:?}", buffer);
|
||||
|
||||
|
@ -1435,7 +1432,7 @@ impl Receiver<AudioReceiver> {
|
|||
duration: gst::ClockTime,
|
||||
info: &gst_audio::AudioInfo,
|
||||
audio_frame: &AudioFrame,
|
||||
) -> Result<gst::Buffer, gst::FlowError> {
|
||||
) -> gst::Buffer {
|
||||
// We multiply by 2 because is the size in bytes of an i16 variable
|
||||
let buff_size = (audio_frame.no_samples() as u32 * info.bpf()) as usize;
|
||||
let mut buffer = gst::Buffer::with_size(buff_size).unwrap();
|
||||
|
@ -1472,6 +1469,6 @@ impl Receiver<AudioReceiver> {
|
|||
);
|
||||
}
|
||||
|
||||
Ok(buffer)
|
||||
buffer
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue