mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2025-02-16 12:55:13 +00:00
Code Issues Projects Releases Wiki Activity

Take advantage of Into<Option<_>> args

Browse source 
Commit 24b7cfc8 applied changes related to nullability as declared
by gir. One consequence was that some functions signature ended up
requiring users to pass `Some(val)` when they could use `val`
before.

This commit applies changes on `gstreamer-rs` which, will honoring
the nullability stil allow users to pass `val` for the few affected
functions.

This commit also fixes the signature for `Element::request_new_pad`
which was updated upstream.
This commit is contained in:
François Laignel 2022-10-20 20:18:35 +02:00
parent 7b5d887c5b
commit 6319d104a8
15 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
generic/fmp4/src/fmp4mux/imp.rs
View file

@ -1772,7 +1772,7 @@ impl ElementImpl for FMP4Mux {
fn request_new_pad(
&self,
templ: &gst::PadTemplate,
name: Option<String>,
name: Option<&str>,
caps: Option<&gst::Caps>,
) -> Option<gst::Pad> {
let state = self.state.lock().unwrap();
@ -1813,9 +1813,9 @@ impl AggregatorImpl for FMP4Mux {
if let Some(filter_caps) = q.filter() {
let res = filter_caps
.intersect_with_mode(&allowed_caps, gst::CapsIntersectMode::First);
q.set_result(Some(&res));
q.set_result(&res);
} else {
q.set_result(Some(&allowed_caps));
q.set_result(&allowed_caps);
}
true

2
generic/threadshare/src/appsrc/imp.rs
View file

@ -128,7 +128,7 @@ impl PadSrcHandler for AppSrcPadHandler {
.unwrap_or_else(gst::Caps::new_any)
};
q.set_result(Some(&caps));
q.set_result(&caps);
true
}

2
generic/threadshare/src/inputselector/imp.rs
View file

@ -545,7 +545,7 @@ impl ElementImpl for InputSelector {
fn request_new_pad(
&self,
templ: &gst::PadTemplate,
_name: Option<String>,
_name: Option<&str>,
_caps: Option<&gst::Caps>,
) -> Option<gst::Pad> {
let mut state = self.state.lock().unwrap();

2
generic/threadshare/src/proxy/imp.rs
View file

@ -743,7 +743,7 @@ impl PadSrcHandler for ProxySrcPadHandler {
.unwrap_or_else(gst::Caps::new_any)
};
q.set_result(Some(&caps));
q.set_result(&caps);
true
}

2
generic/threadshare/src/tcpclientsrc/imp.rs
View file

@ -142,7 +142,7 @@ impl PadSrcHandler for TcpClientSrcPadHandler {
.unwrap_or_else(gst::Caps::new_any)
};
q.set_result(Some(&caps));
q.set_result(&caps);
true
}

2
generic/threadshare/src/udpsrc/imp.rs
View file

@ -159,7 +159,7 @@ impl PadSrcHandler for UdpSrcPadHandler {
.unwrap_or_else(gst::Caps::new_any)
};
q.set_result(Some(&caps));
q.set_result(&caps);
true
}

2
net/aws/src/s3hlssink/imp.rs
View file

@ -811,7 +811,7 @@ impl ElementImpl for S3HlsSink {
fn request_new_pad(
&self,
templ: &gst::PadTemplate,
_name: Option<String>,
_name: Option<&str>,
_caps: Option<&gst::Caps>,
) -> Option<gst::Pad> {
let mut settings = self.settings.lock().unwrap();

2
net/hlssink3/src/imp.rs
View file

@ -753,7 +753,7 @@ impl ElementImpl for HlsSink3 {
fn request_new_pad(
&self,
templ: &gst::PadTemplate,
_name: Option<String>,
_name: Option<&str>,
_caps: Option<&gst::Caps>,
) -> Option<gst::Pad> {
let mut settings = self.settings.lock().unwrap();

8
net/onvif/src/onvifmetadatacombiner/imp.rs
View file

@ -129,7 +129,7 @@ impl ElementImpl for OnvifMetadataCombiner {
fn request_new_pad(
&self,
_templ: &gst::PadTemplate,
_name: Option<String>,
_name: Option<&str>,
_caps: Option<&gst::Caps>,
) -> Option<gst::Pad> {
gst::error!(
@ -468,11 +468,11 @@ impl AggregatorImpl for OnvifMetadataCombiner {
let templ_caps = templ.caps();
if let Some(filter) = filter {
q.set_result(Some(
q.set_result(
&filter.intersect_with_mode(templ_caps, gst::CapsIntersectMode::First),
));
);
} else {
q.set_result(Some(templ_caps));
q.set_result(templ_caps);
}
true

4
net/onvif/src/onvifmetadataparse/imp.rs
View file

@ -1044,7 +1044,7 @@ impl OnvifMetadataParse {
caps
};
q.set_result(Some(&res));
q.set_result(&res);
true
}
@ -1112,7 +1112,7 @@ impl OnvifMetadataParse {
caps
};
q.set_result(Some(&res));
q.set_result(&res);
true
}

4
net/raptorq/src/raptorqdec/imp.rs
View file

@ -806,7 +806,7 @@ impl ElementImpl for RaptorqDec {
fn request_new_pad(
&self,
templ: &gst::PadTemplate,
name: Option<String>,
name: Option<&str>,
_caps: Option<&gst::Caps>,
) -> Option<gst::Pad> {
let mut sinkpad_fec_guard = self.sinkpad_fec.lock().unwrap();
@ -821,7 +821,7 @@ impl ElementImpl for RaptorqDec {
return None;
}
let sinkpad_fec = gst::Pad::builder_with_template(templ, name.as_deref())
let sinkpad_fec = gst::Pad::builder_with_template(templ, name)
.chain_function(|pad, parent, buffer| {
Self::catch_panic_pad_function(
parent,

4
net/webrtc-http/src/whipsink/imp.rs
View file

@ -130,10 +130,10 @@ impl ElementImpl for WhipSink {
fn request_new_pad(
&self,
templ: &gst::PadTemplate,
name: Option<String>,
name: Option<&str>,
caps: Option<&gst::Caps>,
) -> Option<gst::Pad> {
let wb_sink_pad = self.webrtcbin.request_pad(templ, name.as_deref(), caps)?;
let wb_sink_pad = self.webrtcbin.request_pad(templ, name, caps)?;
let sink_pad = gst::GhostPad::new(Some(&wb_sink_pad.name()), gst::PadDirection::Sink);
sink_pad.set_target(Some(&wb_sink_pad)).unwrap();

2
net/webrtc/src/webrtcsink/imp.rs
View file

@ -2723,7 +2723,7 @@ impl ElementImpl for WebRTCSink {
fn request_new_pad(
&self,
templ: &gst::PadTemplate,
_name: Option<String>,
_name: Option<&str>,
_caps: Option<&gst::Caps>,
) -> Option<gst::Pad> {
let element = self.instance();

2
utils/fallbackswitch/src/fallbackswitch/imp.rs
View file

@ -1333,7 +1333,7 @@ impl ElementImpl for FallbackSwitch {
fn request_new_pad(
&self,
templ: &gst::PadTemplate,
_name: Option<String>,
_name: Option<&str>,
_caps: Option<&gst::Caps>,
) -> Option<gst::Pad> {
let mut state = self.state.lock();

2
utils/togglerecord/src/togglerecord/imp.rs
View file

@ -1991,7 +1991,7 @@ impl ElementImpl for ToggleRecord {
fn request_new_pad(
&self,
_templ: &gst::PadTemplate,
_name: Option<String>,
_name: Option<&str>,
_caps: Option<&gst::Caps>,
) -> Option<gst::Pad> {
let mut other_streams_guard = self.other_streams.lock();