diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2022-10-18 19:26:29 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2022-10-18 19:26:52 +0300 |
commit | 24b7cfc841dfc82da85021dbd2be410de9a44adc (patch) | |
tree | 12b18445dedb7dba5bcdaac4330c6f105ed89ee2 /net | |
parent | 03b03fe2ddc792f7860764bfbfb35a5129cba07a (diff) |
Update for GStreamer API changes
Diffstat (limited to 'net')
-rw-r--r-- | net/onvif/src/onvifmetadatacombiner/imp.rs | 6 | ||||
-rw-r--r-- | net/onvif/src/onvifmetadataparse/imp.rs | 4 | ||||
-rw-r--r-- | net/onvif/src/onvifmetadatapay/imp.rs | 2 | ||||
-rw-r--r-- | net/rtpav1/src/pay/imp.rs | 2 | ||||
-rw-r--r-- | net/rtpav1/tests/rtpav1.rs | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/net/onvif/src/onvifmetadatacombiner/imp.rs b/net/onvif/src/onvifmetadatacombiner/imp.rs index 414ac674d..98fcd9b76 100644 --- a/net/onvif/src/onvifmetadatacombiner/imp.rs +++ b/net/onvif/src/onvifmetadatacombiner/imp.rs @@ -395,11 +395,11 @@ impl AggregatorImpl for OnvifMetadataCombiner { let templ_caps = templ.caps(); if let Some(filter) = filter { - q.set_result( + q.set_result(Some( &filter.intersect_with_mode(templ_caps, gst::CapsIntersectMode::First), - ); + )); } else { - q.set_result(templ_caps); + q.set_result(Some(templ_caps)); } true diff --git a/net/onvif/src/onvifmetadataparse/imp.rs b/net/onvif/src/onvifmetadataparse/imp.rs index 3833d2b9e..3f6ffcd7e 100644 --- a/net/onvif/src/onvifmetadataparse/imp.rs +++ b/net/onvif/src/onvifmetadataparse/imp.rs @@ -1044,7 +1044,7 @@ impl OnvifMetadataParse { caps }; - q.set_result(&res); + q.set_result(Some(&res)); true } @@ -1112,7 +1112,7 @@ impl OnvifMetadataParse { caps }; - q.set_result(&res); + q.set_result(Some(&res)); true } diff --git a/net/onvif/src/onvifmetadatapay/imp.rs b/net/onvif/src/onvifmetadatapay/imp.rs index ddab312f3..f015ae72d 100644 --- a/net/onvif/src/onvifmetadatapay/imp.rs +++ b/net/onvif/src/onvifmetadatapay/imp.rs @@ -141,7 +141,7 @@ impl RTPBasePayloadImpl for OnvifMetadataPay { } let mtu = self.instance().mtu(); - let payload_size = gst_rtp::RTPBuffer::<()>::calc_payload_len(mtu, 0, 0) as usize; + let payload_size = gst_rtp::calc_payload_len(mtu, 0, 0) as usize; let mut chunks = utf8.as_bytes().chunks(payload_size).peekable(); let mut buflist = gst::BufferList::new_sized((utf8.len() / payload_size) + 1); diff --git a/net/rtpav1/src/pay/imp.rs b/net/rtpav1/src/pay/imp.rs index 95b2dc0fd..bd59e6806 100644 --- a/net/rtpav1/src/pay/imp.rs +++ b/net/rtpav1/src/pay/imp.rs @@ -210,7 +210,7 @@ impl RTPAv1Pay { let mut data = state.temp_packet_data.take().unwrap_or_else(|| { TempPacketData { - payload_limit: gst_rtp::RTPBuffer::calc_payload_len(self.instance().mtu(), 0, 0), + payload_limit: gst_rtp::calc_payload_len(self.instance().mtu(), 0, 0), packet: PacketOBUData { payload_size: 1, // 1 byte is used for the aggregation header omit_last_size_field: true, diff --git a/net/rtpav1/tests/rtpav1.rs b/net/rtpav1/tests/rtpav1.rs index 93462386e..8f7db7032 100644 --- a/net/rtpav1/tests/rtpav1.rs +++ b/net/rtpav1/tests/rtpav1.rs @@ -181,7 +181,7 @@ fn test_payloader() { let pay = h.element().unwrap(); pay.set_property( "mtu", - RTPBuffer::calc_packet_len(25, 0, 0) + gst_rtp::calc_packet_len(25, 0, 0) ); } h.play(); |