mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-12 03:16:33 +00:00
Updated some debug statements. Added specific debug for int props.
Original commit message from CVS: Updated some debug statements. Added specific debug for int props.
This commit is contained in:
parent
be22b09614
commit
57c7dc7c6a
3 changed files with 13 additions and 6 deletions
|
@ -516,13 +516,13 @@ gst_caps_check_compatibility (GstCaps *fromcaps, GstCaps *tocaps)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
GST_DEBUG (GST_CAT_CAPS,"gstcaps: no src but destination caps\n");
|
GST_DEBUG (GST_CAT_CAPS,"no source but destination caps\n");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (tocaps == NULL) {
|
if (tocaps == NULL) {
|
||||||
GST_DEBUG (GST_CAT_CAPS,"src caps and no dest caps\n");
|
GST_DEBUG (GST_CAT_CAPS,"source caps and no destination caps\n");
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
12
gst/gstpad.c
12
gst/gstpad.c
|
@ -615,7 +615,7 @@ gst_pad_connect (GstPad *srcpad,
|
||||||
g_return_val_if_fail(sinkpad != NULL, FALSE);
|
g_return_val_if_fail(sinkpad != NULL, FALSE);
|
||||||
g_return_val_if_fail(GST_IS_PAD(sinkpad), FALSE);
|
g_return_val_if_fail(GST_IS_PAD(sinkpad), FALSE);
|
||||||
|
|
||||||
GST_INFO (GST_CAT_ELEMENT_PADS, "connecting %s:%s and %s:%s",
|
GST_INFO (GST_CAT_PADS, "connecting %s:%s and %s:%s",
|
||||||
GST_DEBUG_PAD_NAME(srcpad), GST_DEBUG_PAD_NAME(sinkpad));
|
GST_DEBUG_PAD_NAME(srcpad), GST_DEBUG_PAD_NAME(sinkpad));
|
||||||
|
|
||||||
// now we need to deal with the real/ghost stuff
|
// now we need to deal with the real/ghost stuff
|
||||||
|
@ -643,16 +643,20 @@ gst_pad_connect (GstPad *srcpad,
|
||||||
GST_RPAD_PEER(realsink) = realsrc;
|
GST_RPAD_PEER(realsink) = realsrc;
|
||||||
|
|
||||||
if (GST_PAD_CAPS (srcpad)) {
|
if (GST_PAD_CAPS (srcpad)) {
|
||||||
|
GST_DEBUG(GST_CAT_PADS, "renegotiation from srcpad\n");
|
||||||
negotiated = gst_pad_renegotiate (srcpad);
|
negotiated = gst_pad_renegotiate (srcpad);
|
||||||
}
|
}
|
||||||
else if (GST_PAD_CAPS (sinkpad)) {
|
else if (GST_PAD_CAPS (sinkpad)) {
|
||||||
|
GST_DEBUG(GST_CAT_PADS, "renegotiation from sinkpad\n");
|
||||||
negotiated = gst_pad_renegotiate (sinkpad);
|
negotiated = gst_pad_renegotiate (sinkpad);
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
|
GST_DEBUG(GST_CAT_PADS, "not renegotiating connection\n");
|
||||||
negotiated = TRUE;
|
negotiated = TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
if (!negotiated) {
|
if (!negotiated) {
|
||||||
GST_INFO(GST_CAT_ELEMENT_PADS, "pads %s:%s and %s:%s failed to negotiate, disconnecting",
|
GST_INFO(GST_CAT_PADS, "pads %s:%s and %s:%s failed to negotiate, disconnecting",
|
||||||
GST_DEBUG_PAD_NAME(srcpad), GST_DEBUG_PAD_NAME(sinkpad));
|
GST_DEBUG_PAD_NAME(srcpad), GST_DEBUG_PAD_NAME(sinkpad));
|
||||||
gst_pad_disconnect (GST_PAD (realsrc), GST_PAD (realsink));
|
gst_pad_disconnect (GST_PAD (realsrc), GST_PAD (realsink));
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
@ -668,7 +672,7 @@ gst_pad_connect (GstPad *srcpad,
|
||||||
else if (realsink->sched)
|
else if (realsink->sched)
|
||||||
GST_SCHEDULE_PAD_CONNECT (realsink->sched, (GstPad *)realsrc, (GstPad *)realsink);
|
GST_SCHEDULE_PAD_CONNECT (realsink->sched, (GstPad *)realsrc, (GstPad *)realsink);
|
||||||
|
|
||||||
GST_INFO (GST_CAT_ELEMENT_PADS, "connected %s:%s and %s:%s",
|
GST_INFO (GST_CAT_PADS, "connected %s:%s and %s:%s",
|
||||||
GST_DEBUG_PAD_NAME(srcpad), GST_DEBUG_PAD_NAME(sinkpad));
|
GST_DEBUG_PAD_NAME(srcpad), GST_DEBUG_PAD_NAME(sinkpad));
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -642,10 +642,13 @@ gst_props_entry_check_compatibility (GstPropsEntry *entry1, GstPropsEntry *entry
|
||||||
switch (entry2->propstype) {
|
switch (entry2->propstype) {
|
||||||
// b <---> a - d
|
// b <---> a - d
|
||||||
case GST_PROPS_INT_RANGE_ID:
|
case GST_PROPS_INT_RANGE_ID:
|
||||||
|
GST_DEBUG(GST_CAT_PROPERTIES,"%d <= %d <= %d ?\n",entry2->data.int_range_data.min,
|
||||||
|
entry1->data.int_data,entry2->data.int_range_data.max);
|
||||||
return (entry2->data.int_range_data.min <= entry1->data.int_data &&
|
return (entry2->data.int_range_data.min <= entry1->data.int_data &&
|
||||||
entry2->data.int_range_data.max >= entry1->data.int_data);
|
entry2->data.int_range_data.max >= entry1->data.int_data);
|
||||||
// b <---> a
|
// b <---> a
|
||||||
case GST_PROPS_INT_ID:
|
case GST_PROPS_INT_ID:
|
||||||
|
GST_DEBUG(GST_CAT_PROPERTIES,"%d == %d ?\n",entry1->data.int_data,entry2->data.int_data);
|
||||||
return (entry2->data.int_data == entry1->data.int_data);
|
return (entry2->data.int_data == entry1->data.int_data);
|
||||||
// b <---> a,b,c
|
// b <---> a,b,c
|
||||||
case GST_PROPS_LIST_ID:
|
case GST_PROPS_LIST_ID:
|
||||||
|
|
Loading…
Reference in a new issue