mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 12:41:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

vorbis: Update for negotiation related API changes

Browse source
This commit is contained in:
Sebastian Dröge 2011-05-16 15:25:34 +02:00
parent c276eec54e
commit ed89c9d38f
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ext/vorbis/gstvorbisenc.c
View file

@ -269,14 +269,18 @@ gst_vorbis_enc_generate_sink_caps (void)
} }
static GstCaps * static GstCaps *
gst_vorbis_enc_sink_getcaps (GstPad * pad) gst_vorbis_enc_sink_getcaps (GstPad * pad, GstCaps * filter)
{ {
GstVorbisEnc *vorbisenc = GST_VORBISENC (GST_PAD_PARENT (pad)); GstVorbisEnc *vorbisenc = GST_VORBISENC (GST_PAD_PARENT (pad));
if (vorbisenc->sinkcaps == NULL) if (vorbisenc->sinkcaps == NULL)
vorbisenc->sinkcaps = gst_vorbis_enc_generate_sink_caps (); vorbisenc->sinkcaps = gst_vorbis_enc_generate_sink_caps ();
return gst_caps_ref (vorbisenc->sinkcaps); if (filter)
return gst_caps_intersect_full (filter, vorbisenc->sinkcaps,
GST_CAPS_INTERSECT_FIRST);
else
return gst_caps_ref (vorbisenc->sinkcaps);
} }
static gboolean static gboolean

2
ext/vorbis/gstvorbisparse.c
View file

@ -188,7 +188,7 @@ vorbis_parse_push_headers (GstVorbisParse * parse)
gsize size; gsize size;
/* get the headers into the caps, passing them to vorbis as we go */ /* get the headers into the caps, passing them to vorbis as we go */
caps = gst_caps_make_writable (gst_pad_get_caps (parse->srcpad)); caps = gst_caps_make_writable (gst_pad_get_caps (parse->srcpad, NULL));
vorbis_parse_set_header_on_caps (parse, caps); vorbis_parse_set_header_on_caps (parse, caps);
GST_DEBUG_OBJECT (parse, "here are the caps: %" GST_PTR_FORMAT, caps); GST_DEBUG_OBJECT (parse, "here are the caps: %" GST_PTR_FORMAT, caps);
gst_pad_set_caps (parse->srcpad, caps); gst_pad_set_caps (parse->srcpad, caps);