summaryrefslogtreecommitdiffstats
path: root/ext/xvid
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-04-28 03:13:48 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-04-28 03:13:48 +0000
commit48892c24ed168126c3390d917421b0c17300dc23 (patch)
tree63db545171dee7f3a4263882f30b619c9e3264fd /ext/xvid
parent5838ad103d03dc0102b8140530e12e01fc5c4f76 (diff)
downloadgst-plugins-bad-48892c24ed168126c3390d917421b0c17300dc23.tar.gz
gst-plugins-bad-48892c24ed168126c3390d917421b0c17300dc23.tar.bz2
gst-plugins-bad-48892c24ed168126c3390d917421b0c17300dc23.zip
ext/divx/gstdivxdec.c: Remove comment that makes no sense.
Original commit message from CVS: * ext/divx/gstdivxdec.c: (plugin_init): Remove comment that makes no sense. * ext/mad/gstid3tag.c: (gst_id3_tag_set_property): Fix for obvious typo that resulted in warnings during gst-register. * ext/xvid/gstxviddec.c: (gst_xviddec_src_link), (gst_xviddec_sink_link): Fix caps negotiation a bit better. * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak): We call this 'codec_data', not 'esds'.
Diffstat (limited to 'ext/xvid')
-rw-r--r--ext/xvid/gstxviddec.c26
1 files changed, 5 insertions, 21 deletions
diff --git a/ext/xvid/gstxviddec.c b/ext/xvid/gstxviddec.c
index 49c9d6ef..1a639570 100644
--- a/ext/xvid/gstxviddec.c
+++ b/ext/xvid/gstxviddec.c
@@ -311,7 +311,6 @@ gst_xviddec_src_link (GstPad * pad, const GstCaps * vscaps)
if (xviddec->handle) {
gst_xviddec_unset (xviddec);
}
- g_print ("out: %s\n", gst_caps_to_string (vscaps));
xviddec->csp = gst_xvid_structure_to_csp (structure, xviddec->width,
&xviddec->stride, &xviddec->bpp);
@@ -329,6 +328,7 @@ gst_xviddec_sink_link (GstPad * pad, const GstCaps * vscaps)
{
GstXvidDec *xviddec = GST_XVIDDEC (gst_pad_get_parent (pad));
GstStructure *structure;
+ GstPadLinkReturn ret;
/* if there's something old around, remove it */
if (xviddec->handle) {
@@ -342,28 +342,12 @@ gst_xviddec_sink_link (GstPad * pad, const GstCaps * vscaps)
gst_structure_get_int (structure, "width", &xviddec->width);
gst_structure_get_int (structure, "height", &xviddec->height);
gst_structure_get_double (structure, "framerate", &xviddec->fps);
- g_print ("in: %dx%d\n", xviddec->width, xviddec->height);
- /* re-nego? or just await src nego? */
- if (GST_PAD_CAPS (xviddec->srcpad)) {
- GstPadLinkReturn ret;
- GstCaps *vscaps = gst_pad_get_allowed_caps (xviddec->srcpad), *new;
- gint i, csp;
-
- for (i = 0; i < gst_caps_get_size (vscaps); i++) {
- csp = gst_xvid_structure_to_csp (gst_caps_get_structure (vscaps, i),
- 0, NULL, NULL);
- new =
- gst_xvid_csp_to_caps (csp, xviddec->width, xviddec->height,
- xviddec->fps);
- ret = gst_pad_try_set_caps (xviddec->srcpad, new);
- if (ret != GST_PAD_LINK_REFUSED)
- return ret;
- }
- return GST_PAD_LINK_REFUSED;
- }
+ ret = gst_pad_renegotiate (xviddec->srcpad);
+ if (ret == GST_PAD_LINK_DELAYED)
+ ret = GST_PAD_LINK_OK;
- return GST_PAD_LINK_OK;
+ return ret;
}
static GstElementStateReturn