From patchwork Fri Oct 11 16:29:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 15701 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 DCF7E4498B3 for ; Fri, 11 Oct 2019 19:30:06 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CC52F689721; Fri, 11 Oct 2019 19:30:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AECC068831D for ; Fri, 11 Oct 2019 19:30:00 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id r19so11058705wmh.2 for ; Fri, 11 Oct 2019 09:30:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=wk/I27+Bgj7tb+no1GagPLzc1IfYS5yuKaVIQqFCXo8=; b=Fy5Kp65ByUT3wMdBZMHWW1ngbRbVnh7EmDgowSftvEfpohvvdfjFQdXLTjgPL/Sia1 4cw0ZT+b43TPFjjQeegnDZm+qjvoyC3np6jg0j1OQDm37NPo//wzYsHfB7GXKB6V1/i1 u8dJ0DOZSmJakDFAqh6IW/fyeMEGcJxU8cy4LnZ5LUEizDC/45TnWCCu/9Iu5oCi5qS6 AARyw00g6E9KEQogbjYlLqgR3kIOVMCN74tZJY/5liwRc5cZMBC55XT5c1Yd9gz+6mWN kWtyzoG5ASDz0W+vuGj0iaCAODWm3O3xbysabmHahf5iyH50fcG9PbFh5lJIbkCmF84J Yo6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=wk/I27+Bgj7tb+no1GagPLzc1IfYS5yuKaVIQqFCXo8=; b=MYrXjBl4lPdShOg9B4uECJB26JrbC4KMPDXu0vKtqkuA2/uO9hT33GoEFhW9h2za4s IX02r97V990sgO+/3L2awMRsIICbtPAt8PMj6BHU6ZSzzbR7pMQbxKv7twXNchhtd59R omT+IHJ17sVO7yJucNzicAroj4fWakmsZinTdZ7n+jDa5upcm271W/KqPG+8N9+XL8p4 NKD6fj/4eiaP6GJNtIpT+euJv3jbZxAFA2A7H69kaDdFeUF12UDGSKl1uMvV2nORl++v wmij3jm0U3O1asaqYea3j+EVOBXc7Fr9dy/7FpG7AGEiZVuZEh1VF+IQZJa2jli+o5qj zcxw== X-Gm-Message-State: APjAAAVUVUfeXudplHqJAVZ5M7H8zUf43OURqPO7myLv0h0RAi0yakQH VAv2nlIizXV3JTtoB1uQVBUEtkfu X-Google-Smtp-Source: APXvYqx2Wa3/6ymmXrh96h5Y05m4vkJm6YnqUv1ZR+hBngtmJfo1EHopFahtd888YYgfc5uoPjrxPA== X-Received: by 2002:a1c:1dc9:: with SMTP id d192mr4157139wmd.51.1570811399973; Fri, 11 Oct 2019 09:29:59 -0700 (PDT) Received: from localhost.localdomain ([37.244.241.148]) by smtp.gmail.com with ESMTPSA id d15sm10732443wru.50.2019.10.11.09.29.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Oct 2019 09:29:59 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Oct 2019 18:29:46 +0200 Message-Id: <20191011162946.8644-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191011162946.8644-1-onemda@gmail.com> References: <20191011162946.8644-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/vf_geq: reindent 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavfilter/vf_geq.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c index b7932f0b04..5e052f8ccd 100644 --- a/libavfilter/vf_geq.c +++ b/libavfilter/vf_geq.c @@ -102,22 +102,22 @@ static inline double getpix(void *priv, double x, double y, int plane) return 0; if (geq->interpolation == INTERP_BILINEAR) { - xi = x = av_clipf(x, 0, w - 2); - yi = y = av_clipf(y, 0, h - 2); + xi = x = av_clipf(x, 0, w - 2); + yi = y = av_clipf(y, 0, h - 2); - x -= xi; - y -= yi; + x -= xi; + y -= yi; - if (geq->bps > 8) { - const uint16_t *src16 = (const uint16_t*)src; - linesize /= 2; + if (geq->bps > 8) { + const uint16_t *src16 = (const uint16_t*)src; + linesize /= 2; - return (1-y)*((1-x)*src16[xi + yi * linesize] + x*src16[xi + 1 + yi * linesize]) - + y *((1-x)*src16[xi + (yi+1) * linesize] + x*src16[xi + 1 + (yi+1) * linesize]); - } else { - return (1-y)*((1-x)*src[xi + yi * linesize] + x*src[xi + 1 + yi * linesize]) - + y *((1-x)*src[xi + (yi+1) * linesize] + x*src[xi + 1 + (yi+1) * linesize]); - } + return (1-y)*((1-x)*src16[xi + yi * linesize] + x*src16[xi + 1 + yi * linesize]) + + y *((1-x)*src16[xi + (yi+1) * linesize] + x*src16[xi + 1 + (yi+1) * linesize]); + } else { + return (1-y)*((1-x)*src[xi + yi * linesize] + x*src[xi + 1 + yi * linesize]) + + y *((1-x)*src[xi + (yi+1) * linesize] + x*src[xi + 1 + (yi+1) * linesize]); + } } else { xi = av_clipf(x, 0, w - 1); yi = av_clipf(y, 0, h - 1);