mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-27 14:31:01 +00:00
audioconvert: Update for negotiation related API changes
This commit is contained in:
parent
48654cdacf
commit
c020add91e
1 changed files with 13 additions and 2 deletions
|
@ -78,7 +78,7 @@ static void gst_audio_convert_dispose (GObject * obj);
|
||||||
static gboolean gst_audio_convert_get_unit_size (GstBaseTransform * base,
|
static gboolean gst_audio_convert_get_unit_size (GstBaseTransform * base,
|
||||||
GstCaps * caps, gsize * size);
|
GstCaps * caps, gsize * size);
|
||||||
static GstCaps *gst_audio_convert_transform_caps (GstBaseTransform * base,
|
static GstCaps *gst_audio_convert_transform_caps (GstBaseTransform * base,
|
||||||
GstPadDirection direction, GstCaps * caps);
|
GstPadDirection direction, GstCaps * caps, GstCaps * filter);
|
||||||
static void gst_audio_convert_fixate_caps (GstBaseTransform * base,
|
static void gst_audio_convert_fixate_caps (GstBaseTransform * base,
|
||||||
GstPadDirection direction, GstCaps * caps, GstCaps * othercaps);
|
GstPadDirection direction, GstCaps * caps, GstCaps * othercaps);
|
||||||
static gboolean gst_audio_convert_set_caps (GstBaseTransform * base,
|
static gboolean gst_audio_convert_set_caps (GstBaseTransform * base,
|
||||||
|
@ -557,7 +557,7 @@ structure_has_fixed_channel_positions (GstStructure * s,
|
||||||
*/
|
*/
|
||||||
static GstCaps *
|
static GstCaps *
|
||||||
gst_audio_convert_transform_caps (GstBaseTransform * base,
|
gst_audio_convert_transform_caps (GstBaseTransform * base,
|
||||||
GstPadDirection direction, GstCaps * caps)
|
GstPadDirection direction, GstCaps * caps, GstCaps * filter)
|
||||||
{
|
{
|
||||||
GstCaps *ret;
|
GstCaps *ret;
|
||||||
GstStructure *s, *structure;
|
GstStructure *s, *structure;
|
||||||
|
@ -698,6 +698,17 @@ gst_audio_convert_transform_caps (GstBaseTransform * base,
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (base, "Caps transformed to %" GST_PTR_FORMAT, ret);
|
GST_DEBUG_OBJECT (base, "Caps transformed to %" GST_PTR_FORMAT, ret);
|
||||||
|
|
||||||
|
if (filter) {
|
||||||
|
GstCaps *intersection;
|
||||||
|
|
||||||
|
GST_DEBUG_OBJECT (base, "Using filter caps %" GST_PTR_FORMAT, filter);
|
||||||
|
intersection =
|
||||||
|
gst_caps_intersect_full (filter, ret, GST_CAPS_INTERSECT_FIRST);
|
||||||
|
gst_caps_unref (ret);
|
||||||
|
ret = intersection;
|
||||||
|
GST_DEBUG_OBJECT (base, "Intersection %" GST_PTR_FORMAT, ret);
|
||||||
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue