From patchwork Wed Dec 1 17:03:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31885 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:cdc3:0:0:0:0:0 with SMTP id a3csp1666431qvn; Wed, 1 Dec 2021 09:03:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJxXMJq0dudbfMLRs10n0b6VB0e2LE+u2yuEqFygoWUp47EJ9iXzX5TCap7CxrSR7gHcImwc X-Received: by 2002:a1c:ac46:: with SMTP id v67mr8532481wme.182.1638378229976; Wed, 01 Dec 2021 09:03:49 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i24si422867edr.262.2021.12.01.09.03.49; Wed, 01 Dec 2021 09:03:49 -0800 (PST) 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=TuWivHXB; 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 126E768B026; Wed, 1 Dec 2021 19:03:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072085.outbound.protection.outlook.com [40.92.72.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3225768B01B for ; Wed, 1 Dec 2021 19:03:39 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eWpr6GgBGT/WxDOfT9PjKKogzn9HjJTIB4SJRmLSxv7TsDUQ9I5ho6SsN6u9pgwiH4kUizj/kH2BkR/MkU9zUitTxlSBaoRAiL9W0diEtbQlHn7EiMNQ/fOx2hOJwMhelTEi7muG7e0MM7GHMmI0g/BXB+gsLavtI6a9KzqTIkVkllt9VwQbz1Se/ySfKxKrfuvRPoknrtPEIwXbA6FeqXpcWQYWTDF3GgAEisYRjDDRjL5uK8cu3rWWAQqG5hU9sxnpS78k6pwOXb9zRbTv8InqAS+CNz/LQaU5JtVOFdbCCzAuJhJUNrdHdpbkrZfz6wuUTPdxRwR95T86twBWuA== 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=UtEYC4PXxhEWB0MIuf6blcg/3pwa1pMqGNufD+8Ka64=; b=airP/9UnKrCgD+fRwn/5C5zqKf32MUABqSzy3i/v1F/dKRNo7zZcSiwolY3c9nj3Im62K34aSnhb7z0CK4PRVgq8//jmEV5qQsaimdNAIZGqi6QEO9nzotwX9R4cLdnak6Ogut5mvRtvD1TwQyF9Jq1eayYdV9ElsC7tKmRictHQl9xtxK45ii7s82xO8gqF9+fYY6nlo7LYAv1b+uRxH/VVGE1jOZQzHv2KcKEr0uq79yVG8u1FvWDBH6asg3tpbO4hxv72+aXe3tfRXqZ8DM6b7bl5u0sS7yBQvAOOBdCuWX2L3WphceGOmuzgbKG6VvkrV0faVGd0l+Y1K0x+BQ== 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=UtEYC4PXxhEWB0MIuf6blcg/3pwa1pMqGNufD+8Ka64=; b=TuWivHXB9i92ZrL0c8y9NyT22g6OCYMrLUzSl0JOEdppqd6OPwvw+Kjek0rl3X6xdvNcehuJnW2YoVASxgxKQy3GsHI0hMdphsf1CYvQDXTu70zs+E1/I0b4DgMBEmliMRqQ1/GpxoU/KZ5ZKy4xNtS0PDKI4T9pxg4eG8//77ikW5gUGvD3iHfY6IkTZjuSr8dGVYhBW2ReZeWdrWBpIc3t8YD/3bu+33scgZsxGbdVlent6l9yKqDPc/ihYFV/mENMFq0yN0lB3cKjANrAgxfrdju5TDxGUBi21uWJn8sSsRHET6V5mhPwXsvw6TmUVIMNlT6J2+tT/3z9lXdewA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3317.eurprd03.prod.outlook.com (2603:10a6:209:25::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.20; Wed, 1 Dec 2021 17:03:37 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%9]) with mapi id 15.20.4734.027; Wed, 1 Dec 2021 17:03:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Dec 2021 18:03:13 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [4i7heGZwfnei4DNeOMLNY/s3ObiDopsI] X-ClientProxiedBy: AM4PR0501CA0047.eurprd05.prod.outlook.com (2603:10a6:200:68::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211201170314.285597-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM4PR0501CA0047.eurprd05.prod.outlook.com (2603:10a6:200:68::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23 via Frontend Transport; Wed, 1 Dec 2021 17:03:37 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b23fb368-d162-497f-7c87-08d9b4ec842f X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEticfBlUvjU5KrUz5H1+LWHl+KuoK3Q0I3pVdfMYXBa023qn8lfjaIeNvu3TM3Z70mcDs7OgGGOfs16qHmQ7QRQ2p5Nc24afKyzulbwaCyydyeiOwEzfYcEUJpAyEhgfS45QCkWvMaiOFqeiW/urujKG5JqzLA4P7ljoBa2iA0NhOJvj1Hsx4SzJlBJL1dSjnSZItA+1W0Hktx5uueKjc8wtWgnTBSvpiiDa1Mt9LNbxaZP2KIdzMfm7+IR0Wx39YKxhkp0rqaBSYn3Qt++ATlEr/0tcC42DvdaXwzZZGBM2DTLvZFjR3AfBHb3rxNlDzNT/ObQ0H8jTGn0DRdZm7P5/e3OyWcikC1yMWByTzOxdqkyv7uaigbk9zlr6nvYXuNmtmevJB/rDttx11b1oibwB/1Q97tcYTsWL6/AHgEPN8A59+IUJw0k71cQNLv6mtAcNodbpmoZcQmsPbcHWHmkgQ6JpaDEZKSaZfFhyL7udCY0HNYO4sLTZLL7bOJrdLtBAnxm4/YIwn5nJ7MdpBPENEPk1UbwsqIqB/+w70X6zkTaQzaIrbIP8/nLi2MPztCJKUPHV6SLy5kaO2y6vos19xVhr/rZ1UfJitLtJFKVBw3ewJU6Og+AXPmrBN7tM3ELpY5SPXQzTpszQWLhA5GamM+zpgmUFidhWbDbEAwU8aE3vVjTcgF9ZrqwClNvn6C25OESVSgMippx57MB7qNxvbWWhPJ1AmkXxQlAue76/sQ1u4MY/9L2GNo0tER0/icVp+uakt7LmvALl9UIcTi3 X-MS-TrafficTypeDiagnostic: AM6PR0302MB3317: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2JDkeURKi04b8BqjVcg/NxcJlN8TugnL5dyiILUFK0+5+BaLVEz+hTi0xWg9HvnGnt5IYpX6vaQfL36FLTt3j3JGW8QXSo8RxNVZPbBkwhxDtqs72CWVPSZchQpu7AAms9++uqERE63KP8e5XaI9ipH6t26yTvomodAD3BnqWZ3FQF7vQTWDeWYvNKTjyu5OHwof5Gtk1gEToMZSgznYLAx0M5LWFN7jb0RI5shdyEvjMVwdfOOAjI5QCCw0dCw11GPjNM5a3vTGS5rEEx0KdD9fvifbgVWbEYnEbguyPplQUmYoRbTP2wFpJzQKAhve29ugji794PAqxEV2BOiotgxF5SdWrEOs4CqEb/WoUElUz1G2imbPBvNUpOfg6KNcSluM0KYUX1HTKeNm/uMAPGs3alJHVzGcawVjZK4Nlr2MhNz3XeFvnRXHUzq7f8ZUfJon277IN5MUikV5CJ0WmwjZzbtdIVluPw+YjU+G7+nlnYYnFPmRNbRWaun+qvA97CwURkAxMUMdLInh/Nq07ZAa+nqg7Btjbqjt2Uxl8YD+wVe3jyRfF0awNSvZgNq0z0XkC2odQP8kKTRqXXAdsg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /OY0tr3PCFq4eAV8WGcsaYDtcvjA0Q80j0252TtcVe15tFTFDMqhhn+McRaImnJFuyFPHXbWflOmY1ONQ69mXKFaUhTna7QA+tf90M3NXP9bosIZUmQXOl6b5RZ63qsr4tm68/7sGo5v2+FSGd/oWaYDRaLfKezRIpByywZ26AnKLku01HPYYcK6+NNjdrAFj7tOTCTVLN+v+DAYQnkNB7uyd1n0b4/WxS4liZYG4R+l1cwIQoa/dNZ1QsCpJeHY20zGGIBURRiIBv7EMhuqf6nNQe17H/Rl6RpQCCMvIcgeWOtw0q+ZvFC8OHaFXW5vbj95gUHF+hQyhe3p6lj13swQtjg6QY4xjjim/KO1PwczE/D5scuqdeJDmEybnogOSL2ClZ1Rs5RnVqDEaWx7iv+YBWY/msmc2YA486P8BiYjrfP0alB/RRPNz0PwNMaLSUj66OctBdnbBRWb+E8bIOSOK+GqX+oIb3RiVqsIqkJIENzOYG+cPDUsTUHFntqaQ1p9XPR74Sp5C5Srawo7j9ZovJqy6iR+OwEELvgXKUce4Oj+E0iqID//4BJs840C3RnKtYAEUp63C/H/l7DBrrReIDm53rO6G0ZJoEa2O4aMmLiELWtbybra6iB6s2cHSPRB6VNKm7eZ6kvjciCBirNGwhNnT6Ai8DLpck258GSh8aQe+vqDZqaFRRt/t6XHESrNa6inTITaQe/fYZZHYjfjK5M52OZG9yZ1pb5YuVDj61YL/hWHleM3lHk12vdQbjVpuOJRrvzh0Zxe3hRaQun4PrMDP2zE3H4yrCOj5vmDvqOeQTbpHwb0tCWoXTnQ9yK/wZfDXNfL+H6DN3JjxSizwW6qNWz6MhCxrAUyZFAfdsjiOx68wLNtgpPQ/lv/xtMpg9npS5Cre/2Aq2WfyvKWbZhny7qnBLmXd/0zn8SpgCQmh1GfLqv+silpwpWd1Zs5rGHkiE6VZKlHZHZbiA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b23fb368-d162-497f-7c87-08d9b4ec842f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2021 17:03:37.4692 (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: AM6PR0302MB3317 Subject: [FFmpeg-devel] [PATCH 3/4] fftools/ffmpeg_filter: Avoid DynBuf-API for writing strings 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: whhQFXHmb+CC Content-Length: 1615 It is not really natural, it requires internal allocations of its own and its error handling is horrible (i.e. the implicit (re)allocations here are unchecked). Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_filter.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 452b689d62..47bbb67ce0 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -201,17 +201,15 @@ static char *describe_filter_link(FilterGraph *fg, AVFilterInOut *inout, int in) AVFilterContext *ctx = inout->filter_ctx; AVFilterPad *pads = in ? ctx->input_pads : ctx->output_pads; int nb_pads = in ? ctx->nb_inputs : ctx->nb_outputs; - AVIOContext *pb; - uint8_t *res = NULL; + char *res; - if (avio_open_dyn_buf(&pb) < 0) - exit_program(1); - - avio_printf(pb, "%s", ctx->filter->name); if (nb_pads > 1) - avio_printf(pb, ":%s", avfilter_pad_get_name(pads, inout->pad_idx)); - avio_w8(pb, 0); - avio_close_dyn_buf(pb, &res); + res = av_strdup(ctx->filter->name); + else + res = av_asprintf("%s:%s", ctx->filter->name, + avfilter_pad_get_name(pads, inout->pad_idx)); + if (!res) + exit_program(1); return res; }