mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

videomixer: improve readability of debugging statements.

Browse source
This commit is contained in:
Edward Hervey 2009-06-29 19:23:41 +02:00
parent a905ef233e
commit 3ebf5e9a2a
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst/videomixer/videomixer.c
View file

@ -305,7 +305,7 @@ gst_videomixer_pad_sink_setcaps (GstPad * pad, GstCaps * vscaps)
gint in_width, in_height; gint in_width, in_height;
gboolean ret = FALSE; gboolean ret = FALSE;
const GValue *framerate; const GValue *framerate;
GST_INFO_OBJECT (pad, "setcaps:\n%" GST_PTR_FORMAT, vscaps); GST_INFO_OBJECT (pad, "%" GST_PTR_FORMAT, vscaps);
mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad)); mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad));
mixpad = GST_VIDEO_MIXER_PAD (pad); mixpad = GST_VIDEO_MIXER_PAD (pad);
@ -351,13 +351,13 @@ gst_videomixer_pad_sink_acceptcaps (GstPad * pad, GstCaps * vscaps)
GstVideoMixer *mix; GstVideoMixer *mix;
GstCaps *acceptedCaps; GstCaps *acceptedCaps;
mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad)); mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad));
GST_DEBUG_OBJECT (pad, "TRACE: \n%" GST_PTR_FORMAT, vscaps); GST_DEBUG_OBJECT (pad, "%" GST_PTR_FORMAT, vscaps);
GST_VIDEO_MIXER_STATE_LOCK (mix); GST_VIDEO_MIXER_STATE_LOCK (mix);
if (mix->master) { if (mix->master) {
acceptedCaps = gst_pad_get_fixed_caps_func (GST_PAD (mix->master)); acceptedCaps = gst_pad_get_fixed_caps_func (GST_PAD (mix->master));
acceptedCaps = gst_caps_make_writable (acceptedCaps); acceptedCaps = gst_caps_make_writable (acceptedCaps);
GST_LOG ("\nmaster's caps\n%" GST_PTR_FORMAT "\n", acceptedCaps); GST_LOG ("master's caps %" GST_PTR_FORMAT, acceptedCaps);
if (GST_CAPS_IS_SIMPLE (acceptedCaps)) { if (GST_CAPS_IS_SIMPLE (acceptedCaps)) {
int templCapsSize = int templCapsSize =
gst_caps_get_size (gst_pad_get_pad_template_caps (pad)); gst_caps_get_size (gst_pad_get_pad_template_caps (pad));
@ -379,8 +379,8 @@ gst_videomixer_pad_sink_acceptcaps (GstPad * pad, GstCaps * vscaps)
} else { } else {
acceptedCaps = gst_pad_get_fixed_caps_func (pad); acceptedCaps = gst_pad_get_fixed_caps_func (pad);
} }
GST_INFO ("\n\n%" GST_PTR_FORMAT "\n\n", vscaps); GST_INFO ("vscaps: %" GST_PTR_FORMAT, vscaps);
GST_INFO ("\n\n*********\n%" GST_PTR_FORMAT "\n\n", acceptedCaps); GST_INFO ("acceptedCaps: %" GST_PTR_FORMAT, acceptedCaps);
ret = gst_caps_is_always_compatible (vscaps, acceptedCaps); ret = gst_caps_is_always_compatible (vscaps, acceptedCaps);
gst_caps_unref (acceptedCaps); gst_caps_unref (acceptedCaps);
@ -885,7 +885,6 @@ gst_videomixer_getcaps (GstPad * pad)
GstCaps *caps; GstCaps *caps;
GstStructure *structure; GstStructure *structure;
int numCaps; int numCaps;
GST_LOG_OBJECT (pad, "TRACE");
mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad)); mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad));
@ -924,7 +923,7 @@ gst_videomixer_setcaps (GstPad * pad, GstCaps * caps)
GstVideoFormat fmt; GstVideoFormat fmt;
gboolean ret = FALSE; gboolean ret = FALSE;
GST_INFO_OBJECT (mixer, "set src caps: \n%" GST_PTR_FORMAT, caps); GST_INFO_OBJECT (mixer, "set src caps: %" GST_PTR_FORMAT, caps);
mixer->blend = NULL; mixer->blend = NULL;
mixer->fill_checker = NULL; mixer->fill_checker = NULL;
@ -983,8 +982,8 @@ gst_videomixer_request_new_pad (GstElement * element,
g_return_val_if_fail (templ != NULL, NULL); g_return_val_if_fail (templ != NULL, NULL);
if (templ->direction != GST_PAD_SINK) { if (G_UNLIKELY (templ->direction != GST_PAD_SINK)) {
g_warning ("videomixer: request pad that is not a SINK pad\n"); g_warning ("videomixer: request pad that is not a SINK pad");
return NULL; return NULL;
} }
@ -1039,7 +1038,7 @@ gst_videomixer_request_new_pad (GstElement * element,
mix->numpads++; mix->numpads++;
GST_VIDEO_MIXER_STATE_UNLOCK (mix); GST_VIDEO_MIXER_STATE_UNLOCK (mix);
} else { } else {
g_warning ("videomixer: this is not our template!\n"); g_warning ("videomixer: this is not our template!");
return NULL; return NULL;
} }
@ -1258,7 +1257,8 @@ gst_videomixer_update_queues (GstVideoMixer * mix)
} else { } else {
interval = GST_SECOND * mix->fps_d / mix->fps_n; interval = GST_SECOND * mix->fps_d / mix->fps_n;
} }
GST_LOG_OBJECT (mix, "set interval to %" G_GUINT64_FORMAT, interval); GST_LOG_OBJECT (mix, "set interval to %" G_GUINT64_FORMAT " nanoseconds",
interval);
} }
walk = mix->sinkpads; walk = mix->sinkpads;