From: David Schleef Date: Mon, 12 Jan 2004 03:40:18 +0000 (+0000) Subject: Remove all usage of gst_pad_get_caps(), and replace it with gst_pad_get_allowed_caps... X-Git-Tag: BEFORE_INDENT~376 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=37d7aecdb6ae6fde29d30e463676729dac631604;p=platform%2Fupstream%2Fgst-plugins-base.git Remove all usage of gst_pad_get_caps(), and replace it with gst_pad_get_allowed_caps() or gst_pad_get_negotiated_cap(). Original commit message from CVS: Remove all usage of gst_pad_get_caps(), and replace it with gst_pad_get_allowed_caps() or gst_pad_get_negotiated_cap(). --- diff --git a/ChangeLog b/ChangeLog index 1be20b9..1457ec2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,23 @@ 2004-01-11 David Schleef + * ext/alsa/gstalsasrc.c: (gst_alsa_src_set_caps): + * ext/faac/gstfaac.c: (gst_faac_sinkconnect): + * ext/gdk_pixbuf/gstgdkanimation.c: + (gst_gdk_animation_iter_create_pixbuf): + * ext/gdk_pixbuf/gstgdkpixbuf.c: (gst_gdk_pixbuf_sink_link), + (gst_gdk_pixbuf_chain): + * ext/gdk_pixbuf/gstgdkpixbuf.h: + * ext/jack/gstjack.c: (gst_jack_change_state): + * ext/xvid/gstxviddec.c: (gst_xviddec_sink_link): + * gst-libs/gst/play/gstplay.c: (gst_play_get_sink_element): + * gst-libs/gst/play/play.c: (gst_play_get_sink_element): + * gst/videofilter/gstvideofilter.c: + (gst_videofilter_set_output_size): + Remove all usage of gst_pad_get_caps(), and replace it with + gst_pad_get_allowed_caps() or gst_pad_get_negotiated_cap(). + +2004-01-11 David Schleef + * configure.ac: * ext/Makefile.am: Fixes to make ext/libcaca compile. * ext/divx/gstdivxdec.c: diff --git a/ext/alsa/gstalsasrc.c b/ext/alsa/gstalsasrc.c index 373d107..4bd096a 100644 --- a/ext/alsa/gstalsasrc.c +++ b/ext/alsa/gstalsasrc.c @@ -239,7 +239,7 @@ gst_alsa_src_set_caps (GstAlsaSrc *src, gboolean aggressive) if (all_caps == NULL) return FALSE; /* now intersect this with all caps of the peers... */ for (i = 0; i < GST_ELEMENT (src)->numpads; i++) { - all_caps = gst_caps_intersect (all_caps, gst_pad_get_caps (this->pad[i])); + all_caps = gst_caps_intersect (all_caps, gst_pad_get_allowed_caps (this->pad[i])); if (all_caps == NULL) { GST_DEBUG ("No compatible caps found in alsasrc (%s)", GST_ELEMENT_NAME (this)); return FALSE; diff --git a/gst-libs/gst/play/gstplay.c b/gst-libs/gst/play/gstplay.c index 7c7ef84..bcc5c4d 100644 --- a/gst-libs/gst/play/gstplay.c +++ b/gst-libs/gst/play/gstplay.c @@ -928,7 +928,7 @@ gst_play_get_sink_element (GstPlay *play, gboolean has_video_cap = FALSE; gboolean has_audio_cap = FALSE; - caps = gst_pad_get_caps (GST_PAD (pads->data)); + caps = gst_pad_get_negotiated_caps (GST_PAD (pads->data)); structure = gst_caps_get_structure (caps, 0); if (strcmp (gst_structure_get_name (structure), diff --git a/gst-libs/gst/play/play.c b/gst-libs/gst/play/play.c index 7c7ef84..bcc5c4d 100644 --- a/gst-libs/gst/play/play.c +++ b/gst-libs/gst/play/play.c @@ -928,7 +928,7 @@ gst_play_get_sink_element (GstPlay *play, gboolean has_video_cap = FALSE; gboolean has_audio_cap = FALSE; - caps = gst_pad_get_caps (GST_PAD (pads->data)); + caps = gst_pad_get_negotiated_caps (GST_PAD (pads->data)); structure = gst_caps_get_structure (caps, 0); if (strcmp (gst_structure_get_name (structure), diff --git a/gst-libs/gst/play/play.old.c b/gst-libs/gst/play/play.old.c index 513a3e1..e8c2daf 100644 --- a/gst-libs/gst/play/play.old.c +++ b/gst-libs/gst/play/play.old.c @@ -911,7 +911,7 @@ gst_play_get_sink_element (GstPlay * play, const char *media_type; media_type = gst_structure_get_name (gst_caps_get_structure ( - gst_pad_get_caps (GST_PAD (pads->data)), 0)); + gst_pad_get_negotiated_caps (GST_PAD (pads->data)), 0)); if (strcmp (media_type, "audio/x-raw-int") == 0) { has_audio_cap = TRUE; diff --git a/gst-libs/gst/video/gstvideofilter.c b/gst-libs/gst/video/gstvideofilter.c index d26014d..7ef18e4 100644 --- a/gst-libs/gst/video/gstvideofilter.c +++ b/gst-libs/gst/video/gstvideofilter.c @@ -411,7 +411,7 @@ void gst_videofilter_set_output_size(GstVideofilter *videofilter, videofilter->to_buf_size = (videofilter->to_width * videofilter->to_height * videofilter->format->bpp)/8; - srccaps = gst_caps_copy(gst_pad_get_caps(videofilter->srcpad)); + srccaps = gst_caps_copy (gst_pad_get_negotiated_caps(videofilter->srcpad)); structure = gst_caps_get_structure (srccaps, 0); gst_structure_set (structure, "width", G_TYPE_INT, width,