diff mbox series

[FFmpeg-devel,23/25] avfilter/af_headphone: Use more appropriate variable name

Message ID 20200908211856.16290-23-andreas.rheinhardt@gmail.com
State Accepted
Commit 8dda0d601becf19e6cdf350e2fe82b4db7339bd1
Headers show
Series [FFmpeg-devel,01/25] avfilter/af_headphone: Don't use uninitialized buffer in log message | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Andreas Rheinhardt Sept. 8, 2020, 9:18 p.m. UTC 
Also unify incrementing the variable containing the pointer
to the currently used HRIR data.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavfilter/af_headphone.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Comments

Paul B Mahol Sept. 9, 2020, 1:32 a.m. UTC | #1 
On Tue, Sep 08, 2020 at 11:18:54PM +0200, Andreas Rheinhardt wrote:
> Also unify incrementing the variable containing the pointer
> to the currently used HRIR data.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> ---
>  libavfilter/af_headphone.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 

probably ok
diff mbox series

Patch

diff --git a/libavfilter/af_headphone.c b/libavfilter/af_headphone.c
index 8b0a431c45..8db546adbf 100644
--- a/libavfilter/af_headphone.c
+++ b/libavfilter/af_headphone.c
@@ -163,19 +163,18 @@  static int headphone_convolute(AVFilterContext *ctx, void *arg, int jobnr, int n
     }
 
     for (i = 0; i < in->nb_samples; i++) {
-        const float *temp_ir = ir;
+        const float *cur_ir = ir;
 
         *dst = 0;
         for (l = 0; l < in_channels; l++) {
             *(buffer[l] + wr) = src[l];
         }
 
-        for (l = 0; l < in_channels; l++) {
+        for (l = 0; l < in_channels; cur_ir += air_len, l++) {
             const float *const bptr = buffer[l];
 
             if (l == s->lfe_channel) {
                 *dst += *(buffer[s->lfe_channel] + wr) * s->gain_lfe;
-                temp_ir += air_len;
                 continue;
             }
 
@@ -190,8 +189,7 @@  static int headphone_convolute(AVFilterContext *ctx, void *arg, int jobnr, int n
                 memcpy(temp_src + len, bptr, (air_len - len) * sizeof(*temp_src));
             }
 
-            dst[0] += s->scalarproduct_float(temp_ir, temp_src, FFALIGN(ir_len, 32));
-            temp_ir += air_len;
+            dst[0] += s->scalarproduct_float(cur_ir, temp_src, FFALIGN(ir_len, 32));
         }
 
         if (fabsf(dst[0]) > 1)