diff options
author | Sebastian Dröge <slomo@circular-chaos.org> | 2008-10-28 16:25:00 +0000 |
---|---|---|
committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-10-28 16:25:00 +0000 |
commit | 70348d7327f041d485efc22128b8d03e136faca6 (patch) | |
tree | 235fd1ade497af4714d7417b3c47412c3d7b5b43 /gst/audioresample | |
parent | 08489d15ed665f274e6a046a69af520e218b6eda (diff) |
gst/audioresample/gstaudioresample.c: Fixate the rate to the nearest supported rate instead of the first one. Fixes b...
Original commit message from CVS:
* gst/audioresample/gstaudioresample.c:
(gst_audioresample_class_init), (audioresample_fixate_caps):
Fixate the rate to the nearest supported rate instead of
the first one. Fixes bug #549510.
Diffstat (limited to 'gst/audioresample')
-rw-r--r-- | gst/audioresample/gstaudioresample.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/gst/audioresample/gstaudioresample.c b/gst/audioresample/gstaudioresample.c index 9aa9bf771..ea1af7062 100644 --- a/gst/audioresample/gstaudioresample.c +++ b/gst/audioresample/gstaudioresample.c @@ -112,6 +112,8 @@ static gboolean audioresample_get_unit_size (GstBaseTransform * base, GstCaps * caps, guint * size); static GstCaps *audioresample_transform_caps (GstBaseTransform * base, GstPadDirection direction, GstCaps * caps); +static void audioresample_fixate_caps (GstBaseTransform * base, + GstPadDirection direction, GstCaps * caps, GstCaps * othercaps); static gboolean audioresample_transform_size (GstBaseTransform * trans, GstPadDirection direction, GstCaps * incaps, guint insize, GstCaps * outcaps, guint * outsize); @@ -172,6 +174,8 @@ gst_audioresample_class_init (GstAudioresampleClass * klass) GST_DEBUG_FUNCPTR (audioresample_get_unit_size); GST_BASE_TRANSFORM_CLASS (klass)->transform_caps = GST_DEBUG_FUNCPTR (audioresample_transform_caps); + GST_BASE_TRANSFORM_CLASS (klass)->fixate_caps = + GST_DEBUG_FUNCPTR (audioresample_fixate_caps); GST_BASE_TRANSFORM_CLASS (klass)->set_caps = GST_DEBUG_FUNCPTR (audioresample_set_caps); GST_BASE_TRANSFORM_CLASS (klass)->transform = @@ -272,6 +276,22 @@ audioresample_transform_caps (GstBaseTransform * base, return res; } +/* Fixate rate to the allowed rate that has the smallest difference */ +static void +audioresample_fixate_caps (GstBaseTransform * base, + GstPadDirection direction, GstCaps * caps, GstCaps * othercaps) +{ + GstStructure *s; + gint rate; + + s = gst_caps_get_structure (caps, 0); + if (!gst_structure_get_int (s, "rate", &rate)) + return; + + s = gst_caps_get_structure (othercaps, 0); + gst_structure_fixate_field_nearest_int (s, "rate", rate); +} + static gboolean resample_set_state_from_caps (ResampleState * state, GstCaps * incaps, GstCaps * outcaps, gint * channels, gint * inrate, gint * outrate) |