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

gst/base/gstbasesrc.c: some debug changes

Browse source 
Original commit message from CVS:

* gst/base/gstbasesrc.c: (gst_base_src_default_negotiate):
some debug changes
* gst/gstmessage.h:
typo fixes
This commit is contained in:
Thomas Vander Stichele 2005-11-16 11:06:07 +00:00
parent 74546e0323
commit f22d0bce47
4 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2005-11-16 Thomas Vander Stichele <thomas at apestaart dot org>
* gst/base/gstbasesrc.c: (gst_base_src_default_negotiate):
some debug changes
* gst/gstmessage.h:
typo fixes
2005-11-16 Thomas Vander Stichele <thomas at apestaart dot org> 2005-11-16 Thomas Vander Stichele <thomas at apestaart dot org>
* gst/base/gstbasesrc.c: (gst_base_src_init): * gst/base/gstbasesrc.c: (gst_base_src_init):

10
gst/base/gstbasesrc.c
View file

@ -1174,20 +1174,20 @@ gst_base_src_default_negotiate (GstBaseSrc * basesrc)
/* first see what is possible on our source pad */ /* first see what is possible on our source pad */
thiscaps = gst_pad_get_caps (GST_BASE_SRC_PAD (basesrc)); thiscaps = gst_pad_get_caps (GST_BASE_SRC_PAD (basesrc));
GST_DEBUG ("caps of src: %" GST_PTR_FORMAT, thiscaps); GST_DEBUG_OBJECT (basesrc, "caps of src: %" GST_PTR_FORMAT, thiscaps);
/* nothing or anything is allowed, we're done */ /* nothing or anything is allowed, we're done */
if (thiscaps == NULL || gst_caps_is_any (thiscaps)) if (thiscaps == NULL || gst_caps_is_any (thiscaps))
goto no_nego_needed; goto no_nego_needed;
/* get the peer caps */ /* get the peer caps */
peercaps = gst_pad_peer_get_caps (GST_BASE_SRC_PAD (basesrc)); peercaps = gst_pad_peer_get_caps (GST_BASE_SRC_PAD (basesrc));
GST_DEBUG ("caps of peer: %" GST_PTR_FORMAT, peercaps); GST_DEBUG_OBJECT (basesrc, "caps of peer: %" GST_PTR_FORMAT, peercaps);
if (peercaps) { if (peercaps) {
GstCaps *icaps; GstCaps *icaps;
/* get intersection */ /* get intersection */
icaps = gst_caps_intersect (thiscaps, peercaps); icaps = gst_caps_intersect (thiscaps, peercaps);
GST_DEBUG ("intersect: %" GST_PTR_FORMAT, icaps); GST_DEBUG_OBJECT (basesrc, "intersect: %" GST_PTR_FORMAT, icaps);
gst_caps_unref (thiscaps); gst_caps_unref (thiscaps);
gst_caps_unref (peercaps); gst_caps_unref (peercaps);
if (icaps) { if (icaps) {
@ -1205,7 +1205,7 @@ gst_base_src_default_negotiate (GstBaseSrc * basesrc)
/* now fixate */ /* now fixate */
gst_pad_fixate_caps (GST_BASE_SRC_PAD (basesrc), caps); gst_pad_fixate_caps (GST_BASE_SRC_PAD (basesrc), caps);
GST_DEBUG ("fixated to: %" GST_PTR_FORMAT, caps); GST_DEBUG_OBJECT (basesrc, "fixated to: %" GST_PTR_FORMAT, caps);
if (gst_caps_is_any (caps)) { if (gst_caps_is_any (caps)) {
/* hmm, still anything, so element can do anything and /* hmm, still anything, so element can do anything and
@ -1223,7 +1223,7 @@ gst_base_src_default_negotiate (GstBaseSrc * basesrc)
no_nego_needed: no_nego_needed:
{ {
GST_DEBUG ("no negotiation needed"); GST_DEBUG_OBJECT (basesrc, "no negotiation needed");
if (thiscaps) if (thiscaps)
gst_caps_unref (thiscaps); gst_caps_unref (thiscaps);
return TRUE; return TRUE;

4
gst/gstmessage.h
View file

@ -187,7 +187,7 @@ GQuark gst_message_type_to_quark (GstMessageType type);
* gst_message_ref: * gst_message_ref:
* @msg: the message to ref * @msg: the message to ref
* *
* Convinience macro to increase the reference count of the message. Returns the * Convenience macro to increase the reference count of the message. Returns the
* reffed message. * reffed message.
*/ */
#define gst_message_ref(msg) GST_MESSAGE (gst_mini_object_ref (GST_MINI_OBJECT (msg))) #define gst_message_ref(msg) GST_MESSAGE (gst_mini_object_ref (GST_MINI_OBJECT (msg)))
@ -195,7 +195,7 @@ GQuark gst_message_type_to_quark (GstMessageType type);
* gst_message_unref: * gst_message_unref:
* @msg: the message to unref * @msg: the message to unref
* *
* Convinience macro to decrease the reference count of the message, possibly freeing * Convenience macro to decrease the reference count of the message, possibly freeing
* the it. * the it.
*/ */
#define gst_message_unref(msg) gst_mini_object_unref (GST_MINI_OBJECT (msg)) #define gst_message_unref(msg) gst_mini_object_unref (GST_MINI_OBJECT (msg))

10
libs/gst/base/gstbasesrc.c
View file

@ -1174,20 +1174,20 @@ gst_base_src_default_negotiate (GstBaseSrc * basesrc)
/* first see what is possible on our source pad */ /* first see what is possible on our source pad */
thiscaps = gst_pad_get_caps (GST_BASE_SRC_PAD (basesrc)); thiscaps = gst_pad_get_caps (GST_BASE_SRC_PAD (basesrc));
GST_DEBUG ("caps of src: %" GST_PTR_FORMAT, thiscaps); GST_DEBUG_OBJECT (basesrc, "caps of src: %" GST_PTR_FORMAT, thiscaps);
/* nothing or anything is allowed, we're done */ /* nothing or anything is allowed, we're done */
if (thiscaps == NULL || gst_caps_is_any (thiscaps)) if (thiscaps == NULL || gst_caps_is_any (thiscaps))
goto no_nego_needed; goto no_nego_needed;
/* get the peer caps */ /* get the peer caps */
peercaps = gst_pad_peer_get_caps (GST_BASE_SRC_PAD (basesrc)); peercaps = gst_pad_peer_get_caps (GST_BASE_SRC_PAD (basesrc));
GST_DEBUG ("caps of peer: %" GST_PTR_FORMAT, peercaps); GST_DEBUG_OBJECT (basesrc, "caps of peer: %" GST_PTR_FORMAT, peercaps);
if (peercaps) { if (peercaps) {
GstCaps *icaps; GstCaps *icaps;
/* get intersection */ /* get intersection */
icaps = gst_caps_intersect (thiscaps, peercaps); icaps = gst_caps_intersect (thiscaps, peercaps);
GST_DEBUG ("intersect: %" GST_PTR_FORMAT, icaps); GST_DEBUG_OBJECT (basesrc, "intersect: %" GST_PTR_FORMAT, icaps);
gst_caps_unref (thiscaps); gst_caps_unref (thiscaps);
gst_caps_unref (peercaps); gst_caps_unref (peercaps);
if (icaps) { if (icaps) {
@ -1205,7 +1205,7 @@ gst_base_src_default_negotiate (GstBaseSrc * basesrc)
/* now fixate */ /* now fixate */
gst_pad_fixate_caps (GST_BASE_SRC_PAD (basesrc), caps); gst_pad_fixate_caps (GST_BASE_SRC_PAD (basesrc), caps);
GST_DEBUG ("fixated to: %" GST_PTR_FORMAT, caps); GST_DEBUG_OBJECT (basesrc, "fixated to: %" GST_PTR_FORMAT, caps);
if (gst_caps_is_any (caps)) { if (gst_caps_is_any (caps)) {
/* hmm, still anything, so element can do anything and /* hmm, still anything, so element can do anything and
@ -1223,7 +1223,7 @@ gst_base_src_default_negotiate (GstBaseSrc * basesrc)
no_nego_needed: no_nego_needed:
{ {
GST_DEBUG ("no negotiation needed"); GST_DEBUG_OBJECT (basesrc, "no negotiation needed");
if (thiscaps) if (thiscaps)
gst_caps_unref (thiscaps); gst_caps_unref (thiscaps);
return TRUE; return TRUE;