From patchwork Mon Jan 9 00:12:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 2131 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp6837280vsb; Sun, 8 Jan 2017 16:13:12 -0800 (PST) X-Received: by 10.28.168.12 with SMTP id r12mr3134567wme.57.1483920792500; Sun, 08 Jan 2017 16:13:12 -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 6si8700940wmq.165.2017.01.08.16.13.12; Sun, 08 Jan 2017 16:13:12 -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=@gmail.com; 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 dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8F1BC68A5EB; Mon, 9 Jan 2017 02:13:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f174.google.com (mail-pf0-f174.google.com [209.85.192.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49374680AF7 for ; Mon, 9 Jan 2017 02:12:56 +0200 (EET) Received: by mail-pf0-f174.google.com with SMTP id 189so13549304pfu.3 for ; Sun, 08 Jan 2017 16:13:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version; bh=gF3kF1i+djK343pcXb1Ec/oonAhOwsmsL9a5WfZZHxA=; b=i3wBNa1v0UyGKDgt+rmXhlc2tZgW8r9DFKsjagtCL4Ifyq5i5w56wmnYvYjAAaO6e+ 81umybL2083Tv69qGosQEcSaJJ9OLR6N++KJMmtWQM6bHVAqupHlVZd9VnIY8eQ8KlwT zi77+TmXLU/lenmN+RpAF/QPBYWndQJZ9bTs5tqNykrInWIDdC2dR5wHT6bW5icBgVMN ACYMz0adJprq8+MpLfgbILjTAEszppfBBJYpIV9d5nNkyJfof+yl1Hg8u0EXyYnxPYVD 2WD0KPx3pVd/lNJpM1EN3zTNYuPneIbKnk9Q6D+eMKLdyWKMH7a+Hay/5RBJYA8aOaG7 CHWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version; bh=gF3kF1i+djK343pcXb1Ec/oonAhOwsmsL9a5WfZZHxA=; b=nq4xgnlkbcHFK/OPCDkXN39Wk2tbZYZgamvTNZeCQ66skMW0elQ7ep0hL+2s8EmZcr LKjnvbxWLz3nPaSX7qJU+poMgO1sdy/1Uz9EhGZmFqhcTies4lHmiNcLlQ+r7Os3PbJZ x/bKt5WuWFgkP/Q5HYA7OX+3aV/Wsn/H6DQ7eV9M62VAkfiYvPBDKJwzS6Ox2bOekdPp PykJgVtVk0XNrUcKGObWx8D4nwR/CEwSXCp+f2WPtVOmpKUx51TkO5yWmPkMRCcGcXn2 jIVCxGGagDXScQ/8uHtHXi62YO0xNVHD+R55Xt82pB7mwUZNWIeKKiCA/0/4nJh/BV6F +Fqw== X-Gm-Message-State: AIkVDXJRrUXsBiDulPjGcBy7odvPapRrxLGi6CxNLXtewGXv0ZP4akktgjO+4Dv0MdVRQQ== X-Received: by 10.84.192.131 with SMTP id c3mr191571024pld.149.1483920781582; Sun, 08 Jan 2017 16:13:01 -0800 (PST) Received: from [10.239.204.194] ([192.55.54.44]) by smtp.gmail.com with ESMTPSA id r21sm30605617pfd.95.2017.01.08.16.13.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Jan 2017 16:13:01 -0800 (PST) To: FFmpeg development discussions and patches From: Jun Zhao Message-ID: <3cc5e343-fdd9-0ff4-3df2-dcdcad039750@gmail.com> Date: Mon, 9 Jan 2017 08:12:59 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 Content-Disposition: attachment; filename*0="0001-lavfi-remove-the-duplicate-expression-evaluation.patch" X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] lavfi: remove the duplicate expression evaluation. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From 80ea322e8bd634dbf93291f7a4d78bc87834c0a8 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Sun, 8 Jan 2017 14:26:39 +0800 Subject: [PATCH] lavfi: remove the duplicate expression evaluation. remove the duplicate expression evaluation in crop/drawtext/overlay. Signed-off-by: Jun Zhao --- libavfilter/vf_crop.c | 1 - libavfilter/vf_drawtext.c | 1 - libavfilter/vf_overlay.c | 1 - 3 files changed, 3 deletions(-) diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c index 85ea892..4a032d1 100644 --- a/libavfilter/vf_crop.c +++ b/libavfilter/vf_crop.c @@ -262,7 +262,6 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame) NAN : av_frame_get_pkt_pos(frame); s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, NULL); s->var_values[VAR_Y] = av_expr_eval(s->y_pexpr, s->var_values, NULL); - s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, NULL); normalize_double(&s->x, s->var_values[VAR_X]); normalize_double(&s->y, s->var_values[VAR_Y]); diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 649240b..a485362 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -1288,7 +1288,6 @@ static int draw_text(AVFilterContext *ctx, AVFrame *frame, s->x = s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, &s->prng); s->y = s->var_values[VAR_Y] = av_expr_eval(s->y_pexpr, s->var_values, &s->prng); - s->x = s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, &s->prng); update_alpha(s); update_color_with_alpha(s, &fontcolor , s->fontcolor ); diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index 108a6fc..ea5889e 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -159,7 +159,6 @@ static void eval_expr(AVFilterContext *ctx) s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, NULL); s->var_values[VAR_Y] = av_expr_eval(s->y_pexpr, s->var_values, NULL); - s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, NULL); s->x = normalize_xy(s->var_values[VAR_X], s->hsub); s->y = normalize_xy(s->var_values[VAR_Y], s->vsub); }