mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 08:46:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

basetextoverlay: use GST_DEBUG_OBJECT instead of GST_DEBUG

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6918>
This commit is contained in:
Guillaume Desmottes 2024-05-24 11:35:00 +02:00
parent 1c88b06912
commit 0b17b17a8a
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
subprojects/gst-plugins-base/ext/pango/gstbasetextoverlay.c
View file

@ -1338,7 +1338,8 @@ gst_base_text_overlay_update_render_size (GstBaseTextOverlay * overlay)
overlay->render_scale = (gdouble) overlay->render_width / overlay->render_scale = (gdouble) overlay->render_width /
(gdouble) overlay->width; (gdouble) overlay->width;
GST_DEBUG ("updating render dimensions %dx%d from stream %dx%d, window %dx%d " GST_DEBUG_OBJECT (overlay,
"updating render dimensions %dx%d from stream %dx%d, window %dx%d "
"and render scale %f", overlay->render_width, overlay->render_height, "and render scale %f", overlay->render_width, overlay->render_height,
overlay->width, overlay->height, overlay->window_width, overlay->width, overlay->height, overlay->window_width,
overlay->window_height, overlay->render_scale); overlay->window_height, overlay->render_scale);
@ -1664,7 +1665,8 @@ gst_base_text_overlay_set_composition (GstBaseTextOverlay * overlay)
render_width = overlay->ink_rect.width; render_width = overlay->ink_rect.width;
render_height = overlay->ink_rect.height; render_height = overlay->ink_rect.height;
GST_DEBUG ("updating composition for '%s' with window size %dx%d, " GST_DEBUG_OBJECT (overlay,
"updating composition for '%s' with window size %dx%d, "
"buffer size %dx%d, render size %dx%d and position (%d, %d)", "buffer size %dx%d, render size %dx%d and position (%d, %d)",
overlay->default_text, overlay->window_width, overlay->window_height, overlay->default_text, overlay->window_width, overlay->window_height,
overlay->text_width, overlay->text_height, render_width, overlay->text_width, overlay->text_height, render_width,
@ -2195,7 +2197,7 @@ gst_base_text_overlay_render_text (GstBaseTextOverlay * overlay,
gchar *string; gchar *string;
if (!overlay->need_render) { if (!overlay->need_render) {
GST_DEBUG ("Using previously rendered text."); GST_DEBUG_OBJECT (overlay, "Using previously rendered text.");
return; return;
} }
@ -2214,7 +2216,7 @@ gst_base_text_overlay_render_text (GstBaseTextOverlay * overlay,
/* FIXME: should we check for UTF-8 here? */ /* FIXME: should we check for UTF-8 here? */
GST_DEBUG ("Rendering '%s'", string); GST_DEBUG_OBJECT (overlay, "Rendering '%s'", string);
gst_base_text_overlay_render_pangocairo (overlay, string, textlen); gst_base_text_overlay_render_pangocairo (overlay, string, textlen);
g_free (string); g_free (string);
@ -2702,10 +2704,9 @@ gst_base_text_overlay_text_chain (GstPad * pad, GstObject * parent,
/* Wait for the previous buffer to go away */ /* Wait for the previous buffer to go away */
while (overlay->text_buffer != NULL) { while (overlay->text_buffer != NULL) {
GST_DEBUG ("Pad %s:%s has a buffer queued, waiting", GST_DEBUG_OBJECT (pad, "Pad has a buffer queued, waiting");
GST_DEBUG_PAD_NAME (pad));
GST_BASE_TEXT_OVERLAY_WAIT (overlay); GST_BASE_TEXT_OVERLAY_WAIT (overlay);
GST_DEBUG ("Pad %s:%s resuming", GST_DEBUG_PAD_NAME (pad)); GST_DEBUG_OBJECT (pad, "Pad resuming");
if (overlay->text_flushing) { if (overlay->text_flushing) {
GST_BASE_TEXT_OVERLAY_UNLOCK (overlay); GST_BASE_TEXT_OVERLAY_UNLOCK (overlay);
ret = GST_FLOW_FLUSHING; ret = GST_FLOW_FLUSHING;
@ -2773,7 +2774,7 @@ gst_base_text_overlay_video_chain (GstPad * pad, GstObject * parent,
composition_meta = gst_buffer_get_video_overlay_composition_meta (buffer); composition_meta = gst_buffer_get_video_overlay_composition_meta (buffer);
if (composition_meta) { if (composition_meta) {
if (overlay->upstream_composition != composition_meta->overlay) { if (overlay->upstream_composition != composition_meta->overlay) {
GST_DEBUG ("GstVideoOverlayCompositionMeta found."); GST_DEBUG_OBJECT (overlay, "GstVideoOverlayCompositionMeta found.");
overlay->upstream_composition = composition_meta->overlay; overlay->upstream_composition = composition_meta->overlay;
overlay->need_render = TRUE; overlay->need_render = TRUE;
} }