From d4a428e61f0fe4ea77d069e308e58c1be884d516 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Fri, 14 Apr 2023 23:38:34 -0400 Subject: [PATCH] v4l2: object: Fix bogus debug objects pointers Part-of: --- .../gst-plugins-good/sys/v4l2/gstv4l2object.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2object.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2object.c index ee5edc6830..07aa3c8d61 100644 --- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2object.c +++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2object.c @@ -1987,17 +1987,17 @@ gst_v4l2_object_get_caps_info (GstV4l2Object * v4l2object, GstCaps * caps, /* ERRORS */ invalid_format: { - GST_DEBUG_OBJECT (v4l2object, "invalid format"); + GST_DEBUG_OBJECT (v4l2object->dbg_obj, "invalid format"); return FALSE; } unhandled_format: { - GST_DEBUG_OBJECT (v4l2object, "unhandled format"); + GST_DEBUG_OBJECT (v4l2object->dbg_obj, "unhandled format"); return FALSE; } unsupported_format: { - GST_DEBUG_OBJECT (v4l2object, "unsupported format"); + GST_DEBUG_OBJECT (v4l2object->dbg_obj, "unsupported format"); return FALSE; } } @@ -2366,7 +2366,8 @@ gst_v4l2_object_add_interlace_mode (GstV4l2Object * v4l2object, || gst_value_list_get_size (&interlace_formats) > 0) gst_structure_take_value (s, "interlace-mode", &interlace_formats); else - GST_WARNING_OBJECT (v4l2object, "Failed to determine interlace mode"); + GST_WARNING_OBJECT (v4l2object->dbg_obj, + "Failed to determine interlace mode"); return; } @@ -3338,7 +3339,7 @@ gst_v4l2_object_save_format (GstV4l2Object * v4l2object, padded_width = stride / pstride; } else { /* pstride can be 0 for complex formats */ - GST_WARNING_OBJECT (v4l2object->element, + GST_WARNING_OBJECT (v4l2object->dbg_obj, "format %s has a pstride of 0, cannot compute padded with", gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (info))); padded_width = stride; @@ -3611,9 +3612,9 @@ gst_v4l2_object_set_format_full (GstV4l2Object * v4l2object, GstCaps * caps, field = get_v4l2_field_for_info (&info); if (field != V4L2_FIELD_NONE) - GST_DEBUG_OBJECT (v4l2object->element, "interlaced video"); + GST_DEBUG_OBJECT (v4l2object->dbg_obj, "interlaced video"); else - GST_DEBUG_OBJECT (v4l2object->element, "progressive video"); + GST_DEBUG_OBJECT (v4l2object->dbg_obj, "progressive video"); /* We first pick the main colorspace from the primaries */ switch (info.colorimetry.primaries) {