From patchwork Wed Jun 27 09:44:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 9519 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp622667jad; Wed, 27 Jun 2018 02:52:05 -0700 (PDT) X-Google-Smtp-Source: AAOMgpejFCHWO47LSGfYatWvhb0DxNakiCqcBjoKcleKJ/e0o/da5EXzWCFecu/IsKyr5aR4TdM7 X-Received: by 2002:a1c:5a08:: with SMTP id o8-v6mr4189618wmb.61.1530093125704; Wed, 27 Jun 2018 02:52:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530093125; cv=none; d=google.com; s=arc-20160816; b=TvFdKEN1RsbzcRG8+YAPA12DMaAQuHkNXAklgd8Zdju8zdeymOYQqnM5ch1AP9fmau B4BMPjyLvRcWlPNq7m5BNDELBdepn/TUjUjJphv6qHzGSoLIZwDipyowmmfDxxV/5nrU S9wGMfkkbbX0etikSiYGVUQ1pI9O8dhTqg2LF9L6hXJp3MdlqgGlLRjWxGOl5Wjo6Bxo RYviGlQB6BtPmjzVB0ht9E6p2mtYPHJ7z40NnCabePpL7C8tbbjJNu6sHYkGr3ZX1SE2 +Kws2SP4D14coxy/mvFIwgAkaHAngu8dXs738fP0xQ/NX5KwOL/j/5nuiVqaBUN/Mtzx 7zmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=kQsxWD2VEsXbl+IdMCfGjMBhPAAiVckqZeyFu9Z1fR8=; b=EC2I0kzA9fGdfGs7ZAUSEbVq5+gJlJkERNX/e/5whGQDY2KTOy9siIPkLmigVQiwte 0911qO8dyBtO3aQSdbB7c8gDeIvjmk4gY5uZcqwaB9LdkbsF1B+bk4o4RS+nXiw8Ne7h FfGgizMYVU+Vy+RDGwGL4JmVY8z5WHkFfOT8bqxH4GwbYiE99mGu8pTHq6VkAmrGuWlA YN0yywxx5Efb5uM1P4T/jKg2UAvEGbvAN8yGAjtfoZolzdbhvrgp8vJkjSw5VYWDPCxd szF2EFiAyF8WfRPNL9nwkSEUTf1XOpunffT5IT9+afs1ie7F55Ef/nW56ReNSk5ET/cD yQjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NsomfJmL; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k12-v6si4145954wrg.375.2018.06.27.02.52.04; Wed, 27 Jun 2018 02:52:05 -0700 (PDT) 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 header.s=20161025 header.b=NsomfJmL; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C9EF568A507; Wed, 27 Jun 2018 12:52:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f49.google.com (mail-pl0-f49.google.com [209.85.160.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8579068A449 for ; Wed, 27 Jun 2018 12:51:54 +0300 (EEST) Received: by mail-pl0-f49.google.com with SMTP id k1-v6so798108plt.2 for ; Wed, 27 Jun 2018 02:51:55 -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; bh=ynGTYGIicwscQQYhZcJRoCKPUVbpEoreDlCaMunUySw=; b=NsomfJmLlk4f7ffzirbhemBLOBaKy/i+cFiZQcuXIa9rx+Nu098Q029e/dLUlDKbl0 lm/z0cBx0JZe/sIPAbC7WocHWG4pRUlEhJKhfdWTIofgafhTI94swuTOBvOqPbx12HNW jJInErVyeTcxVhU5bgFmYK78s9OG+qDYPW8E9HWFsTw8U0p1nrMlaFXuFJslJofhSUER eCWPszTnWLvDnxBqtP+RUgl8biZaKjA0q1b27eUQ2dgLFbNNx0QGyN37r1BdLQmxGnkx BiVoBWJBiUNclrrbGIMLJtMATTQsIGDVzFCVz+dMlz6H92Z8NXycgXZdrTFxdeAc6B3l WhcA== 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; bh=ynGTYGIicwscQQYhZcJRoCKPUVbpEoreDlCaMunUySw=; b=gB9vHj7pyyQyvhERnN23QyQjBQNvNmR8mcThg8oLSn9sIWlYSH2wDY3/T1NAjU8iWU EEMXYkfZUGXjY9O1JZFPGhqbXlIIvQ1QOegiSsNL2fS+8xQ/QhlxnhgBsVQPvAaJ/ejD uWl221MzrSU2u3E05csEd9cVHToZD+i42SMm9CBIVhmGPdxCti47OL1omo3YgJtsIGmt oBpzAqy4Je34h7u2Wq2sD5rnHMgyMsgE8wXplS2ijo3uQZXXLxKDZwFnMWuXUNpbStds fKJpeygTxbsNO6NxzgQxA2vckmpsUMqaG+k0kiv6zFXFn+QzP7F++q0t10ZlcDa5JlFG NMbQ== X-Gm-Message-State: APt69E3sXvra1eELBIlhPGGZT6PKg/nhP4sbmCoSg10+M3p1YTiE2yfo XNzWrk1zW1B26Qc3w1LLPlTy+Q== X-Received: by 2002:a17:902:74c9:: with SMTP id f9-v6mr5400565plt.7.1530092689665; Wed, 27 Jun 2018 02:44:49 -0700 (PDT) Received: from localhost.localdomain ([47.88.54.25]) by smtp.gmail.com with ESMTPSA id k12-v6sm5821294pff.31.2018.06.27.02.44.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Jun 2018 02:44:49 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Jun 2018 17:44:41 +0800 Message-Id: <1530092681-31230-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH] lavfi/minterpolate: fix blending calc issue. 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" the right blending calc is: (alpha * Frame_2 + (MAX - alpha) * Frame_1 + 512) >> 10 Signed-off-by: Jun Zhao --- libavfilter/vf_minterpolate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_minterpolate.c b/libavfilter/vf_minterpolate.c index d534315..c6a5e63 100644 --- a/libavfilter/vf_minterpolate.c +++ b/libavfilter/vf_minterpolate.c @@ -1122,8 +1122,8 @@ static void interpolate(AVFilterLink *inlink, AVFrame *avf_out) for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { avf_out->data[plane][x + y * avf_out->linesize[plane]] = - alpha * mi_ctx->frames[2].avf->data[plane][x + y * mi_ctx->frames[2].avf->linesize[plane]] + - ((ALPHA_MAX - alpha) * mi_ctx->frames[1].avf->data[plane][x + y * mi_ctx->frames[1].avf->linesize[plane]] + 512) >> 10; + (alpha * mi_ctx->frames[2].avf->data[plane][x + y * mi_ctx->frames[2].avf->linesize[plane]] + + (ALPHA_MAX - alpha) * mi_ctx->frames[1].avf->data[plane][x + y * mi_ctx->frames[1].avf->linesize[plane]] + 512) >> 10; } } }