From patchwork Wed Sep 28 10:05:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Tomas_H=C3=A4rdin?= X-Patchwork-Id: 38417 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp98188pzh; Wed, 28 Sep 2022 03:05:38 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5oc1a/WDW+zQQDkywlTDm/UnszYWpOOJv6VaPxh5T6sz1AYs6UEE59cFWceV/31tcQoXJW X-Received: by 2002:a05:6402:5290:b0:453:5942:4ef8 with SMTP id en16-20020a056402529000b0045359424ef8mr32910827edb.180.1664359538281; Wed, 28 Sep 2022 03:05:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664359538; cv=none; d=google.com; s=arc-20160816; b=qcyBAWp79zyz3dwbS9Sce+pc2qsbg4Z6lDscJwg8OGWVkQVE128YvqPaJ8OsB7Pb8B 6CaRf+zy4Yr7zKJ93q1nxDyRkHOrRblcig5WaOnb2reClzlfFsOAyzelhuqDPm5qaeZo PuIC/jXLDWG2OJzxO+SIbKWkEcf0hFrxl2/R2ZN447VbxpRCoVlrj/ClNPqIB9aVw9Y8 D57j4i5KE3LCkrvqN+s9u0B/qT/vEfp3f2thKfmuHrpV8OWdZo4fjJsG60D3URdqQ8Ad IgRUa9K9Px7QKeVhzlEcPdidlzRZwNDd1gAtXC7HwoWHNmohX018mUV03xSvzwy5ZgtX nDOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:user-agent:references:in-reply-to:date:to:from :message-id:delivered-to; bh=xiBTpBdBuciW7M+r304Rp++kD3f1l1SQ1yY87wAXgLI=; b=mkKtSgi7NkEOCdkOG/UHdwtfBGLReYs4IofiDUZRwZS+nmi0mojSJVoYp5XWuQXvtB EGjyMpQlV5XAAUuRQfTwe5Y2NZuLUuWURvASslymDfmTJ9P2tjnxm2C7r5RTlUhSLMBg 3pNY27c3V/Gxc75W37s+L0I3ZU/fz3GOmkNYHVelNrZgOIYw9H7o9Pn7Rf0Qh1/+4c/G QVVwU8Tle6jeKhyrdj+rnPhtTKiF5PK6Ov8YFCUHWEdqOEkO7XXUCyZuU0PyyPRMzOrX Qq0MmiXd7vVV6MKZmrRqXHQYUfEt4ec3ASbZZye935S8xp9Bm66+JORQ3B02EcTGuQFZ EAew== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j17-20020a05640211d100b0044f01473b5bsi6095122edw.205.2022.09.28.03.05.21; Wed, 28 Sep 2022 03:05:38 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BEF7C68BC10; Wed, 28 Sep 2022 13:05:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.frobbit.se (mail.frobbit.se [85.30.129.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1251668BC09 for ; Wed, 28 Sep 2022 13:05:13 +0300 (EEST) Received: from debian.lan (unknown [IPv6:2a00:66c0:a::72c]) by mail.frobbit.se (Postfix) with ESMTPSA id 90D492093D for ; Wed, 28 Sep 2022 12:05:12 +0200 (CEST) Message-ID: <2d15f1c2d49261ae16970f5eaf87c983b87407ef.camel@haerdin.se> From: Tomas =?iso-8859-1?q?H=E4rdin?= To: FFmpeg development discussions and patches Date: Wed, 28 Sep 2022 12:05:11 +0200 In-Reply-To: <65e79fe701374868bb2f4b70ce8fd220938e2e86.camel@haerdin.se> References: <65e79fe701374868bb2f4b70ce8fd220938e2e86.camel@haerdin.se> User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/11] lavc/jpeg2000dec: Reindent X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 3gprpnDsxm20 From 99e9b6cf421538dee6e0280daf3d1ffc71c1acda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= Date: Fri, 10 Jun 2022 14:12:11 +0200 Subject: [PATCH 02/11] lavc/jpeg2000dec: Reindent --- libavcodec/jpeg2000dec.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index e823ae58ec..92bd76d90f 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1973,26 +1973,26 @@ static int jpeg2000_decode_cb(AVCodecContext *avctx, void *td, t1.stride = (1<log2_cblk_width) + 2; cb->coded = 0; - ret = decode_cblk(s, codsty, &t1, cblk, - cblk->coord[0][1] - cblk->coord[0][0], - cblk->coord[1][1] - cblk->coord[1][0], - bandpos, comp->roi_shift); - if (ret) - cb->coded = 1; - else - return 0; + ret = decode_cblk(s, codsty, &t1, cblk, + cblk->coord[0][1] - cblk->coord[0][0], + cblk->coord[1][1] - cblk->coord[1][0], + bandpos, comp->roi_shift); + if (ret) + cb->coded = 1; + else + return 0; - x = cblk->coord[0][0] - band->coord[0][0]; - y = cblk->coord[1][0] - band->coord[1][0]; + x = cblk->coord[0][0] - band->coord[0][0]; + y = cblk->coord[1][0] - band->coord[1][0]; - if (comp->roi_shift) - roi_scale_cblk(cblk, comp, &t1); - if (codsty->transform == FF_DWT97) - dequantization_float(x, y, cblk, comp, &t1, band); - else if (codsty->transform == FF_DWT97_INT) - dequantization_int_97(x, y, cblk, comp, &t1, band); - else - dequantization_int(x, y, cblk, comp, &t1, band); + if (comp->roi_shift) + roi_scale_cblk(cblk, comp, &t1); + if (codsty->transform == FF_DWT97) + dequantization_float(x, y, cblk, comp, &t1, band); + else if (codsty->transform == FF_DWT97_INT) + dequantization_int_97(x, y, cblk, comp, &t1, band); + else + dequantization_int(x, y, cblk, comp, &t1, band); return 0; } -- 2.30.2