mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-03 02:33:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

adaptivedemux: Don't log with non-GObject objects

Browse source 
Instead of using the streams, log with the pad of the streams.

https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1457

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1844>
This commit is contained in:
Sebastian Dröge 2020-12-02 09:39:45 +02:00 committed by GStreamer Merge Bot
parent 8eb0e637c7
commit 2f3e245426
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst-libs/gst/adaptivedemux/gstadaptivedemux.c
View file

@ -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 * Even if it doesn't do that, we will change its state later in
* gst_adaptive_demux_stop_tasks. * 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); gst_task_stop (stream->download_task);
g_mutex_lock (&stream->fragment_download_lock); g_mutex_lock (&stream->fragment_download_lock);
stream->cancelled = TRUE; 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); average_bitrate = _update_average_bitrate (demux, stream, fragment_bitrate);
GST_INFO_OBJECT (stream, "last fragment bitrate was %" G_GUINT64_FORMAT, GST_INFO_OBJECT (GST_ADAPTIVE_DEMUX_STREAM_PAD (stream),
fragment_bitrate); "last fragment bitrate was %" G_GUINT64_FORMAT, fragment_bitrate);
GST_INFO_OBJECT (stream, GST_INFO_OBJECT (GST_ADAPTIVE_DEMUX_STREAM_PAD (stream),
"Last %u fragments average bitrate is %" G_GUINT64_FORMAT, "Last %u fragments average bitrate is %" G_GUINT64_FORMAT,
NUM_LOOKBACK_FRAGMENTS, average_bitrate); NUM_LOOKBACK_FRAGMENTS, average_bitrate);
@ -2533,7 +2534,8 @@ gst_adaptive_demux_stream_push_buffer (GstAdaptiveDemuxStream * stream,
g_mutex_lock (&stream->fragment_download_lock); g_mutex_lock (&stream->fragment_download_lock);
if (G_UNLIKELY (stream->cancelled)) { 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; ret = stream->last_ret = GST_FLOW_FLUSHING;
g_mutex_unlock (&stream->fragment_download_lock); g_mutex_unlock (&stream->fragment_download_lock);
return ret; return ret;