mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-08 13:18:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

audio-resampler: fix guint -> gint

Browse source
This commit is contained in:
Wim Taymans 2016-02-02 12:06:44 +01:00
parent 45574ba4f4
commit 6397db74cd
2 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,7 +56,7 @@ struct _GstAudioResampler
GstAudioResamplerFlags flags; GstAudioResamplerFlags flags;
GstAudioFormat format; GstAudioFormat format;
GstStructure *options; GstStructure *options;
guint channels; gint channels;
gint in_rate; gint in_rate;
gint out_rate; gint out_rate;
gint bps; gint bps;
@ -807,11 +807,11 @@ resampler_dump (GstAudioResampler * resampler)
*/ */
void void
gst_audio_resampler_options_set_quality (GstAudioResamplerMethod method, gst_audio_resampler_options_set_quality (GstAudioResamplerMethod method,
guint quality, guint in_rate, guint out_rate, GstStructure * options) guint quality, gint in_rate, gint out_rate, GstStructure * options)
{ {
g_return_if_fail (options != NULL); g_return_if_fail (options != NULL);
g_return_if_fail (quality < 11); g_return_if_fail (quality <= GST_AUDIO_RESAMPLER_QUALITY_MAX);
g_return_if_fail (in_rate != 0 && out_rate != 0); g_return_if_fail (in_rate > 0 && out_rate > 0);
switch (method) { switch (method) {
case GST_AUDIO_RESAMPLER_METHOD_NEAREST: case GST_AUDIO_RESAMPLER_METHOD_NEAREST:
@ -871,14 +871,15 @@ gst_audio_resampler_options_set_quality (GstAudioResamplerMethod method,
GstAudioResampler * GstAudioResampler *
gst_audio_resampler_new (GstAudioResamplerMethod method, gst_audio_resampler_new (GstAudioResamplerMethod method,
GstAudioResamplerFlags flags, GstAudioResamplerFlags flags,
GstAudioFormat format, guint channels, GstAudioFormat format, gint channels,
guint in_rate, guint out_rate, GstStructure * options) gint in_rate, gint out_rate, GstStructure * options)
{ {
GstAudioResampler *resampler; GstAudioResampler *resampler;
const GstAudioFormatInfo *info; const GstAudioFormatInfo *info;
g_return_val_if_fail (in_rate != 0, FALSE); g_return_val_if_fail (channels > 0, FALSE);
g_return_val_if_fail (out_rate != 0, FALSE); g_return_val_if_fail (in_rate > 0, FALSE);
g_return_val_if_fail (out_rate > 0, FALSE);
audio_resampler_init (); audio_resampler_init ();
@ -982,15 +983,15 @@ gst_audio_resampler_reset (GstAudioResampler * resampler)
*/ */
gboolean gboolean
gst_audio_resampler_update (GstAudioResampler * resampler, gst_audio_resampler_update (GstAudioResampler * resampler,
guint in_rate, guint out_rate, GstStructure * options) gint in_rate, gint out_rate, GstStructure * options)
{ {
gint gcd, samp_phase, old_n_taps; gint gcd, samp_phase, old_n_taps;
g_return_val_if_fail (resampler != NULL, FALSE); g_return_val_if_fail (resampler != NULL, FALSE);
if (in_rate == 0) if (in_rate <= 0)
in_rate = resampler->in_rate; in_rate = resampler->in_rate;
if (out_rate == 0) if (out_rate <= 0)
out_rate = resampler->out_rate; out_rate = resampler->out_rate;
if (resampler->out_rate > 0) if (resampler->out_rate > 0)
@ -1016,6 +1017,9 @@ gst_audio_resampler_update (GstAudioResampler * resampler,
while (gcd % factor != 0) while (gcd % factor != 0)
factor++; factor++;
gcd /= factor; gcd /= factor;
GST_INFO ("divide by factor %d, gcd %d", factor, gcd);
} while (gcd > 1); } while (gcd > 1);
} }

8
gst-libs/gst/audio/audio-resampler.h
View file

@ -154,20 +154,20 @@ typedef enum {
void gst_audio_resampler_options_set_quality (GstAudioResamplerMethod method, void gst_audio_resampler_options_set_quality (GstAudioResamplerMethod method,
guint quality, guint quality,
guint in_rate, guint out_rate, gint in_rate, gint out_rate,
GstStructure *options); GstStructure *options);
GstAudioResampler * gst_audio_resampler_new (GstAudioResamplerMethod method, GstAudioResampler * gst_audio_resampler_new (GstAudioResamplerMethod method,
GstAudioResamplerFlags flags, GstAudioResamplerFlags flags,
GstAudioFormat format, guint channels, GstAudioFormat format, gint channels,
guint in_rate, guint out_rate, gint in_rate, gint out_rate,
GstStructure *options); GstStructure *options);
void gst_audio_resampler_free (GstAudioResampler *resampler); void gst_audio_resampler_free (GstAudioResampler *resampler);
void gst_audio_resampler_reset (GstAudioResampler *resampler); void gst_audio_resampler_reset (GstAudioResampler *resampler);
gboolean gst_audio_resampler_update (GstAudioResampler *resampler, gboolean gst_audio_resampler_update (GstAudioResampler *resampler,
guint in_rate, guint out_rate, gint in_rate, gint out_rate,
GstStructure *options); GstStructure *options);
gsize gst_audio_resampler_get_out_frames (GstAudioResampler *resampler, gsize gst_audio_resampler_get_out_frames (GstAudioResampler *resampler,