From 87ea535bc193497967ccd5c5934bfb4bb033bf83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Laignel?= <fengalin@free.fr>
Date: Sun, 23 Oct 2022 20:44:38 +0200
Subject: [PATCH] gst/log: accept non-ref obj in macros

---
 gstreamer-base/src/subclass/base_transform.rs |  9 +++------
 gstreamer/src/log.rs                          | 19 +++++++++++++++++--
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/gstreamer-base/src/subclass/base_transform.rs b/gstreamer-base/src/subclass/base_transform.rs
index 124b7565a..6090f105a 100644
--- a/gstreamer-base/src/subclass/base_transform.rs
+++ b/gstreamer-base/src/subclass/base_transform.rs
@@ -1328,12 +1328,9 @@ unsafe extern "C" fn base_transform_copy_metadata<T: BaseTransformImpl>(
     let imp = instance.imp();
 
     if gst::ffi::gst_mini_object_is_writable(outbuf as *mut _) == glib::ffi::GFALSE {
-        gst::warning!(
-            gst::CAT_RUST,
-            obj: imp.instance().unsafe_cast_ref::<BaseTransform>(),
-            "buffer {:?} not writable",
-            outbuf
-        );
+        let instance = imp.instance();
+        let obj = instance.unsafe_cast_ref::<BaseTransform>();
+        gst::warning!(gst::CAT_RUST, obj: obj, "buffer {:?} not writable", outbuf);
         return glib::ffi::GFALSE;
     }
 
diff --git a/gstreamer/src/log.rs b/gstreamer/src/log.rs
index 69eb3c0cd..4d1c78eb1 100644
--- a/gstreamer/src/log.rs
+++ b/gstreamer/src/log.rs
@@ -491,7 +491,11 @@ macro_rules! log_with_level(
         // Check the log level before using `format_args!` otherwise
         // formatted arguments are evaluated even if we end up not logging.
         if $level <= $cat.threshold() {
-            $crate::DebugCategory::log_unfiltered($cat.clone(), Some(&*$obj),
+            use $crate::glib::Cast;
+
+            #[allow(unused_unsafe)]
+            let obj = unsafe { $obj.unsafe_cast_ref::<$crate::glib::Object>() };
+            $crate::DebugCategory::log_unfiltered($cat.clone(), Some(obj),
                 $level, file!(), module_path!(), line!(), format_args!($($args)*))
         }
     }};
@@ -502,8 +506,9 @@ macro_rules! log_with_level(
             use $crate::glib::Cast;
 
             let obj = $imp.instance();
+            #[allow(unused_unsafe)]
             let obj = unsafe { obj.unsafe_cast_ref::<$crate::glib::Object>() };
-            $crate::DebugCategory::log_unfiltered($cat.clone(), Some(&*obj),
+            $crate::DebugCategory::log_unfiltered($cat.clone(), Some(obj),
                 $level, file!(), module_path!(), line!(), format_args!($($args)*))
         }
     }};
@@ -724,6 +729,7 @@ mod tests {
         memdump!(cat, "meh");
 
         let obj = crate::Bin::new(Some("meh"));
+
         error!(cat, obj: &obj, "meh");
         warning!(cat, obj: &obj, "meh");
         fixme!(cat, obj: &obj, "meh");
@@ -732,6 +738,15 @@ mod tests {
         log!(cat, obj: &obj, "meh");
         trace!(cat, obj: &obj, "meh");
         memdump!(cat, obj: &obj, "meh");
+
+        error!(cat, obj: obj, "meh");
+        warning!(cat, obj: obj, "meh");
+        fixme!(cat, obj: obj, "meh");
+        info!(cat, obj: obj, "meh");
+        debug!(cat, obj: obj, "meh");
+        log!(cat, obj: obj, "meh");
+        trace!(cat, obj: obj, "meh");
+        memdump!(cat, obj: obj, "meh");
     }
 
     #[test]