From patchwork Tue Sep 8 21:18:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22187 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id CAE8F44BD83 for ; Wed, 9 Sep 2020 00:19:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B0B1F68B603; Wed, 9 Sep 2020 00:19:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF3B368B6FE for ; Wed, 9 Sep 2020 00:19:33 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id m6so718993wrn.0 for ; Tue, 08 Sep 2020 14:19:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aQ5iKf1yCtbwV8P9AiDOPUgUL0Ipuee9Ufu3xHe6IHI=; b=QlC7g10hyn/rC0VNFCQxJ/fT9G4zuuqo0s4gHqXtotBSRbvuWUZBEbDpSblonRhUcK Mj6YMcLIgZGgL+UPBPRdI7AUHn+DFdi5fg/KN57oK6WI2TYgz2lwva1/1IJSge5vIi2A 3bxuRPa0gLHAiYbCP8v2/glxMAfq0a5YZNHx1pgy0todagLqTcOFwnRYwkitwpQLpC46 IK3zOm7a8gBP2hsOn9YmFlzUd4vcj5oJZh/+4hVhK7PfIyiryg/k2wQDus8NFRUaKqTi nCZvels4soatxVamofcfPBqqWW+A0aptnRGHyypUwqGPtF4clQIqNKRZ+wuSNDAHMmge oRgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aQ5iKf1yCtbwV8P9AiDOPUgUL0Ipuee9Ufu3xHe6IHI=; b=K3DRDyWvozicmvF75GLB2It+r81STwNhV5iRw5KS7oSGQXlRihjJMMz1IgfBEhHvzD TGVTkDAajdJ84D2/V0hH4B9xspJhobuGHLLyoWpCXz2vV0r5Df45vMY+XvWzzOEJ2LNs TyWFoi1j/uOYsQDqYEgi0gBtMcJH7kntfJjKHhooYoCbhjGzqhWM+a4yaYxDdprZxare Ws7KjVAhB6JjSpVsjXyIpWKjXEu+mdjdrkjQaSvt+TsJ1RaDuyDASVJ6IQ9TpJOJ4igv C0GzbG0zL1Oigaer5FuNfuUFhBSifTDVtaSuQDbtmcKg2FpDzcoiqVy68caT2H0lGC8i QgrQ== X-Gm-Message-State: AOAM533XgWpXYo0oef79O+1MTxPrFZg4x8fQVDn5smzV/wXNz4h5kGTi HS1NtC+7JwW2oZfj5TnoNZ55xeAu6VM= X-Google-Smtp-Source: ABdhPJwJoKKKIbftCW8E8WwaBKRColHEeFmwIyWoeXLqy46oKVywjkYzf1GQMsJqt6hJP+D6Omaokg== X-Received: by 2002:adf:ed12:: with SMTP id a18mr596218wro.178.1599599972891; Tue, 08 Sep 2020 14:19:32 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id a15sm1074304wrn.3.2020.09.08.14.19.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 14:19:32 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Sep 2020 23:18:44 +0200 Message-Id: <20200908211856.16290-13-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200908211856.16290-1-andreas.rheinhardt@gmail.com> References: <20200908211856.16290-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/25] avfilter/af_headphone: Remove delay fields X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" They seem to exist for an option that was never implemented. Signed-off-by: Andreas Rheinhardt --- libavfilter/af_headphone.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavfilter/af_headphone.c b/libavfilter/af_headphone.c index f9799d8548..f862181cbb 100644 --- a/libavfilter/af_headphone.c +++ b/libavfilter/af_headphone.c @@ -79,8 +79,6 @@ typedef struct HeadphoneContext { struct headphone_inputs { AVFrame *frame; int ir_len; - int delay_l; - int delay_r; int eof; } *in; uint64_t mapping[64]; @@ -457,8 +455,6 @@ static int convert_coeffs(AVFilterContext *ctx, AVFilterLink *inlink) for (i = 0; i < s->nb_inputs - 1; i++) { int len = s->in[i + 1].ir_len; - int delay_l = s->in[i + 1].delay_l; - int delay_r = s->in[i + 1].delay_r; float *ptr; ret = ff_inlink_consume_samples(ctx->inputs[i + 1], len, len, &s->in[i + 1].frame); @@ -490,8 +486,8 @@ static int convert_coeffs(AVFilterContext *ctx, AVFilterLink *inlink) offset = idx * n_fft; for (j = 0; j < len; j++) { - fft_in_l[delay_l + j].re = ptr[j * 2 ] * gain_lin; - fft_in_r[delay_r + j].re = ptr[j * 2 + 1] * gain_lin; + fft_in_l[j].re = ptr[j * 2 ] * gain_lin; + fft_in_r[j].re = ptr[j * 2 + 1] * gain_lin; } av_fft_permute(s->fft[0], fft_in_l); @@ -529,8 +525,8 @@ static int convert_coeffs(AVFilterContext *ctx, AVFilterLink *inlink) offset = idx * n_fft; for (j = 0; j < len; j++) { - fft_in_l[delay_l + j].re = ptr[j * N + I ] * gain_lin; - fft_in_r[delay_r + j].re = ptr[j * N + I + 1] * gain_lin; + fft_in_l[j].re = ptr[j * N + I ] * gain_lin; + fft_in_r[j].re = ptr[j * N + I + 1] * gain_lin; } av_fft_permute(s->fft[0], fft_in_l);