From patchwork Tue Aug 17 01:53:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29582 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2550654iov; Mon, 16 Aug 2021 18:54:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzy1v/FEiUqjAQID2s3aE4TKCiYTsy8qP0ZWpXtlCseJjmbVwji6CRB38qqfCp9C4U7ZyaT X-Received: by 2002:a17:906:17c4:: with SMTP id u4mr1131438eje.481.1629165287031; Mon, 16 Aug 2021 18:54:47 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id lt22si693640ejb.119.2021.08.16.18.54.46; Mon, 16 Aug 2021 18:54:47 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=Xn75XFTr; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8527068A13C; Tue, 17 Aug 2021 04:54:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074048.outbound.protection.outlook.com [40.92.74.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 62EC268A61A for ; Tue, 17 Aug 2021 04:54:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FBhC1Ad6cfnaGsjX9RtEwteL3UayDygiu9KprHy8Ag1/LWylRas5jdAURp9X2WB3k5pLlE2huIjw4eKFOgLMPIgbQXKAObTdw6y+xtMsStuLyK1XMU//7i+gEuzUyNk8ZSIWowRf0A03+J0rapNRWSgpYDsXKk3lHRt2HXa26kyBUSxNGflN+R8ZsE7Zm0+II+HE0Lyvd0xOhL2T0elk5Y5/XvEHNfo35MpHsqiV+mCJ2dfEU1RPJQrp8ij5XGs6NjCLAKXl5t29s26PArTEfFcy6MWIlVdDvmqi6hTfrcF0mkiYi9HiZghqUhixJ3cfgYoWa/vIUqZ0532DhJumGw== 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-SenderADCheck; bh=bHZnW20Rrp1gh+FKoJ4Tr3hYUXjUmOyt2QzyyaBlD/8=; b=FZe4qrwrsOhBAy1pgwHLoDTeJ1KeKziB0ESZJE1XFR75L+XwvhR3VAMDvePfMUD5MJzeUNAFZoYYnZuXWKr8LAbEzMwgPbRHZ+ctHqKZGNJ+tygdTXNnTlnXogpfPf4Dbff3KUiikWNrgyRoJ+F+Usk8gyuzB21Yo1WrEAGUr7DjIF4dcTeEuYED+HbDQoVmMS29xIakOKG/9U4ATi2SOMZMiQzzsc/QqvBkHID3O27uh2OBaenI5d/hoCzfSazxVhtzmnOknAJObWP+qEREDNNq0yAvzpLSHjmbHZK3dxZJN5g/HqhME3sdssmIZtH71iUvSugt/BPJ+xxAWcSwHw== 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=bHZnW20Rrp1gh+FKoJ4Tr3hYUXjUmOyt2QzyyaBlD/8=; b=Xn75XFTrqCULyNdxs7bmxshxZezQ2cYVCyKTZ/AcXn6Qie7F2YenCJuU6brig6U+sHvEJJ1NHb2qb/gbqQgptqvOHN5N/vH+nE2FEmAQwAzceU2ELb1zsBf+3MJUD4HL/XpJeNjksqp7f+pVVMqi/AiXcPQlI0SIwTsxFw+sRiywl8xK8zFX66HbxL7TQ4yGQ30t5PIiHVPGRasSAVBHHr7z0H1iXjKpKhM9O+0wHOlXqfO9K9klt3tD5un6F53+VNhawPvmPMaHMD8l+/4VXtWHzwWzQrTDfUhqpOcEvB/EjsUlXk51S8uBfiET4OhJ7bMOELekz+4P2IrlrsPvMg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7143.eurprd03.prod.outlook.com (2603:10a6:20b:23e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.23; Tue, 17 Aug 2021 01:54:24 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d%3]) with mapi id 15.20.4415.024; Tue, 17 Aug 2021 01:54:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Aug 2021 03:53:58 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [rBetCN4tLWEc3gVVnosOahBMdkKFKN0n] X-ClientProxiedBy: PR3P189CA0040.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:53::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210817015358.2985475-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P189CA0040.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:53::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14 via Frontend Transport; Tue, 17 Aug 2021 01:54:23 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6326f340-2d9c-4e12-11d9-08d96121f01b X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNViLEfi+B1v2fp/64glZbG/Z2e3CI1nJY2TWF/nlOJuNo1Z/RBF6FguBnVJCTQ/r/zkNagIntFA4eMh3MiqVrMNmJuxgJ/bu7TfsGCjUQU2ScOXIJgeluTWR8GVM79pgZstQvPxy61xb1coYrS4jBpS1ZMn/3VcONR/SHnfUF8AEk+a9sJMNwMe13DMI6GtlZYffGg4L4cPDF/WkxKBatoKf0t55Br55VQbz92rp+RK/tbaSnkwtrx6EeY4UgOLIs7qa+iAeitmNCzhM+mHZx2JjFtB4ogj5k0pHzlkEPQsAqCHZBOxrzlo7d/yxFdnjAwfznxkH/tn2drOlWUVmfcpxAS4xLHVJPNo0yQ27ckSnST731qZlwYtB+qW2SgEN59LEQ9HfFhnIBE0wjiYXFxXoFAOr7+7Tf5u9hAEDaA0r7i9sgu4zed1cG6puMUIl+gC8JLGGgwS/CAQYtewShyTmJ478MZJnz8H8vwi7lHGtFBPb55s6TW6yzgA418J+6/IspMyIdCOXzUBWek4SVIkFiABRS6hzWUVikGs0qlZ5JAKJitz71/ku+KX5eQeaO1D4BlYCxogM5kdadm7ggF92FvnpgF7jAyFXbihIjU8XaDVkA7GDEKkhVFlG7nUhCuljAD4tNDyEma20l4t1HOuKJ8ek5xtnkuY3UK2WCfM5fDBG1YpvIJNjitn+WXeRPgBiRG7xlmy9rVsLNSygFQaAvbm8wLk6fM= X-MS-TrafficTypeDiagnostic: AS8PR03MB7143: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SAmSqF0kBooBFJy4oJr3mUok9tGpESkfnWxK+QCx9UpOvVlBou3Byhww9g/H+QbrqRy18Kxjn18XlFxv5uESmWyGT6gTInt9SjzpUbr4QidiUtKb9iakwPf2ryF251YdW2IJ+ysw6USpKo2VgkuRoWV9TXTndZ2Xb4MpBvceYD+ImyFwEBmQEE6oJEAHDJypHT9aLvTdqS+WAp9JW15wF9knv7z00BavnqMhVqxl/socGrNJ45Rbk7bBXzr/nqG4lL9DC4cZ93zkamt0/Pxha0jkPAP4Ds20yIFB0eTdi/ghlSO0HvoKhtylLp2Sbu/K7ABIZQpaR+MRtI/yh5cT/ftR8DMCVAL9lzHgCUP/9bjMo4r3H5LRgCcJ8k1ykXR6zdTRB775tg6WfJzCFyNTh6o/jXcM1uUMukkTwqF9oBdcoL8lazli8cc5L3zLRkwY X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: u8Ek7FgvcgwyANtGhuucOOMtLNP0lEYu0D5fWE8pKsb4o7apC+5io9vzogBRxDWFn26x3M2D4Dvhoi0Dm7BvoURwWAdVmwApZwqV15xwVARo5biuI/WAYaDUGpnBd3i47/vWGxx1mNzEb1fl+Ynj/Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6326f340-2d9c-4e12-11d9-08d96121f01b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Aug 2021 01:54:24.1578 (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: AS8PR03MB7143 Subject: [FFmpeg-devel] [PATCH 6/6] avfilter/af_afir: Free inpads' names generically 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zHSmSvFtetQ0 Signed-off-by: Andreas Rheinhardt --- This is how one of the two filters that make use of setting AVFITLERPAD_FLAG_FREE_NAME directly are handled now. headphone is the other one. Furthermore, the newly added segment filters can also be simplified by this method. I think I can avoid (re)sending the rest of the patchset. If you think otherwise, just say so and I will send it. libavfilter/af_afir.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavfilter/af_afir.c b/libavfilter/af_afir.c index 670a8c837b..f26ca03810 100644 --- a/libavfilter/af_afir.c +++ b/libavfilter/af_afir.c @@ -792,9 +792,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_frame_free(&s->ir[i]); } - for (unsigned i = 1; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); - av_frame_free(&s->video); } @@ -844,16 +841,15 @@ static av_cold int init(AVFilterContext *ctx) pad = (AVFilterPad) { .name = av_asprintf("ir%d", n), .type = AVMEDIA_TYPE_AUDIO, + .flags = AVFILTERPAD_FLAG_FREE_NAME, }; if (!pad.name) return AVERROR(ENOMEM); ret = ff_insert_inpad(ctx, &pad); - if (ret < 0) { - av_freep(&pad.name); + if (ret < 0) return ret; - } } pad = (AVFilterPad) {