From patchwork Tue Aug 25 14:09:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21922 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 7DBF044B5DF for ; Tue, 25 Aug 2020 17:18:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 602F968ACE4; Tue, 25 Aug 2020 17:18:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 607B168A79B for ; Tue, 25 Aug 2020 17:17:58 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id r15so12854159wrp.13 for ; Tue, 25 Aug 2020 07:17:58 -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=VwZVdvUIEuel3ogR2g2VCGkjx6eF5qjbmM25DB3WUOI=; b=fUQLOWG+Vc0+7FqHc9c67OH/wehXgdza+cJJ0ERhQhpkXqFMDQYshj+KakbfhB2E3D HEYNAy/QJ9wrgdudNwptdsYqnDkO9clpgH3+MeTKOH2/sq7bd7mTQ9bsdAzGOuMbPnvm c1WPB1jJ6h8QiX2q3x+uYaA4zsTQtfc6aPh8/DwTOfMga/nJQYOKgUVvvN2GMa/a1aSv YBWTz7iAouuwoykXophluW+svCjZPjzFI5KRyzKDtbIUbZDrwxih9+Lww6dihTLusAPO Un2siyjZ+K85+DAEgWGhtw0mhSruYKjWWjwxZ2JDCgYGRUGDbLVAaSD/y8+OPe/BL9wX zedg== 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=VwZVdvUIEuel3ogR2g2VCGkjx6eF5qjbmM25DB3WUOI=; b=I9jdmuNTPsosn/4DLi4Im9Ss/HGAeNODDd85VuV+j5zIQt6I5SApBCWrwRHmNBCNFo OsSXCRGFWMZqCNGT31V4H+dVk5P8V7jd8AB6dZypATWlTWZ3YwaO/3jsbwlh+ulWlHC9 XA1NMC5dTbjI77TDnbHSPpk9QgjcupgSj7wI6bEJsMl8UGoKSI5fvqW8yXOPDvR4/NPo II7YZKaySWeGWIZrcRl+ooPjf4bZmI+7yMP9EhBRfsKlbg/3BD3GZ3kSempT5Tgh+95J SbwfeI9YwY72o0jVAB7fmk20w7OiYDEFAM0uRkPw8Sux1oteepWtHfMy7hx2wHKHk/Bf KQxQ== X-Gm-Message-State: AOAM5322Z23L05DLn3j+iW3Llswi/4Y6EXEnoBQflursI0a9u4kXLL19 Q0WrdNPJUoWYwyQPsFsxj1VlhBF2JBc= X-Google-Smtp-Source: ABdhPJwl4RSuvQwodq8Dx4SE6+yK4QE0FZTJe2AlGz0+qjCUfO5yf+x5mzNcfRhjobDw1aktF57UCQ== X-Received: by 2002:a50:bac2:: with SMTP id x60mr10691413ede.210.1598364611658; Tue, 25 Aug 2020 07:10:11 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 07:10:11 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Aug 2020 16:09:14 +0200 Message-Id: <20200825140927.16433-6-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 06/19] avfilter/vf_decimate: 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_decimate.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/libavfilter/vf_decimate.c b/libavfilter/vf_decimate.c index 88a8b38a58..549b281418 100644 --- a/libavfilter/vf_decimate.c +++ b/libavfilter/vf_decimate.c @@ -273,29 +273,21 @@ static av_cold int decimate_init(AVFilterContext *ctx) { DecimateContext *dm = ctx->priv; AVFilterPad pad = { - .name = av_strdup("main"), + .name = "main", .type = AVMEDIA_TYPE_VIDEO, .filter_frame = filter_frame, .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 (dm->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 ((dm->blockx & (dm->blockx - 1)) || @@ -326,8 +318,6 @@ static av_cold void decimate_uninit(AVFilterContext *ctx) av_frame_free(&dm->clean_src[i]); } av_freep(&dm->clean_src); - for (i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); } static int request_inlink(AVFilterContext *ctx, int lid)