Merge commit '567ca142952c5be57e52c149c815dfe5d6ac6d41'

[ffmpeg] / libavfilter / af_tremolo.c

diff --git a/libavfilter/af_tremolo.c b/libavfilter/af_tremolo.c
index 0ae7a7caa3d83c55b3300e8763a9f7e839a75750..572e9e3b56082e474ec4480addeb19d512b1b2b3 100644 (file)
--- a/libavfilter/af_tremolo.c
+++ b/libavfilter/af_tremolo.c
@@ -72,7 +72,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
         dst += channels;
         src += channels;
         s->index++;
-        if (s->index >= inlink->sample_rate)
+        if (s->index >= inlink->sample_rate / s->freq)
             s->index = 0;
     }
 
@@ -125,15 +125,13 @@ static int config_input(AVFilterLink *inlink)
     const double offset = 1. - s->depth / 2.;
     int i;
 
-    s->table = av_malloc_array(inlink->sample_rate, sizeof(*s->table));
+    s->table = av_malloc_array(inlink->sample_rate / s->freq, sizeof(*s->table));
     if (!s->table)
         return AVERROR(ENOMEM);
 
-    for (i = 0; i < inlink->sample_rate; i++) {
+    for (i = 0; i < inlink->sample_rate / s->freq; i++) {
         double env = s->freq * i / inlink->sample_rate;
-
         env = sin(2 * M_PI * fmod(env + 0.25, 1.0));
-
         s->table[i] = env * (1 - fabs(offset)) + offset;
     }