diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2020-12-20 21:43:45 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2020-12-20 21:43:45 +0300 |
commit | 3d617371af1d1b779cf10d3fec40b17f29a7baf3 (patch) | |
tree | ff5ae62c07716648d8e62c4db34c6b731fbbd2fe /generic/threadshare | |
parent | ea6c05e16ccf0875652e2370eef4839ae819bc34 (diff) |
Update for macro renames
Diffstat (limited to 'generic/threadshare')
-rw-r--r-- | generic/threadshare/src/appsrc/imp.rs | 12 | ||||
-rw-r--r-- | generic/threadshare/src/jitterbuffer/imp.rs | 12 | ||||
-rw-r--r-- | generic/threadshare/src/lib.rs | 4 | ||||
-rw-r--r-- | generic/threadshare/src/proxy/imp.rs | 16 | ||||
-rw-r--r-- | generic/threadshare/src/queue/imp.rs | 14 | ||||
-rw-r--r-- | generic/threadshare/src/runtime/pad.rs | 35 | ||||
-rw-r--r-- | generic/threadshare/src/runtime/task.rs | 20 | ||||
-rw-r--r-- | generic/threadshare/src/socket.rs | 6 | ||||
-rw-r--r-- | generic/threadshare/src/tcpclientsrc/imp.rs | 22 | ||||
-rw-r--r-- | generic/threadshare/src/udpsink/imp.rs | 47 | ||||
-rw-r--r-- | generic/threadshare/src/udpsrc/imp.rs | 36 | ||||
-rw-r--r-- | generic/threadshare/tests/pad.rs | 6 |
12 files changed, 118 insertions, 112 deletions
diff --git a/generic/threadshare/src/appsrc/imp.rs b/generic/threadshare/src/appsrc/imp.rs index 8e53fbe04..908b99a53 100644 --- a/generic/threadshare/src/appsrc/imp.rs +++ b/generic/threadshare/src/appsrc/imp.rs @@ -27,7 +27,7 @@ use glib::subclass::prelude::*; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::{gst_debug, gst_element_error, gst_error, gst_error_msg, gst_log, gst_trace}; +use gst::{gst_debug, gst_error, gst_log, gst_trace}; use once_cell::sync::Lazy; @@ -351,7 +351,7 @@ impl TaskImpl for AppSrcTask { Some(item) => item, None => { gst_error!(CAT, obj: &self.element, "SrcPad channel aborted"); - gst_element_error!( + gst::element_error!( &self.element, gst::StreamError::Failed, ("Internal data stream error"), @@ -379,7 +379,7 @@ impl TaskImpl for AppSrcTask { } Err(err) => { gst_error!(CAT, obj: &self.element, "Got error {}", err); - gst_element_error!( + gst::element_error!( &self.element, gst::StreamError::Failed, ("Internal data stream error"), @@ -490,14 +490,14 @@ impl AppSrc { let context = Context::acquire(&settings.context, settings.context_wait).map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Failed to acquire Context: {}", err] ) })?; let max_buffers = settings.max_buffers.try_into().map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::Settings, ["Invalid max-buffers: {}, {}", settings.max_buffers, err] ) @@ -514,7 +514,7 @@ impl AppSrc { context, ) .map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Error preparing Task: {:?}", err] ) diff --git a/generic/threadshare/src/jitterbuffer/imp.rs b/generic/threadshare/src/jitterbuffer/imp.rs index 1d312db00..430f8fd35 100644 --- a/generic/threadshare/src/jitterbuffer/imp.rs +++ b/generic/threadshare/src/jitterbuffer/imp.rs @@ -25,7 +25,7 @@ use glib::subclass::prelude::*; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::{gst_debug, gst_element_error, gst_error, gst_error_msg, gst_info, gst_log, gst_trace}; +use gst::{gst_debug, gst_error, gst_info, gst_log, gst_trace}; use gst_rtp::RTPBuffer; use once_cell::sync::Lazy; @@ -664,7 +664,7 @@ impl PadSinkHandler for SinkHandler { if let EventView::FlushStart(..) = event.view() { if let Err(err) = jb.task.flush_start() { gst_error!(CAT, obj: pad.gst_pad(), "FlushStart failed {:?}", err); - gst_element_error!( + gst::element_error!( element, gst::StreamError::Failed, ("Internal data stream error"), @@ -710,7 +710,7 @@ impl PadSinkHandler for SinkHandler { EventView::FlushStop(..) => { if let Err(err) = jb.task.flush_stop() { gst_error!(CAT, obj: pad.gst_pad(), "FlushStop failed {:?}", err); - gst_element_error!( + gst::element_error!( element, gst::StreamError::Failed, ("Internal data stream error"), @@ -993,7 +993,7 @@ impl PadSrcHandler for SrcHandler { EventView::FlushStart(..) => { if let Err(err) = jb.task.flush_start() { gst_error!(CAT, obj: pad.gst_pad(), "FlushStart failed {:?}", err); - gst_element_error!( + gst::element_error!( element, gst::StreamError::Failed, ("Internal data stream error"), @@ -1005,7 +1005,7 @@ impl PadSrcHandler for SrcHandler { EventView::FlushStop(..) => { if let Err(err) = jb.task.flush_stop() { gst_error!(CAT, obj: pad.gst_pad(), "FlushStop failed {:?}", err); - gst_element_error!( + gst::element_error!( element, gst::StreamError::Failed, ("Internal data stream error"), @@ -1377,7 +1377,7 @@ impl JitterBuffer { context, ) .map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Error preparing Task: {:?}", err] ) diff --git a/generic/threadshare/src/lib.rs b/generic/threadshare/src/lib.rs index 438d36c2e..e9003be5e 100644 --- a/generic/threadshare/src/lib.rs +++ b/generic/threadshare/src/lib.rs @@ -42,8 +42,6 @@ mod queue; use glib::translate::*; -use gst::gst_plugin_define; - fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { udpsrc::register(plugin)?; udpsink::register(plugin)?; @@ -57,7 +55,7 @@ fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { Ok(()) } -gst_plugin_define!( +gst::plugin_define!( threadshare, env!("CARGO_PKG_DESCRIPTION"), plugin_init, diff --git a/generic/threadshare/src/proxy/imp.rs b/generic/threadshare/src/proxy/imp.rs index fc8efe20b..52d408242 100644 --- a/generic/threadshare/src/proxy/imp.rs +++ b/generic/threadshare/src/proxy/imp.rs @@ -25,7 +25,7 @@ use glib::subclass::prelude::*; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::{gst_debug, gst_element_error, gst_error, gst_error_msg, gst_log, gst_trace}; +use gst::{gst_debug, gst_error, gst_log, gst_trace}; use once_cell::sync::Lazy; @@ -592,7 +592,7 @@ impl ProxySink { let proxy_context = self.settings.lock().unwrap().proxy_context.to_string(); let proxy_ctx = ProxyContext::get(&proxy_context, true).ok_or_else(|| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Failed to create or get ProxyContext"] ) @@ -823,7 +823,7 @@ impl PadSrcHandler for ProxySrcPadHandler { EventView::FlushStart(..) => { if let Err(err) = proxysrc.task.flush_start() { gst_error!(SRC_CAT, obj: pad.gst_pad(), "FlushStart failed {:?}", err); - gst_element_error!( + gst::element_error!( element, gst::StreamError::Failed, ("Internal data stream error"), @@ -835,7 +835,7 @@ impl PadSrcHandler for ProxySrcPadHandler { EventView::FlushStop(..) => { if let Err(err) = proxysrc.task.flush_stop() { gst_error!(SRC_CAT, obj: pad.gst_pad(), "FlushStop failed {:?}", err); - gst_element_error!( + gst::element_error!( element, gst::StreamError::Failed, ("Internal data stream error"), @@ -980,7 +980,7 @@ impl TaskImpl for ProxySrcTask { } Err(err) => { gst_error!(SRC_CAT, obj: &self.element, "Got error {}", err); - gst_element_error!( + gst::element_error!( &self.element, gst::StreamError::Failed, ("Internal data stream error"), @@ -1063,14 +1063,14 @@ impl ProxySrc { let settings = self.settings.lock().unwrap().clone(); let proxy_ctx = ProxyContext::get(&settings.proxy_context, false).ok_or_else(|| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Failed to create get shared_state"] ) })?; let ts_ctx = Context::acquire(&settings.context, settings.context_wait).map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Failed to acquire Context: {}", err] ) @@ -1112,7 +1112,7 @@ impl ProxySrc { self.task .prepare(ProxySrcTask::new(element, &self.src_pad, dataqueue), ts_ctx) .map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Error preparing Task: {:?}", err] ) diff --git a/generic/threadshare/src/queue/imp.rs b/generic/threadshare/src/queue/imp.rs index aba422744..8f0d98c05 100644 --- a/generic/threadshare/src/queue/imp.rs +++ b/generic/threadshare/src/queue/imp.rs @@ -25,7 +25,7 @@ use glib::subclass::prelude::*; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::{gst_debug, gst_element_error, gst_error, gst_error_msg, gst_log, gst_trace}; +use gst::{gst_debug, gst_error, gst_log, gst_trace}; use once_cell::sync::Lazy; @@ -194,7 +194,7 @@ impl PadSinkHandler for QueuePadSinkHandler { if let EventView::FlushStart(..) = event.view() { if let Err(err) = queue.task.flush_start() { gst_error!(CAT, obj: pad.gst_pad(), "FlushStart failed {:?}", err); - gst_element_error!( + gst::element_error!( element, gst::StreamError::Failed, ("Internal data stream error"), @@ -228,7 +228,7 @@ impl PadSinkHandler for QueuePadSinkHandler { if let EventView::FlushStop(..) = event.view() { if let Err(err) = queue.task.flush_stop() { gst_error!(CAT, obj: pad.gst_pad(), "FlushStop failed {:?}", err); - gst_element_error!( + gst::element_error!( element, gst::StreamError::Failed, ("Internal data stream error"), @@ -321,7 +321,7 @@ impl PadSrcHandler for QueuePadSrcHandler { EventView::FlushStop(..) => { if let Err(err) = queue.task.flush_stop() { gst_error!(CAT, obj: pad.gst_pad(), "FlushStop failed {:?}", err); - gst_element_error!( + gst::element_error!( element, gst::StreamError::Failed, ("Internal data stream error"), @@ -442,7 +442,7 @@ impl TaskImpl for QueueTask { } Err(err) => { gst_error!(CAT, obj: &self.element, "Got error {}", err); - gst_element_error!( + gst::element_error!( &self.element, gst::StreamError::Failed, ("Internal data stream error"), @@ -700,7 +700,7 @@ impl Queue { let context = Context::acquire(&settings.context, settings.context_wait).map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Failed to acquire Context: {}", err] ) @@ -709,7 +709,7 @@ impl Queue { self.task .prepare(QueueTask::new(element, &self.src_pad, dataqueue), context) .map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Error preparing Task: {:?}", err] ) diff --git a/generic/threadshare/src/runtime/pad.rs b/generic/threadshare/src/runtime/pad.rs index 12da4d3b4..5032c63b1 100644 --- a/generic/threadshare/src/runtime/pad.rs +++ b/generic/threadshare/src/runtime/pad.rs @@ -72,7 +72,7 @@ use futures::prelude::*; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::{gst_debug, gst_error, gst_fixme, gst_log, gst_loggable_error}; +use gst::{gst_debug, gst_error, gst_fixme, gst_log}; use gst::{FlowError, FlowSuccess}; use std::marker::PhantomData; @@ -145,7 +145,7 @@ pub trait PadSrcHandler: Clone + Send + Sync + 'static { "Error in PadSrc activate: {:?}", err ); - gst_loggable_error!(RUNTIME_CAT, "Error in PadSrc activate: {:?}", err) + gst::loggable_error!(RUNTIME_CAT, "Error in PadSrc activate: {:?}", err) }) } @@ -335,7 +335,7 @@ impl<'a> PadSrcRef<'a> { if mode == gst::PadMode::Pull { gst_error!(RUNTIME_CAT, obj: self.gst_pad(), "Pull mode not supported by PadSrc"); - return Err(gst_loggable_error!( + return Err(gst::loggable_error!( RUNTIME_CAT, "Pull mode not supported by PadSrc" )); @@ -398,7 +398,10 @@ impl PadSrc { parent, || { gst_error!(RUNTIME_CAT, obj: gst_pad, "Panic in PadSrc activate"); - Err(gst_loggable_error!(RUNTIME_CAT, "Panic in PadSrc activate")) + Err(gst::loggable_error!( + RUNTIME_CAT, + "Panic in PadSrc activate" + )) }, move |imp, element| { let this_ref = PadSrcRef::new(inner_arc); @@ -421,7 +424,7 @@ impl PadSrc { parent, || { gst_error!(RUNTIME_CAT, obj: gst_pad, "Panic in PadSrc activatemode"); - Err(gst_loggable_error!( + Err(gst::loggable_error!( RUNTIME_CAT, "Panic in PadSrc activatemode" )) @@ -492,11 +495,11 @@ impl Drop for PadSrc { unsafe { self.gst_pad() .set_activate_function(move |_gst_pad, _parent| { - Err(gst_loggable_error!(RUNTIME_CAT, "PadSrc no longer exists")) + Err(gst::loggable_error!(RUNTIME_CAT, "PadSrc no longer exists")) }); self.gst_pad() .set_activatemode_function(move |_gst_pad, _parent, _mode, _active| { - Err(gst_loggable_error!(RUNTIME_CAT, "PadSrc no longer exists")) + Err(gst::loggable_error!(RUNTIME_CAT, "PadSrc no longer exists")) }); self.gst_pad() .set_event_function(move |_gst_pad, _parent, _event| false); @@ -553,7 +556,7 @@ pub trait PadSinkHandler: Clone + Send + Sync + 'static { "Error in PadSink activate: {:?}", err ); - gst_loggable_error!(RUNTIME_CAT, "Error in PadSink activate: {:?}", err) + gst::loggable_error!(RUNTIME_CAT, "Error in PadSink activate: {:?}", err) }) } @@ -746,7 +749,7 @@ impl<'a> PadSinkRef<'a> { if mode == gst::PadMode::Pull { gst_error!(RUNTIME_CAT, obj: self.gst_pad(), "Pull mode not supported by PadSink"); - return Err(gst_loggable_error!( + return Err(gst::loggable_error!( RUNTIME_CAT, "Pull mode not supported by PadSink" )); @@ -816,7 +819,7 @@ impl PadSink { parent, || { gst_error!(RUNTIME_CAT, obj: gst_pad, "Panic in PadSink activate"); - Err(gst_loggable_error!( + Err(gst::loggable_error!( RUNTIME_CAT, "Panic in PadSink activate" )) @@ -842,7 +845,7 @@ impl PadSink { parent, || { gst_error!(RUNTIME_CAT, obj: gst_pad, "Panic in PadSink activatemode"); - Err(gst_loggable_error!( + Err(gst::loggable_error!( RUNTIME_CAT, "Panic in PadSink activatemode" )) @@ -1031,11 +1034,17 @@ impl Drop for PadSink { unsafe { self.gst_pad() .set_activate_function(move |_gst_pad, _parent| { - Err(gst_loggable_error!(RUNTIME_CAT, "PadSink no longer exists")) + Err(gst::loggable_error!( + RUNTIME_CAT, + "PadSink no longer exists" + )) }); self.gst_pad() .set_activatemode_function(move |_gst_pad, _parent, _mode, _active| { - Err(gst_loggable_error!(RUNTIME_CAT, "PadSink no longer exists")) + Err(gst::loggable_error!( + RUNTIME_CAT, + "PadSink no longer exists" + )) }); self.gst_pad() .set_chain_function(move |_gst_pad, _parent, _buffer| Err(FlowError::Flushing)); diff --git a/generic/threadshare/src/runtime/task.rs b/generic/threadshare/src/runtime/task.rs index 000473e31..d2528e6c6 100644 --- a/generic/threadshare/src/runtime/task.rs +++ b/generic/threadshare/src/runtime/task.rs @@ -24,7 +24,7 @@ use futures::future::{self, abortable, AbortHandle, Aborted, BoxFuture, RemoteHa use futures::prelude::*; use futures::stream::StreamExt; -use gst::{gst_debug, gst_error, gst_error_msg, gst_fixme, gst_log, gst_trace, gst_warning}; +use gst::{gst_debug, gst_error, gst_fixme, gst_log, gst_trace, gst_warning}; use std::fmt; use std::ops::Deref; @@ -244,7 +244,7 @@ impl TriggeringEvent { let res = Err(TransitionError { trigger: self.trigger, state: TaskState::Error, - err_msg: gst_error_msg!( + err_msg: gst::error_msg!( gst::CoreError::StateChange, [ "Triggering Event {:?} rejected due to a previous unrecoverable error", @@ -305,7 +305,7 @@ impl TaskInner { let res = Err(TransitionError { trigger: triggering_evt.trigger, state: self.state, - err_msg: gst_error_msg!( + err_msg: gst::error_msg!( gst::CoreError::StateChange, [ "Unrecoverable error for {:?} from state {:?}", @@ -349,7 +349,7 @@ impl TaskInner { TransitionError { trigger, state: self.state, - err_msg: gst_error_msg!(resource_err, ["Unable to send {:?}: {:?}", trigger, err]), + err_msg: gst::error_msg!(resource_err, ["Unable to send {:?}: {:?}", trigger, err]), } })?; @@ -426,7 +426,7 @@ impl Task { return Err(TransitionError { trigger: Trigger::Prepare, state: inner.state, - err_msg: gst_error_msg!( + err_msg: gst::error_msg!( gst::CoreError::StateChange, ["Attempt to prepare Task in state {:?}", state] ), @@ -479,7 +479,7 @@ impl Task { return Err(TransitionError { trigger: Trigger::Unprepare, state: inner.state, - err_msg: gst_error_msg!( + err_msg: gst::error_msg!( gst::CoreError::StateChange, ["Attempt to unprepare Task in state {:?}", state] ), @@ -704,7 +704,7 @@ macro_rules! exec_action { res = Context::drain_sub_tasks().await.map_err(|err| { let msg = format!("{} subtask returned {:?}", stringify!($action), err); gst_log!(RUNTIME_CAT, "{}", &msg); - gst_error_msg!(gst::CoreError::StateChange, ["{}", &msg]) + gst::error_msg!(gst::CoreError::StateChange, ["{}", &msg]) }); if res.is_err() { @@ -1036,7 +1036,7 @@ impl StateMachine { res = Context::drain_sub_tasks().await.map_err(|err| { let msg = format!("start subtask returned {:?}", err); gst_log!(RUNTIME_CAT, "{}", &msg); - gst_error_msg!(gst::CoreError::StateChange, ["{}", &msg]) + gst::error_msg!(gst::CoreError::StateChange, ["{}", &msg]) }); if res.is_err() { @@ -1483,7 +1483,7 @@ mod tests { fn prepare(&mut self) -> BoxFuture<'_, Result<(), gst::ErrorMessage>> { async move { gst_debug!(RUNTIME_CAT, "prepare_error: prepare returning an error"); - Err(gst_error_msg!( + Err(gst::error_msg!( gst::ResourceError::Failed, ["prepare_error: intentional error"] )) @@ -1680,7 +1680,7 @@ mod tests { self.prepare_receiver.next().await.unwrap(); gst_debug!(RUNTIME_CAT, "prepare_start_error: preparation complete Err"); - Err(gst_error_msg!( + Err(gst::error_msg!( gst::ResourceError::Failed, ["prepare_start_error: intentional error"] )) diff --git a/generic/threadshare/src/socket.rs b/generic/threadshare/src/socket.rs index a2ada2999..500e44de3 100644 --- a/generic/threadshare/src/socket.rs +++ b/generic/threadshare/src/socket.rs @@ -19,7 +19,7 @@ use futures::future::BoxFuture; use gst::prelude::*; -use gst::{gst_debug, gst_error, gst_error_msg, gst_log}; +use gst::{gst_debug, gst_error, gst_log}; use once_cell::sync::Lazy; @@ -314,7 +314,7 @@ pub fn wrap_socket(socket: &tokio::net::UdpSocket) -> Result<GioSocketWrapper, g let fd = FdConverter(fd); let gio_socket = gio::Socket::from_fd(fd).map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenWrite, ["Failed to create wrapped GIO socket: {}", err] ) @@ -339,7 +339,7 @@ pub fn wrap_socket(socket: &tokio::net::UdpSocket) -> Result<GioSocketWrapper, g let fd = SocketConverter(fd); let gio_socket = gio::Socket::from_socket(fd).map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenWrite, ["Failed to create wrapped GIO socket: {}", err] ) diff --git a/generic/threadshare/src/tcpclientsrc/imp.rs b/generic/threadshare/src/tcpclientsrc/imp.rs index 17bdb5031..afd23423b 100644 --- a/generic/threadshare/src/tcpclientsrc/imp.rs +++ b/generic/threadshare/src/tcpclientsrc/imp.rs @@ -26,7 +26,7 @@ use glib::subclass::prelude::*; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::{gst_debug, gst_element_error, gst_error, gst_error_msg, gst_log, gst_trace}; +use gst::{gst_debug, gst_error, gst_log, gst_trace}; use once_cell::sync::Lazy; @@ -362,7 +362,7 @@ impl TaskImpl for TcpClientSrcTask { let socket = tokio::net::TcpStream::connect(self.saddr) .await .map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Failed to connect to {:?}: {:?}", self.saddr, err] ) @@ -375,7 +375,7 @@ impl TaskImpl for TcpClientSrcTask { TcpClientReader::new(socket), ) .map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Failed to prepare socket {:?}", err] ) @@ -418,7 +418,7 @@ impl TaskImpl for TcpClientSrcTask { gst_error!(CAT, obj: &self.element, "Got error {:?}", err); match err { SocketError::Gst(err) => { - gst_element_error!( + gst::element_error!( self.element, gst::StreamError::Failed, ("Internal data stream error"), @@ -426,7 +426,7 @@ impl TaskImpl for TcpClientSrcTask { ); } SocketError::Io(err) => { - gst_element_error!( + gst::element_error!( self.element, gst::StreamError::Failed, ("I/O error"), @@ -460,7 +460,7 @@ impl TaskImpl for TcpClientSrcTask { } Err(err) => { gst_error!(CAT, obj: &self.element, "Got error {}", err); - gst_element_error!( + gst::element_error!( self.element, gst::StreamError::Failed, ("Internal data stream error"), @@ -518,7 +518,7 @@ impl TcpClientSrc { let context = Context::acquire(&settings.context, settings.context_wait).map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Failed to acquire Context: {}", err] ) @@ -526,14 +526,14 @@ impl TcpClientSrc { let host: IpAddr = match settings.host { None => { - return Err(gst_error_msg!( + return Err(gst::error_msg!( gst::ResourceError::Settings, ["No host set"] )); } Some(ref host) => match host.parse() { Err(err) => { - return Err(gst_error_msg!( + return Err(gst::error_msg!( gst::ResourceError::Settings, ["Invalid host '{}' set: {}", host, err] )); @@ -547,7 +547,7 @@ impl TcpClientSrc { let mut config = buffer_pool.get_config(); config.set_params(None, settings.blocksize, 0, 0); buffer_pool.set_config(config).map_err(|_| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::Settings, ["Failed to configure buffer pool"] ) @@ -569,7 +569,7 @@ impl TcpClientSrc { context, ) .map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Error preparing Task: {:?}", err] ) diff --git a/generic/threadshare/src/udpsink/imp.rs b/generic/threadshare/src/udpsink/imp.rs index 4b1e2bbba..bd991bbc1 100644 --- a/generic/threadshare/src/udpsink/imp.rs +++ b/generic/threadshare/src/udpsink/imp.rs @@ -28,8 +28,7 @@ use gst::prelude::*; use gst::subclass::prelude::*; use gst::EventView; use gst::{ - gst_debug, gst_element_error, gst_error, gst_error_msg, gst_info, gst_log, gst_trace, - gst_warning, + element_error, error_msg, gst_debug, gst_error, gst_info, gst_log, gst_trace, gst_warning, }; use once_cell::sync::Lazy; @@ -445,7 +444,7 @@ impl UdpSinkPadHandler { socket .join_multicast_v4(addr, Ipv4Addr::new(0, 0, 0, 0)) .map_err(|err| { - gst_error_msg!( + error_msg!( gst::ResourceError::OpenWrite, ["Failed to join multicast group: {}", err] ) @@ -453,7 +452,7 @@ impl UdpSinkPadHandler { } if settings.multicast_loop { socket.set_multicast_loop_v4(true).map_err(|err| { - gst_error_msg!( + error_msg!( gst::ResourceError::OpenWrite, ["Failed to set multicast loop: {}", err] ) @@ -462,7 +461,7 @@ impl UdpSinkPadHandler { socket .set_multicast_ttl_v4(settings.ttl_mc) .map_err(|err| { - gst_error_msg!( + error_msg!( gst::ResourceError::OpenWrite, ["Failed to set multicast ttl: {}", err] ) @@ -473,7 +472,7 @@ impl UdpSinkPadHandler { if let Some(socket) = socket_v6.as_mut() { if settings.auto_multicast { socket.join_multicast_v6(&addr, 0).map_err(|err| { - gst_error_msg!( + error_msg!( gst::ResourceError::OpenWrite, ["Failed to join multicast group: {}", err] ) @@ -481,7 +480,7 @@ impl UdpSinkPadHandler { } if settings.multicast_loop { socket.set_multicast_loop_v6(true).map_err(|err| { - gst_error_msg!( + error_msg!( gst::ResourceError::OpenWrite, ["Failed to set multicast loop: {}", err] ) @@ -496,7 +495,7 @@ impl UdpSinkPadHandler { IpAddr::V4(_) => { if let Some(socket) = socket.as_mut() { socket.set_ttl(settings.ttl).map_err(|err| { - gst_error_msg!( + error_msg!( gst::ResourceError::OpenWrite, ["Failed to set unicast ttl: {}", err] ) @@ -506,7 +505,7 @@ impl UdpSinkPadHandler { IpAddr::V6(_) => { if let Some(socket) = socket_v6.as_mut() { socket.set_ttl(settings.ttl).map_err(|err| { - gst_error_msg!( + error_msg!( gst::ResourceError::OpenWrite, ["Failed to set unicast ttl: {}", err] ) @@ -534,7 +533,7 @@ impl UdpSinkPadHandler { socket .leave_multicast_v4(addr, Ipv4Addr::new(0, 0, 0, 0)) .map_err(|err| { - gst_error_msg!( + error_msg!( gst::ResourceError::OpenWrite, ["Failed to join multicast group: {}", err] ) @@ -546,7 +545,7 @@ impl UdpSinkPadHandler { if let Some(socket) = socket_v6.as_mut() { if settings.auto_multicast { socket.leave_multicast_v6(&addr, 0).map_err(|err| { - gst_error_msg!( + error_msg!( gst::ResourceError::OpenWrite, ["Failed to join multicast group: {}", err] ) @@ -612,7 +611,7 @@ impl UdpSinkPadHandler { for client in &clients_to_configure { self.configure_client(&settings, &mut socket, &mut socket_v6, &client) .map_err(|err| { - gst_element_error!( + element_error!( element, gst::StreamError::Failed, ["Failed to configure client {:?}: {}", client, err] @@ -627,7 +626,7 @@ impl UdpSinkPadHandler { for client in &clients_to_unconfigure { self.unconfigure_client(&settings, &mut socket, &mut socket_v6, &client) .map_err(|err| { - gst_element_error!( + element_error!( element, gst::StreamError::Failed, ["Failed to unconfigure client {:?}: {}", client, err] @@ -643,7 +642,7 @@ impl UdpSinkPadHandler { } let data = buffer.map_readable().map_err(|_| { - gst_element_error!( + element_error!( element, gst::StreamError::Format, ["Failed to map buffer readable"] @@ -661,7 +660,7 @@ impl UdpSinkPadHandler { if let Some(socket) = socket.as_mut() { gst_log!(CAT, obj: element, "Sending to {:?}", &client); socket.send_to(&data, client).await.map_err(|err| { - gst_element_error!( + element_error!( element, gst::StreamError::Failed, ("I/O error"), @@ -670,7 +669,7 @@ impl UdpSinkPadHandler { gst::FlowError::Error })?; } else { - gst_element_error!( + element_error!( element, gst::StreamError::Failed, ("I/O error"), @@ -849,7 +848,7 @@ impl TaskImpl for UdpSinkTask { Some(TaskItem::Buffer(buffer)) => { match self.sink_pad_handler.render(&self.element, buffer).await { Err(err) => { - gst_element_error!( + element_error!( &self.element, gst::StreamError::Failed, ["Failed to render item, stopping task: {}", err] @@ -919,7 +918,7 @@ impl UdpSink { let socket = context.enter(|| { tokio::net::UdpSocket::from_std(socket).map_err(|err| { - gst_error_msg!( + error_msg!( gst::ResourceError::OpenWrite, ["Failed to setup socket for tokio: {}", err] ) @@ -943,7 +942,7 @@ impl UdpSink { }; let bind_addr: IpAddr = bind_addr.parse().map_err(|err| { - gst_error_msg!( + error_msg!( gst::ResourceError::Settings, ["Invalid address '{}' set: {}", bind_addr, err] ) @@ -988,7 +987,7 @@ impl UdpSink { }; socket.bind(&saddr.into()).map_err(|err| { - gst_error_msg!( + error_msg!( gst::ResourceError::OpenWrite, ["Failed to bind socket: {}", err] ) @@ -996,7 +995,7 @@ impl UdpSink { let socket = context.enter(|| { tokio::net::UdpSocket::from_std(socket.into()).map_err(|err| { - gst_error_msg!( + error_msg!( gst::ResourceError::OpenWrite, ["Failed to setup socket for tokio: {}", err] ) @@ -1007,7 +1006,7 @@ impl UdpSink { if settings.qos_dscp != -1 { wrapper.set_tos(settings.qos_dscp).map_err(|err| { - gst_error_msg!( + error_msg!( gst::ResourceError::OpenWrite, ["Failed to set QoS DSCP: {}", err] ) @@ -1038,7 +1037,7 @@ impl UdpSink { let settings = self.settings.lock().unwrap(); Context::acquire(&settings.context, settings.context_wait).map_err(|err| { - gst_error_msg!( + error_msg!( gst::ResourceError::OpenWrite, ["Failed to acquire Context: {}", err] ) @@ -1052,7 +1051,7 @@ impl UdpSink { self.task .prepare(UdpSinkTask::new(&element, &self.sink_pad_handler), context) .map_err(|err| { - gst_error_msg!( + error_msg!( gst::ResourceError::OpenRead, ["Error preparing Task: {:?}", err] ) diff --git a/generic/threadshare/src/udpsrc/imp.rs b/generic/threadshare/src/udpsrc/imp.rs index deab07de9..1d42561c9 100644 --- a/generic/threadshare/src/udpsrc/imp.rs +++ b/generic/threadshare/src/udpsrc/imp.rs @@ -25,7 +25,7 @@ use glib::subclass::prelude::*; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::{gst_debug, gst_element_error, gst_error, gst_error_msg, gst_log, gst_trace}; +use gst::{gst_debug, gst_error, gst_log, gst_trace}; use gst_net::*; use once_cell::sync::Lazy; @@ -420,7 +420,7 @@ impl TaskImpl for UdpSrcTask { gst_error!(CAT, obj: &self.element, "Got error {:?}", err); match err { SocketError::Gst(err) => { - gst_element_error!( + gst::element_error!( self.element, gst::StreamError::Failed, ("Internal data stream error"), @@ -428,7 +428,7 @@ impl TaskImpl for UdpSrcTask { ); } SocketError::Io(err) => { - gst_element_error!( + gst::element_error!( self.element, gst::StreamError::Failed, ("I/O error"), @@ -474,7 +474,7 @@ impl TaskImpl for UdpSrcTask { } Err(err) => { gst_error!(CAT, obj: &self.element, "Got error {}", err); - gst_element_error!( + gst::element_error!( self.element, gst::StreamError::Failed, ("Internal data stream error"), @@ -532,7 +532,7 @@ impl UdpSrc { let context = Context::acquire(&settings_guard.context, settings_guard.context_wait) .map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Failed to acquire Context: {}", err] ) @@ -554,7 +554,7 @@ impl UdpSrc { let socket = context.enter(|| { tokio::net::UdpSocket::from_std(socket).map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Failed to setup socket for tokio: {}", err] ) @@ -567,14 +567,14 @@ impl UdpSrc { } else { let addr: IpAddr = match settings_guard.address { None => { - return Err(gst_error_msg!( + return Err(gst::error_msg!( gst::ResourceError::Settings, ["No address set"] )); } Some(ref addr) => match addr.parse() { Err(err) => { - return Err(gst_error_msg!( + return Err(gst::error_msg!( gst::ResourceError::Settings, ["Invalid address '{}' set: {}", addr, err] )); @@ -623,7 +623,7 @@ impl UdpSrc { ) } .map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Failed to create socket: {}", err] ) @@ -632,7 +632,7 @@ impl UdpSrc { socket .set_reuse_address(settings_guard.reuse) .map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Failed to set reuse_address: {}", err] ) @@ -641,7 +641,7 @@ impl UdpSrc { #[cfg(unix)] { socket.set_reuse_port(settings_guard.reuse).map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Failed to set reuse_port: {}", err] ) @@ -649,7 +649,7 @@ impl UdpSrc { } socket.bind(&saddr.into()).map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Failed to bind socket: {}", err] ) @@ -657,7 +657,7 @@ impl UdpSrc { let socket = context.enter(|| { tokio::net::UdpSocket::from_std(socket.into()).map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Failed to setup socket for tokio: {}", err] ) @@ -671,7 +671,7 @@ impl UdpSrc { socket .join_multicast_v4(addr, Ipv4Addr::new(0, 0, 0, 0)) .map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Failed to join multicast group: {}", err] ) @@ -679,7 +679,7 @@ impl UdpSrc { } IpAddr::V6(addr) => { socket.join_multicast_v6(&addr, 0).map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Failed to join multicast group: {}", err] ) @@ -712,7 +712,7 @@ impl UdpSrc { let mut config = buffer_pool.get_config(); config.set_params(None, settings.mtu, 0, 0); buffer_pool.set_config(config).map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::Settings, ["Failed to configure buffer pool {:?}", err] ) @@ -724,7 +724,7 @@ impl UdpSrc { UdpReader::new(socket), ) .map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Failed to prepare socket {:?}", err] ) @@ -741,7 +741,7 @@ impl UdpSrc { context, ) .map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Error preparing Task: {:?}", err] ) diff --git a/generic/threadshare/tests/pad.rs b/generic/threadshare/tests/pad.rs index cf0ac384d..ee8bc2457 100644 --- a/generic/threadshare/tests/pad.rs +++ b/generic/threadshare/tests/pad.rs @@ -26,7 +26,7 @@ use glib::GBoxed; use gst::prelude::*; use gst::subclass::prelude::*; use gst::EventView; -use gst::{gst_debug, gst_error_msg, gst_info, gst_log}; +use gst::{gst_debug, gst_info, gst_log}; use once_cell::sync::Lazy; @@ -258,7 +258,7 @@ mod imp_src { let settings = self.settings.lock().unwrap().clone(); let context = Context::acquire(&settings.context, THROTTLING_DURATION).map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::OpenRead, ["Failed to acquire Context: {}", err] ) @@ -273,7 +273,7 @@ mod imp_src { context, ) .map_err(|err| { - gst_error_msg!( + gst::error_msg!( gst::ResourceError::Failed, ["Error preparing Task: {:?}", err] ) |