Commit 36205e7d authored by Stefan Kost's avatar Stefan Kost
Browse files

logging: some additional logging for tracing caps negotiation.

Demote one log that can come quite often. Remove one fixme that is done. Apply
gst-indent changes.
parent 01dfca40
...@@ -230,7 +230,8 @@ gst_proxy_pad_do_getcaps (GstPad * pad) ...@@ -230,7 +230,8 @@ gst_proxy_pad_do_getcaps (GstPad * pad)
res = gst_pad_get_caps (target); res = gst_pad_get_caps (target);
gst_object_unref (target); gst_object_unref (target);
GST_DEBUG_OBJECT (pad, "get caps of target: %" GST_PTR_FORMAT, res); GST_DEBUG_OBJECT (pad, "get caps of target %s:%s : %" GST_PTR_FORMAT,
GST_DEBUG_PAD_NAME (target), res);
/* filter against the template */ /* filter against the template */
if (templ && res) { if (templ && res) {
......
...@@ -2180,6 +2180,9 @@ gst_base_src_loop (GstPad * pad) ...@@ -2180,6 +2180,9 @@ gst_base_src_loop (GstPad * pad)
} else } else
position = -1; position = -1;
GST_LOG_OBJECT (src, "next_ts %" GST_TIME_FORMAT " size %ul",
GST_TIME_ARGS (position), blocksize);
ret = gst_base_src_get_range (src, position, blocksize, &buf); ret = gst_base_src_get_range (src, position, blocksize, &buf);
if (G_UNLIKELY (ret != GST_FLOW_OK)) { if (G_UNLIKELY (ret != GST_FLOW_OK)) {
GST_INFO_OBJECT (src, "pausing after gst_base_src_get_range() = %s", GST_INFO_OBJECT (src, "pausing after gst_base_src_get_range() = %s",
......
...@@ -201,13 +201,11 @@ gst_capsfilter_set_property (GObject * object, guint prop_id, ...@@ -201,13 +201,11 @@ gst_capsfilter_set_property (GObject * object, guint prop_id,
GST_OBJECT_UNLOCK (GST_BASE_TRANSFORM_SINK_PAD (object)); GST_OBJECT_UNLOCK (GST_BASE_TRANSFORM_SINK_PAD (object));
if (suggest) { if (suggest) {
GST_DEBUG_OBJECT (capsfilter, "suggest new caps %" GST_PTR_FORMAT,
suggest);
gst_base_transform_suggest (GST_BASE_TRANSFORM (object), suggest, 0); gst_base_transform_suggest (GST_BASE_TRANSFORM (object), suggest, 0);
gst_caps_unref (suggest); gst_caps_unref (suggest);
} }
/* FIXME: Need to activate these caps on the pads
* http://bugzilla.gnome.org/show_bug.cgi?id=361718
*/
break; break;
} }
default: default:
...@@ -256,6 +254,7 @@ gst_capsfilter_transform_caps (GstBaseTransform * base, ...@@ -256,6 +254,7 @@ gst_capsfilter_transform_caps (GstBaseTransform * base,
GST_OBJECT_UNLOCK (capsfilter); GST_OBJECT_UNLOCK (capsfilter);
ret = gst_caps_intersect (caps, filter_caps); ret = gst_caps_intersect (caps, filter_caps);
GST_DEBUG_OBJECT (capsfilter, "input: %" GST_PTR_FORMAT, caps);
GST_DEBUG_OBJECT (capsfilter, "filter: %" GST_PTR_FORMAT, filter_caps); GST_DEBUG_OBJECT (capsfilter, "filter: %" GST_PTR_FORMAT, filter_caps);
GST_DEBUG_OBJECT (capsfilter, "intersect: %" GST_PTR_FORMAT, ret); GST_DEBUG_OBJECT (capsfilter, "intersect: %" GST_PTR_FORMAT, ret);
...@@ -301,8 +300,7 @@ gst_capsfilter_prepare_buf (GstBaseTransform * trans, GstBuffer * input, ...@@ -301,8 +300,7 @@ gst_capsfilter_prepare_buf (GstBaseTransform * trans, GstBuffer * input,
if (GST_BUFFER_CAPS (input) != NULL) { if (GST_BUFFER_CAPS (input) != NULL) {
/* Output buffer already has caps */ /* Output buffer already has caps */
GST_DEBUG_OBJECT (trans, GST_LOG_OBJECT (trans, "Input buffer already has caps (implicitely fixed)");
"Input buffer already has caps (implicitely fixed)");
/* FIXME : Move this behaviour to basetransform. The given caps are the ones /* FIXME : Move this behaviour to basetransform. The given caps are the ones
* of the source pad, therefore our outgoing buffers should always have * of the source pad, therefore our outgoing buffers should always have
* those caps. */ * those caps. */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment