From patchwork Wed Nov 27 10:46:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16448 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 AA8C944AE55 for ; Wed, 27 Nov 2019 12:47:08 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8960F68ADE6; Wed, 27 Nov 2019 12:47:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B232668A297 for ; Wed, 27 Nov 2019 12:47:01 +0200 (EET) Received: by mail-pf1-f196.google.com with SMTP id 193so10769059pfc.13 for ; Wed, 27 Nov 2019 02:47:01 -0800 (PST) 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; bh=8/jdHRkIcO9wOxWiJRKYtl25tVlQkOswhRbSIW/FL/I=; b=bN0/yLObPPMX1fo1TZMqFTVyEY6eBc13secDHgOaQGtp4ZhFIBqObm8ldwtI7T6AQY Alyp72ryNJfHMYM05Cstxjk2SXl5YByQtWJIR8LBGHbnJ/wcGBWi6IeCMbFqpjmh60Fk +A0oNu34TrDRCXpPKfG1vyR/61B0vxd/UXiX2LEjOsi9dVTV20dPSfWPFwEPve3BwWrI puedxI5Oysv2QCCmN/J0n2hotxv004fpXnL9VGfqjdaEPmb01v9WM0SZswv4wf6oH8wi 8cmpd/GE6eJG7O2nquUNGlsM1c6/xTvgkdnTNPEbBTLKWqvQqN0dAf5kGbu2oltt4/Ff cwoQ== 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; bh=8/jdHRkIcO9wOxWiJRKYtl25tVlQkOswhRbSIW/FL/I=; b=XFdu8mWU2RBxZbNr0VwA6kabgt7nL7y3N9m5nh58GeDWJyNnkvqpjhxw6wxtQMJQpq QMNII/wpYW9IxPO2RWoczxXsfjpNDwkIXySzbICllpBZaJUokbOSRqVkQ18Psj4Yhbaz zy0H4m/v5mwErytEM/Z90z3K5E6llvcMUwRlS+3Ndc5+Qlq8CZnkRIa1TU+W+r+OPd03 jKOzHwRjARl1B6rPCQrn22r4HvgVt/B0CkjQjm0gYu9FNiiwk7JUxaGVRxJgle9sUAO7 S6ly0fyFcQ36Tkp4wsZTWifdReLd0kPrIkfS/BRm+MMJty7Ft9oi/kb4Mp81xStZPynI GK6A== X-Gm-Message-State: APjAAAXZY3bYTdnNecrDNhQeg9AHuQLhUQq+7mPXt4a9yS6LB6YoAZ5b VXQ/jen93VjWcDsQ1A+lTxxy/6nk X-Google-Smtp-Source: APXvYqxfXYTFApGqWI33L3YzHJ6WIkV3d8Qys2azzo/QSPuJD2/IHicMvkXANJVzIRtvOXWe4FKcYQ== X-Received: by 2002:a63:e60e:: with SMTP id g14mr4207819pgh.80.1574851619738; Wed, 27 Nov 2019 02:46:59 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id f59sm6364737pje.0.2019.11.27.02.46.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Nov 2019 02:46:59 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Nov 2019 18:46:51 +0800 Message-Id: <20191127104651.20314-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191127104651.20314-1-lance.lmwang@gmail.com> References: <20191127104651.20314-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 2/2] avfilter/vf_colorconstancy: av_frame_free(&in) in case of error or direct flag is false 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/vf_colorconstancy.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavfilter/vf_colorconstancy.c b/libavfilter/vf_colorconstancy.c index cc081e957f..9917d8993e 100644 --- a/libavfilter/vf_colorconstancy.c +++ b/libavfilter/vf_colorconstancy.c @@ -682,13 +682,16 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) AVFilterLink *outlink = ctx->outputs[0]; AVFrame *out; int ret; + int direct = 0; ret = illumination_estimation(ctx, in); if (ret) { + av_frame_free(&in); return ret; } if (av_frame_is_writable(in)) { + direct = 1; out = in; } else { out = ff_get_video_buffer(outlink, outlink->w, outlink->h); @@ -700,6 +703,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } chromatic_adaptation(ctx, in, out); + if (!direct) + av_frame_free(&in); + return ff_filter_frame(outlink, out); }