mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-03 16:09:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

audio-resampler: improve phase calculation

Browse source 
Also calculate the GCD with the current phase so that we can accurately
represent the current phase with the new resample rates.
This commit is contained in:
Wim Taymans 2016-02-01 17:18:32 +01:00
parent bbdb447b2b
commit b0b3350717
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gst-libs/gst/audio/audio-resampler.c
View file

@ -984,7 +984,7 @@ gboolean
gst_audio_resampler_update (GstAudioResampler * resampler, gst_audio_resampler_update (GstAudioResampler * resampler,
guint in_rate, guint out_rate, GstStructure * options) guint in_rate, guint out_rate, GstStructure * options)
{ {
gint gcd; gint gcd, samp_phase;
gint old_n_taps; gint old_n_taps;
g_return_val_if_fail (resampler != NULL, FALSE); g_return_val_if_fail (resampler != NULL, FALSE);
@ -994,18 +994,25 @@ gst_audio_resampler_update (GstAudioResampler * resampler,
if (out_rate == 0) if (out_rate == 0)
out_rate = resampler->out_rate; out_rate = resampler->out_rate;
gcd = gst_util_greatest_common_divisor (in_rate, out_rate);
in_rate /= gcd;
out_rate /= gcd;
if (resampler->out_rate > 0) if (resampler->out_rate > 0)
resampler->samp_phase = samp_phase =
(resampler->samp_phase * out_rate) / resampler->out_rate; gst_util_uint64_scale_int (resampler->samp_phase, out_rate,
resampler->out_rate);
else else
resampler->samp_phase = 0; samp_phase = 0;
resampler->in_rate = in_rate; gcd = gst_util_greatest_common_divisor (in_rate, out_rate);
resampler->out_rate = out_rate; /* make sure we have exactly the same phase in the new sample rate.
* FIXME we might want to relax this and get a phase that is within
* a certain error */
gcd = gst_util_greatest_common_divisor (samp_phase, gcd);
GST_INFO ("phase %d, out_rate %d, in_rate %d, gcd %d", samp_phase, out_rate,
in_rate, gcd);
resampler->samp_phase = samp_phase / gcd;
resampler->in_rate = in_rate / gcd;
resampler->out_rate = out_rate / gcd;
if (options) { if (options) {
if (resampler->options) if (resampler->options)
gst_structure_free (resampler->options); gst_structure_free (resampler->options);
@ -1017,8 +1024,8 @@ gst_audio_resampler_update (GstAudioResampler * resampler,
resampler_calculate_taps (resampler); resampler_calculate_taps (resampler);
resampler_dump (resampler); resampler_dump (resampler);
GST_DEBUG ("rate %u->%u, taps %d->%d", in_rate, out_rate, old_n_taps, GST_DEBUG ("rate %u->%u, taps %d->%d", resampler->in_rate,
resampler->n_taps); resampler->out_rate, old_n_taps, resampler->n_taps);
if (old_n_taps > 0) { if (old_n_taps > 0) {
gpointer *sbuf; gpointer *sbuf;