diff options
author | François Laignel <fengalin@free.fr> | 2022-02-21 20:43:46 +0300 |
---|---|---|
committer | François Laignel <fengalin@free.fr> | 2022-02-21 22:50:01 +0300 |
commit | 422ea740ca937c3d669b7c961a67a09d9b1baed0 (patch) | |
tree | d6b0333340dcb3621a2195d2b92ffb23e402d5b6 /generic/sodium/src/encrypter | |
parent | 8263e19313df6af6bb9dc59bad94bec0769192fc (diff) |
Update to gst::_log_macro_
See the details:
https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/980
Diffstat (limited to 'generic/sodium/src/encrypter')
-rw-r--r-- | generic/sodium/src/encrypter/imp.rs | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/generic/sodium/src/encrypter/imp.rs b/generic/sodium/src/encrypter/imp.rs index 35c2c60cc..9bcd5691a 100644 --- a/generic/sodium/src/encrypter/imp.rs +++ b/generic/sodium/src/encrypter/imp.rs @@ -25,7 +25,6 @@ use gst::glib; use gst::prelude::*; use gst::subclass::prelude::*; -use gst::{gst_debug, gst_error, gst_log}; use smallvec::SmallVec; use sodiumoxide::crypto::box_; @@ -170,7 +169,7 @@ impl Encrypter { element: &super::Encrypter, buffer: gst::Buffer, ) -> Result<gst::FlowSuccess, gst::FlowError> { - gst_log!(CAT, obj: pad, "Handling buffer {:?}", buffer); + gst::log!(CAT, obj: pad, "Handling buffer {:?}", buffer); let mut buffers = BufferVec::new(); let mut state_guard = self.state.lock().unwrap(); @@ -197,7 +196,7 @@ impl Encrypter { for buffer in buffers { self.srcpad.push(buffer).map_err(|err| { - gst_error!(CAT, obj: element, "Failed to push buffer {:?}", err); + gst::error!(CAT, obj: element, "Failed to push buffer {:?}", err); err })?; } @@ -208,7 +207,7 @@ impl Encrypter { fn sink_event(&self, pad: &gst::Pad, element: &super::Encrypter, event: gst::Event) -> bool { use gst::EventView; - gst_log!(CAT, obj: pad, "Handling event {:?}", event); + gst::log!(CAT, obj: pad, "Handling event {:?}", event); match event.view() { EventView::Caps(_) => { @@ -240,7 +239,7 @@ impl Encrypter { for buffer in buffers { if let Err(err) = self.srcpad.push(buffer) { - gst_error!(CAT, obj: element, "Failed to push buffer at EOS {:?}", err); + gst::error!(CAT, obj: element, "Failed to push buffer at EOS {:?}", err); return false; } } @@ -254,7 +253,7 @@ impl Encrypter { fn src_event(&self, pad: &gst::Pad, element: &super::Encrypter, event: gst::Event) -> bool { use gst::EventView; - gst_log!(CAT, obj: pad, "Handling event {:?}", event); + gst::log!(CAT, obj: pad, "Handling event {:?}", event); match event.view() { EventView::Seek(_) => false, @@ -270,7 +269,7 @@ impl Encrypter { ) -> bool { use gst::QueryViewMut; - gst_log!(CAT, obj: pad, "Handling query {:?}", query); + gst::log!(CAT, obj: pad, "Handling query {:?}", query); match query.view_mut() { QueryViewMut::Seeking(q) => { @@ -280,7 +279,7 @@ impl Encrypter { gst::GenericFormattedValue::Other(format, -1), gst::GenericFormattedValue::Other(format, -1), ); - gst_log!(CAT, obj: pad, "Returning {:?}", q.query_mut()); + gst::log!(CAT, obj: pad, "Returning {:?}", q.query_mut()); true } QueryViewMut::Duration(q) => { @@ -292,14 +291,14 @@ impl Encrypter { let mut peer_query = gst::query::Duration::new(gst::Format::Bytes); if !self.sinkpad.peer_query(&mut peer_query) { - gst_error!(CAT, "Failed to query upstream duration"); + gst::error!(CAT, "Failed to query upstream duration"); return false; } let size = match peer_query.result().try_into().unwrap() { Some(gst::format::Bytes(size)) => size, None => { - gst_error!(CAT, "Failed to query upstream duration"); + gst::error!(CAT, "Failed to query upstream duration"); return false; } @@ -321,7 +320,7 @@ impl Encrypter { // add static offsets let size = size + crate::HEADERS_SIZE as u64; - gst_debug!(CAT, obj: pad, "Setting duration bytes: {}", size); + gst::debug!(CAT, obj: pad, "Setting duration bytes: {}", size); q.set(gst::format::Bytes(size)); true @@ -516,7 +515,7 @@ impl ElementImpl for Encrypter { element: &Self::Type, transition: gst::StateChange, ) -> Result<gst::StateChangeSuccess, gst::StateChangeError> { - gst_debug!(CAT, obj: element, "Changing state {:?}", transition); + gst::debug!(CAT, obj: element, "Changing state {:?}", transition); match transition { gst::StateChange::NullToReady => { |