From 2f3e24542685567b1a7ebcfb567c8472af5810e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 2 Dec 2020 09:39:45 +0200 Subject: [PATCH] adaptivedemux: Don't log with non-GObject objects Instead of using the streams, log with the pad of the streams. https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1457 Part-of: --- gst-libs/gst/adaptivedemux/gstadaptivedemux.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gst-libs/gst/adaptivedemux/gstadaptivedemux.c b/gst-libs/gst/adaptivedemux/gstadaptivedemux.c index a66b39e..e32444e 100644 --- a/gst-libs/gst/adaptivedemux/gstadaptivedemux.c +++ b/gst-libs/gst/adaptivedemux/gstadaptivedemux.c @@ -1276,7 +1276,8 @@ gst_adaptive_demux_expose_streams (GstAdaptiveDemux * demux) * Even if it doesn't do that, we will change its state later in * gst_adaptive_demux_stop_tasks. */ - GST_LOG_OBJECT (stream, "Marking stream as cancelled"); + GST_LOG_OBJECT (GST_ADAPTIVE_DEMUX_STREAM_PAD (stream), + "Marking stream as cancelled"); gst_task_stop (stream->download_task); g_mutex_lock (&stream->fragment_download_lock); stream->cancelled = TRUE; @@ -2292,9 +2293,9 @@ gst_adaptive_demux_stream_update_current_bitrate (GstAdaptiveDemux * demux, average_bitrate = _update_average_bitrate (demux, stream, fragment_bitrate); - GST_INFO_OBJECT (stream, "last fragment bitrate was %" G_GUINT64_FORMAT, - fragment_bitrate); - GST_INFO_OBJECT (stream, + GST_INFO_OBJECT (GST_ADAPTIVE_DEMUX_STREAM_PAD (stream), + "last fragment bitrate was %" G_GUINT64_FORMAT, fragment_bitrate); + GST_INFO_OBJECT (GST_ADAPTIVE_DEMUX_STREAM_PAD (stream), "Last %u fragments average bitrate is %" G_GUINT64_FORMAT, NUM_LOOKBACK_FRAGMENTS, average_bitrate); @@ -2533,7 +2534,8 @@ gst_adaptive_demux_stream_push_buffer (GstAdaptiveDemuxStream * stream, g_mutex_lock (&stream->fragment_download_lock); if (G_UNLIKELY (stream->cancelled)) { - GST_LOG_OBJECT (stream, "Stream was cancelled"); + GST_LOG_OBJECT (GST_ADAPTIVE_DEMUX_STREAM_PAD (stream), + "Stream was cancelled"); ret = stream->last_ret = GST_FLOW_FLUSHING; g_mutex_unlock (&stream->fragment_download_lock); return ret; -- 2.7.4