From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D9C9E49A42 for ; Mon, 27 May 2024 17:18:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D3FEE68D499; Mon, 27 May 2024 20:18:48 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2023.outbound.protection.outlook.com [40.92.90.23]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F071C68D13F for ; Mon, 27 May 2024 20:18:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WMKuFQCzpDZY5xCA/0z3reAOHJ9WchYyDNZvowMWWO52Hdv3v5jRKCjPa8UyU94EEDshTk6Dvd5oMh2OHnW7AuCUkj2l7zdNSkf7ma1vGweTpnT1bqSuWyTVLPlF6/pMk3aSUcbysi+do2Sn9zMY7hMjObMgj3w6JsmPFSRTX2AnAb8FtZQIDv7Xx/qn/TWJY8FuzHwtpO4jw4KZ3IOFzSD9B5LlNMFGvfmNXeP7WbIoXE7jGjrjlLcvDxGt5HgfoYcHnfo7Gp4puOhvmOwUgJGqe/7VsI6uQMamrdY0g2dSQOiULIElQqC+7/lefkMNQHIiuviFgE7P3I17vnzTmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=U2589KHiqYqzqIns/GLyqRocbw4JZLyvTPslgMRYqBo=; b=TAC69P/fOkj9OoEcArC3agbdP3uRsi69UDL9zQZpJ+jh6EVFuux7REjgNuzKIrsgosULgvJ+4zLdMzQoX2HE+aUPukyV2iJbA+kyygL2OdMOt5BgwB+r4OEJOBpJoG1rU5bQFWk9/WUOWJ6G51ZmBRlzWkp9UYN1dcU1uvfkAJLvNDafIH8CpKhS5pBXoDhB8svPkyHQbB0JIBMBh+Lyp45uCVGSdLxH/k6+JptDOm5qSvuU/JdXUVz0jNeCsVcLhy4Xyf4d/qHEhKlnmQphUtdU61GyVz/D0rPFDW0p1CG5YBZZdHrQT3xBXM2ZSJjrqCyXGdRpZ2G8wWPinzjHDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=U2589KHiqYqzqIns/GLyqRocbw4JZLyvTPslgMRYqBo=; b=FRWItQPWtWXOO3da8q6qViIJf8IydadJiJoaAg50q/iKWNFy5OOoBG4HEw8uFoQ0eKCD7rb3SPf0Gz30dQepUfajKMtyvP9Vh4WhBvfmBP7BWYVd7VxpzvH2STGc7jkzkyfhu2jDe74F+KXvAbKTZhJe9D75dfk2idVUSSIx8BJJFgWQfClLOEJwK8uvU/AK+y4T89vd4FtYXnadUop8z4xNniUC/BByQKm4K8TBPzB2acKVDZUTBgVcMyfFbEnLBBkkaHi41RkpVQDmZ45jSnJCBf6BYQXqU0wMRMVL6D5d+pT2VzTDDpqSLMbMrQLCRVGXnWrv7favWkPZ6ZO84Q== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PRAP250MB0489.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:29a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.29; Mon, 27 May 2024 17:18:40 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.025; Mon, 27 May 2024 17:18:40 +0000 Message-ID: Date: Mon, 27 May 2024 19:18:38 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [8vaaeh32sllY1Ky2sDPi8o7xdIxshQ4LldLElWCqQ1I=] X-ClientProxiedBy: ZR2P278CA0035.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:47::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PRAP250MB0489:EE_ X-MS-Office365-Filtering-Correlation-Id: a1371a0c-2b47-4d65-18df-08dc7e710d46 X-Microsoft-Antispam: BCL:0;ARA:14566002|461199019|3412199016|440099019; X-Microsoft-Antispam-Message-Info: wMvQi5TsxyuBWFjtxwcbrtWeud5V49XAHFsH+56GQy7bqnLeSeEnO0GhtAu+QNz/O9rL0wSKLFEtSeQtRIVVw/3i1y1O/wZndCOgvnOI+GR7Ff2qrg1ZWFCwJrufKv9aKj+/VuFhByHM2dT59rIEQGI+LxpM2UdzJ3w47f3fRR6s9lod3hVl0AgkYSidBaC5k/i+I8ubBgLB8owAjf2hWM5eQJ/8Ou+2GLook2q8Ou9D2nDy3//XdZaJtLRP9vHE0Ffpvov6ghoqf+gGAnhnzQiqH6UZlToweS1wdIqMIZs/awep0keFaIUaTykFL5FUTJ5xljkXm9+/lGZSfp+QITlWFvfTikxVxBsn0cBckmPeR3HNGQbqa+N9WHBrzlDaz5H7d0FqqfSxrFMlSk7bJ3W2UcV9HTO+Y6A3iqyvyOkIL/oHp3hVgVKq6DPtiZO9Ih88G0x2xEjTza9j2AnOfd7mS16u6WKfbV0vcyPpDVO/7mxjbdqOcjxXRAxCioM6RFWhtngL7feig0EYpPfWLhilGbE/bNKgp47KpcFq1OqVnsCJ0iZZ1t/KO8gqTvkA X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bEUxaWdKUmttM0pKTUFYSnkrVlhqVVNsT1c3bkdIQTdnZ3ZXTTJLMmlJVG9X?= =?utf-8?B?dEN6NWQ1STdyc2hwdVBQV2Q0ais0bkZTYWtWLzBNYldXYzJuYXdyQk12Q1o3?= =?utf-8?B?TUk0UlRlQ3dKNU9LNUNkZkNoN3lTS3pvTUx5OXBKSU5sVkJOYlcrR3JGdWFk?= =?utf-8?B?cTI1MmF2UE95UDNHeDIvV214TmtqZExyS01ET3BvbWJ3d1FQbDZlZVVnbGsy?= =?utf-8?B?SEw3cGU5TEdJbUZ3LytQcXFZcTZ4anhjT2tsZlp0NEkxZ2Q5VE1XVTBDcHZ1?= =?utf-8?B?UnBEcWFxcUJZai9SS3d6UnR3dDdJRlBjSFoyM3loNThlR0krMXFScXZSUkl6?= =?utf-8?B?MDVPdmVxbGhVUDA2UmxZUWVrL3VFeEVSYVNzbGd1a2dxcXN5TkhZajBVSTlS?= =?utf-8?B?aUpiRjRyV2Z3SUd1UGsvK3ZheVFlRzJTZ1lhUCtjVDYrek1mSTVqMko1TXZH?= =?utf-8?B?VjBZeXFOWVRPZC9DS3BCZXNvamg5RnErbFRVVmNqVVFsOXpoN2F3NFIvQVRq?= =?utf-8?B?eXNqNkQwcFZWY29XSFluRTRiZGdzNFBDQWVKRExwNUtWU0l5aGhrWWdTYktL?= =?utf-8?B?QVJaT0tSZ09EQWVHbTBmekJLa3pBUXZObi9CcTBnMEdwV3h4VGR1LzVsdUo3?= =?utf-8?B?SlphR2lITXZ3cUFKbzc1dFZIS0Q5VmdNSEZPMnBpUGxmTC9EZkM3eVJ6K3Q4?= =?utf-8?B?eFlSaFVNWklXZHg0aUNxRnIrSnpnbVF5YUVmQzRaZ05iSHBIbjVYeit3NTNp?= =?utf-8?B?MXYzVGdTL3VFcXRMSGVLVnFPQXB3WEZoUVJVQlpLZHowRXlkelZQRWJZUDhN?= =?utf-8?B?Vjlqa3VOLzVKdE9UcVlqaGNwTU1qakt5dDN5WEttMk9VWkJLVWQrWE5HVmdp?= =?utf-8?B?TmxvZDFYRVZ3OUZZbDBPUW4wd2txQzY0M2Z1VjhpRWsxaWxpTkVTLzhyWUlj?= =?utf-8?B?R2pCdE00a0JIWTRPMm1pZlcvQTdJRGQrNjNXdXBMaUVRc0cyS2VZeFhweUxj?= =?utf-8?B?cEhBa2YzZUtRYjVublhLN3FFampHc3Z5ZjY3OFRqMXNoZGwwTGVhZ1hzaExC?= =?utf-8?B?c0lCa1JzM3B4ajJNN1JBRGV5cDg4bVg1UFU4TndkSEprZ3dVdUlzem5yZTV5?= =?utf-8?B?dUxHQm5RaWwxaFkvSStwZGpXZndPdW9GMUgyREFTU3lwaFNjQ3pVZjZ0ZDhP?= =?utf-8?B?NkV5bzJTWkdCNTJpUWpEUHI1ajRvazZNdy83S2N2U3g3QlJTNVY2ZGIyTldW?= =?utf-8?B?cFZEVmJLNWtlL3pJS2NOVXlXNkliS1hRbFYvbEQ1ZS9sQ1I2QjVONkF6b0ov?= =?utf-8?B?d1phSGpjMW9jSE14VWdKUlBEd3ZITHNRRGd5MlZSUUNia1BVekwwcmVFVEdq?= =?utf-8?B?bnVIYzBieXVpbWl3YzhzaldDK0ZxVllRcXdwZUFsQ2NFMU5WYWQxdG9raWFh?= =?utf-8?B?MDJKSUJMc3Z6dDRzNEthSGJuT1VYUDVZN1ptQlhYd0txYm4wM2JwbTRNZnM3?= =?utf-8?B?RWZaUWpQeWNlK2tMWXpvdzNlSlo2YlFwYjdxaWdpSkFURjEwQy9HeCtSTk1K?= =?utf-8?B?cFZFV0JHUDVkcFlrTERNamJuNmRXU0ZxTVNiQ3Q3MGcxTTBnajN6Tis5YzV2?= =?utf-8?B?NUE3STRRSVpLRSttNHhScnl6SUlKWHFpOEljUU1vZFFmM0F3WVNOM0dheU1y?= =?utf-8?B?eWZMaHIyOEp6WGFwaXl3VHYwb1dwQlJaN1RFZ0lBTnVrQWY5MzdpSSt3PT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a1371a0c-2b47-4d65-18df-08dc7e710d46 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2024 17:18:40.1438 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PRAP250MB0489 Subject: Re: [FFmpeg-devel] [PATCH] avfilter/af_afir: Merge header into af_afir.c X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > Done in 0df18f29ae218f30b3ecff7c930176b8ebee56aa, > accidentally undone in 163e737c1793eeea9c2df15298253ffc04906afe. > > Signed-off-by: Andreas Rheinhardt > --- > libavfilter/af_afir.c | 81 ++++++++++++++++++++++++++++++- > libavfilter/af_afir.h | 110 ------------------------------------------ > 2 files changed, 80 insertions(+), 111 deletions(-) > delete mode 100644 libavfilter/af_afir.h > > diff --git a/libavfilter/af_afir.c b/libavfilter/af_afir.c > index 8997fbd7c9..24f8f8cbf1 100644 > --- a/libavfilter/af_afir.c > +++ b/libavfilter/af_afir.c > @@ -34,15 +34,94 @@ > #include "libavutil/frame.h" > #include "libavutil/log.h" > #include "libavutil/opt.h" > +#include "libavutil/rational.h" > > #include "audio.h" > #include "avfilter.h" > #include "filters.h" > #include "formats.h" > #include "internal.h" > -#include "af_afir.h" > #include "af_afirdsp.h" > > +#define MAX_IR_STREAMS 32 > + > +typedef struct AudioFIRSegment { > + int nb_partitions; > + int part_size; > + int block_size; > + int fft_length; > + int coeff_size; > + int input_size; > + int input_offset; > + > + int *output_offset; > + int *part_index; > + > + AVFrame *sumin; > + AVFrame *sumout; > + AVFrame *blockout; > + AVFrame *tempin; > + AVFrame *tempout; > + AVFrame *buffer; > + AVFrame *coeff; > + AVFrame *input; > + AVFrame *output; > + > + AVTXContext **ctx, **tx, **itx; > + av_tx_fn ctx_fn, tx_fn, itx_fn; > +} AudioFIRSegment; > + > +typedef struct AudioFIRContext { > + const AVClass *class; > + > + float wet_gain; > + float dry_gain; > + float length; > + int gtype; > + float ir_norm; > + float ir_link; > + float ir_gain; > + int ir_format; > + int ir_load; > + float max_ir_len; > + int response; > + int w, h; > + AVRational frame_rate; > + int ir_channel; > + int minp; > + int maxp; > + int nb_irs; > + int prev_selir; > + int selir; > + int precision; > + int format; > + > + int eof_coeffs[MAX_IR_STREAMS]; > + int have_coeffs[MAX_IR_STREAMS]; > + int nb_taps[MAX_IR_STREAMS]; > + int nb_segments[MAX_IR_STREAMS]; > + int max_offset[MAX_IR_STREAMS]; > + int nb_channels; > + int one2many; > + int prev_is_disabled; > + int *loading; > + double *ch_gain; > + > + AudioFIRSegment seg[MAX_IR_STREAMS][1024]; > + > + AVFrame *in; > + AVFrame *xfade[2]; > + AVFrame *fadein[2]; > + AVFrame *ir[MAX_IR_STREAMS]; > + AVFrame *norm_ir[MAX_IR_STREAMS]; > + int min_part_size; > + int max_part_size; > + int64_t pts; > + > + AudioFIRDSPContext afirdsp; > + AVFloatDSPContext *fdsp; > +} AudioFIRContext; > + > #define DEPTH 32 > #include "afir_template.c" > > diff --git a/libavfilter/af_afir.h b/libavfilter/af_afir.h > deleted file mode 100644 > index 8e4afd79c9..0000000000 > --- a/libavfilter/af_afir.h > +++ /dev/null > @@ -1,110 +0,0 @@ > -/* > - * Copyright (c) 2017 Paul B Mahol > - * > - * This file is part of FFmpeg. > - * > - * FFmpeg is free software; you can redistribute it and/or > - * modify it under the terms of the GNU Lesser General Public > - * License as published by the Free Software Foundation; either > - * version 2.1 of the License, or (at your option) any later version. > - * > - * FFmpeg is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - * Lesser General Public License for more details. > - * > - * You should have received a copy of the GNU Lesser General Public > - * License along with FFmpeg; if not, write to the Free Software > - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > - */ > - > -#ifndef AVFILTER_AFIR_H > -#define AVFILTER_AFIR_H > - > -#include "libavutil/float_dsp.h" > -#include "libavutil/frame.h" > -#include "libavutil/rational.h" > -#include "libavutil/tx.h" > -#include "avfilter.h" > -#include "af_afirdsp.h" > - > -#define MAX_IR_STREAMS 32 > - > -typedef struct AudioFIRSegment { > - int nb_partitions; > - int part_size; > - int block_size; > - int fft_length; > - int coeff_size; > - int input_size; > - int input_offset; > - > - int *output_offset; > - int *part_index; > - > - AVFrame *sumin; > - AVFrame *sumout; > - AVFrame *blockout; > - AVFrame *tempin; > - AVFrame *tempout; > - AVFrame *buffer; > - AVFrame *coeff; > - AVFrame *input; > - AVFrame *output; > - > - AVTXContext **ctx, **tx, **itx; > - av_tx_fn ctx_fn, tx_fn, itx_fn; > -} AudioFIRSegment; > - > -typedef struct AudioFIRContext { > - const AVClass *class; > - > - float wet_gain; > - float dry_gain; > - float length; > - int gtype; > - float ir_norm; > - float ir_link; > - float ir_gain; > - int ir_format; > - int ir_load; > - float max_ir_len; > - int response; > - int w, h; > - AVRational frame_rate; > - int ir_channel; > - int minp; > - int maxp; > - int nb_irs; > - int prev_selir; > - int selir; > - int precision; > - int format; > - > - int eof_coeffs[MAX_IR_STREAMS]; > - int have_coeffs[MAX_IR_STREAMS]; > - int nb_taps[MAX_IR_STREAMS]; > - int nb_segments[MAX_IR_STREAMS]; > - int max_offset[MAX_IR_STREAMS]; > - int nb_channels; > - int one2many; > - int prev_is_disabled; > - int *loading; > - double *ch_gain; > - > - AudioFIRSegment seg[MAX_IR_STREAMS][1024]; > - > - AVFrame *in; > - AVFrame *xfade[2]; > - AVFrame *fadein[2]; > - AVFrame *ir[MAX_IR_STREAMS]; > - AVFrame *norm_ir[MAX_IR_STREAMS]; > - int min_part_size; > - int max_part_size; > - int64_t pts; > - > - AudioFIRDSPContext afirdsp; > - AVFloatDSPContext *fdsp; > -} AudioFIRContext; > - > -#endif /* AVFILTER_AFIR_H */ Will apply this patch tomorrow unless there are objections. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".