From patchwork Tue Aug 25 14:09:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21910 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 35C7E44B6CA for ; Tue, 25 Aug 2020 17:10:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 22B9568AC48; Tue, 25 Aug 2020 17:10:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f68.google.com (mail-ej1-f68.google.com [209.85.218.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A9D1268A8F3 for ; Tue, 25 Aug 2020 17:10:11 +0300 (EEST) Received: by mail-ej1-f68.google.com with SMTP id m22so16692630eje.10 for ; Tue, 25 Aug 2020 07:10:11 -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=yMMjMxgFgO5dCeL8hcjdG7YjRFc11ksEVusHHtANIVc=; b=jVOBLry2pIPEEQfMulg9xfL78DJwsUaFPr2bMflDIrLBtSmdH5+7w9yKQF1BzL5Ukm uQV7DNPYanA9CY3CanZKXOhU4mQ0TUyp38DNu4J2eawngYIXCW8r/A2qkurG9OKTHkvd RaMRlq52ZCKE/ye7EU4Ur28ebgiRB/zXhaNaRs/M7VUhuzxggy943XYUM84YWM2h+Zfm y+RHsEEn9DZxBkdyv7Gz/mqsfSjKv4MZoECnRzB1i+y9JfllACQQr/oE1/c4bwgnZ7+3 Og8ZvZ//l0ulUQxQOXEDEgx09d1bkGtDs3jZw0yvi3HKWnYawjwPmrK2CVv9V0+yjUpr rX6w== 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=yMMjMxgFgO5dCeL8hcjdG7YjRFc11ksEVusHHtANIVc=; b=MlhmXcTImN3gpdQFZQGe9vU0bJIh3lUAWQ4amJkwHsZoiq+3tTMqPutzNHD2f/UF9z /PP427z3evbzLnRvitY8hrRyYEHX+69e/PM110L8WY08lSdUHScEyixCmQmgt6XwwOXU 5CDkrLe6JaPCbW282rCcqMZN8vHcxAMBgz3B1AKja27HChLeK+I5wpscSlnRSJKMsv9W Uwy2m9R53V0fSvqmzYh/r8x06ToaF27vUSPI+2/IPnZic2xLm4QRdrv7eMT++1VWQguQ OBQRUZzHtDxg/MBLsDW580X54oBpxDd8Pt/9GdMkz83T6apgO+FcLTJbeWG5iQn+CA4l Fg5w== X-Gm-Message-State: AOAM531qraKJqgu5ruQbIRHwy46HW+7FUM7qlo4I6zAEIoOIPadK54Em t1a82a0Q2NTrCPyGldzVRKjmLihf+CI= X-Google-Smtp-Source: ABdhPJwXzdrye3IM1XX4E/gdQuOWeDxGK7JicZsRF8e4+wakDWLD1y0N1D31ZIFzDMS0tPx6PGfFJw== X-Received: by 2002:a17:906:c10c:: with SMTP id do12mr7230406ejc.92.1598364610764; Tue, 25 Aug 2020 07:10:10 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id k25sm10169806edx.96.2020.08.25.07.10.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 07:10:10 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Aug 2020 16:09:13 +0200 Message-Id: <20200825140927.16433-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200825140927.16433-1-andreas.rheinhardt@gmail.com> References: <20200825140927.16433-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/19] avfilter/vf_fieldmatch: Don't allocate inpad names 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" These names are always the same, so not using duplicates saves allocations, checks for the allocations as well as frees. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_fieldmatch.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/libavfilter/vf_fieldmatch.c b/libavfilter/vf_fieldmatch.c index fa4aa8239c..7fcad18caf 100644 --- a/libavfilter/vf_fieldmatch.c +++ b/libavfilter/vf_fieldmatch.c @@ -964,28 +964,20 @@ static av_cold int fieldmatch_init(AVFilterContext *ctx) { const FieldMatchContext *fm = ctx->priv; AVFilterPad pad = { - .name = av_strdup("main"), + .name = "main", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_input, }; int ret; - if (!pad.name) - return AVERROR(ENOMEM); - if ((ret = ff_insert_inpad(ctx, INPUT_MAIN, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_insert_inpad(ctx, INPUT_MAIN, &pad)) < 0) return ret; - } if (fm->ppsrc) { - pad.name = av_strdup("clean_src"); + pad.name = "clean_src"; pad.config_props = NULL; - if (!pad.name) - return AVERROR(ENOMEM); - if ((ret = ff_insert_inpad(ctx, INPUT_CLEANSRC, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_insert_inpad(ctx, INPUT_CLEANSRC, &pad)) < 0) return ret; - } } if ((fm->blockx & (fm->blockx - 1)) || @@ -1004,7 +996,6 @@ static av_cold int fieldmatch_init(AVFilterContext *ctx) static av_cold void fieldmatch_uninit(AVFilterContext *ctx) { - int i; FieldMatchContext *fm = ctx->priv; if (fm->prv != fm->src) @@ -1021,8 +1012,6 @@ static av_cold void fieldmatch_uninit(AVFilterContext *ctx) av_freep(&fm->cmask_data[0]); av_freep(&fm->tbuffer); av_freep(&fm->c_array); - for (i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); } static int config_output(AVFilterLink *outlink)