audioresample: Update for negotiation related API changes

This commit is contained in:
Sebastian Dröge 2011-05-16 11:37:25 +02:00
parent 616181901e
commit 2b9845e60f

View File

@ -128,7 +128,7 @@ static void gst_audio_resample_get_property (GObject * object,
static gboolean gst_audio_resample_get_unit_size (GstBaseTransform * base, static gboolean gst_audio_resample_get_unit_size (GstBaseTransform * base,
GstCaps * caps, gsize * size); GstCaps * caps, gsize * size);
static GstCaps *gst_audio_resample_transform_caps (GstBaseTransform * base, static GstCaps *gst_audio_resample_transform_caps (GstBaseTransform * base,
GstPadDirection direction, GstCaps * caps); GstPadDirection direction, GstCaps * caps, GstCaps * filter);
static void gst_audio_resample_fixate_caps (GstBaseTransform * base, static void gst_audio_resample_fixate_caps (GstBaseTransform * base,
GstPadDirection direction, GstCaps * caps, GstCaps * othercaps); GstPadDirection direction, GstCaps * caps, GstCaps * othercaps);
static gboolean gst_audio_resample_transform_size (GstBaseTransform * trans, static gboolean gst_audio_resample_transform_size (GstBaseTransform * trans,
@ -283,7 +283,7 @@ gst_audio_resample_get_unit_size (GstBaseTransform * base, GstCaps * caps,
static GstCaps * static GstCaps *
gst_audio_resample_transform_caps (GstBaseTransform * base, gst_audio_resample_transform_caps (GstBaseTransform * base,
GstPadDirection direction, GstCaps * caps) GstPadDirection direction, GstCaps * caps, GstCaps * filter)
{ {
const GValue *val; const GValue *val;
GstStructure *s; GstStructure *s;
@ -314,6 +314,15 @@ gst_audio_resample_transform_caps (GstBaseTransform * base,
gst_caps_append_structure (res, s); gst_caps_append_structure (res, s);
} }
if (filter) {
GstCaps *intersection;
intersection =
gst_caps_intersect_full (filter, res, GST_CAPS_INTERSECT_FIRST);
gst_caps_unref (res);
res = intersection;
}
return res; return res;
} }