From 24b7cfc841dfc82da85021dbd2be410de9a44adc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 18 Oct 2022 19:26:29 +0300 Subject: [PATCH] Update for GStreamer API changes --- audio/lewton/src/lewtondec/imp.rs | 10 +--------- generic/fmp4/src/fmp4mux/imp.rs | 4 ++-- generic/threadshare/src/appsrc/imp.rs | 2 +- generic/threadshare/src/proxy/imp.rs | 2 +- generic/threadshare/src/tcpclientsrc/imp.rs | 2 +- generic/threadshare/src/udpsrc/imp.rs | 2 +- net/onvif/src/onvifmetadatacombiner/imp.rs | 6 +++--- net/onvif/src/onvifmetadataparse/imp.rs | 4 ++-- net/onvif/src/onvifmetadatapay/imp.rs | 2 +- net/rtpav1/src/pay/imp.rs | 2 +- net/rtpav1/tests/rtpav1.rs | 2 +- 11 files changed, 15 insertions(+), 23 deletions(-) diff --git a/audio/lewton/src/lewtondec/imp.rs b/audio/lewton/src/lewtondec/imp.rs index 6c76ddd5..f58d8553 100644 --- a/audio/lewton/src/lewtondec/imp.rs +++ b/audio/lewton/src/lewtondec/imp.rs @@ -405,15 +405,7 @@ impl LewtonDec { let outbuf = if let Some(ref reorder_map) = state.reorder_map { let mut outbuf = self .instance() - .allocate_output_buffer(sample_count as usize * audio_info.bpf() as usize) - .map_err(|_| { - gst::element_imp_error!( - self, - gst::StreamError::Decode, - ["Failed to allocate output buffer"] - ); - gst::FlowError::Error - })?; + .allocate_output_buffer(sample_count as usize * audio_info.bpf() as usize); { // And copy the decoded data into our output buffer while reordering the channels to the // GStreamer channel order diff --git a/generic/fmp4/src/fmp4mux/imp.rs b/generic/fmp4/src/fmp4mux/imp.rs index 8d60bf85..c840e490 100644 --- a/generic/fmp4/src/fmp4mux/imp.rs +++ b/generic/fmp4/src/fmp4mux/imp.rs @@ -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(&res); + q.set_result(Some(&res)); } else { - q.set_result(&allowed_caps); + q.set_result(Some(&allowed_caps)); } true diff --git a/generic/threadshare/src/appsrc/imp.rs b/generic/threadshare/src/appsrc/imp.rs index b5636e08..b4e64c9b 100644 --- a/generic/threadshare/src/appsrc/imp.rs +++ b/generic/threadshare/src/appsrc/imp.rs @@ -128,7 +128,7 @@ impl PadSrcHandler for AppSrcPadHandler { .unwrap_or_else(gst::Caps::new_any) }; - q.set_result(&caps); + q.set_result(Some(&caps)); true } diff --git a/generic/threadshare/src/proxy/imp.rs b/generic/threadshare/src/proxy/imp.rs index 862e0730..801f14c5 100644 --- a/generic/threadshare/src/proxy/imp.rs +++ b/generic/threadshare/src/proxy/imp.rs @@ -743,7 +743,7 @@ impl PadSrcHandler for ProxySrcPadHandler { .unwrap_or_else(gst::Caps::new_any) }; - q.set_result(&caps); + q.set_result(Some(&caps)); true } diff --git a/generic/threadshare/src/tcpclientsrc/imp.rs b/generic/threadshare/src/tcpclientsrc/imp.rs index f616407d..00fc01b6 100644 --- a/generic/threadshare/src/tcpclientsrc/imp.rs +++ b/generic/threadshare/src/tcpclientsrc/imp.rs @@ -142,7 +142,7 @@ impl PadSrcHandler for TcpClientSrcPadHandler { .unwrap_or_else(gst::Caps::new_any) }; - q.set_result(&caps); + q.set_result(Some(&caps)); true } diff --git a/generic/threadshare/src/udpsrc/imp.rs b/generic/threadshare/src/udpsrc/imp.rs index f6105d0b..31407965 100644 --- a/generic/threadshare/src/udpsrc/imp.rs +++ b/generic/threadshare/src/udpsrc/imp.rs @@ -159,7 +159,7 @@ impl PadSrcHandler for UdpSrcPadHandler { .unwrap_or_else(gst::Caps::new_any) }; - q.set_result(&caps); + q.set_result(Some(&caps)); true } diff --git a/net/onvif/src/onvifmetadatacombiner/imp.rs b/net/onvif/src/onvifmetadatacombiner/imp.rs index 414ac674..98fcd9b7 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 3833d2b9..3f6ffcd7 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 ddab312f..f015ae72 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 95b2dc0f..bd59e680 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 93462386..8f7db703 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();