From patchwork Tue Jun 14 14:39:49 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: 36221 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp1113403pzb; Tue, 14 Jun 2022 07:40:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwwoi+qV1Gd7Ne/Ng0OzFWvZqfPykDEZcl/uco+dXOfQ6IKGfoucsVF5qWhujArollWHDZ9 X-Received: by 2002:a17:907:1620:b0:711:da21:d836 with SMTP id hb32-20020a170907162000b00711da21d836mr4758517ejc.427.1655217599745; Tue, 14 Jun 2022 07:39:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655217599; cv=none; d=google.com; s=arc-20160816; b=UDjKR+5xgLSX68tfKnWKBA7oI7lnmW2Vq53dKELAWwKdGIehnDq94aUCqyx1u0XDGD JlbOikLluqfgtun98/CvE22DdHdhXVIQcY6B7JT9UE0nuHCXKkpEEnNBfW+p/xvETbHU RPJ8UlYO/U3qG/V8H1LDfCVNQZvvoqL41Tf4YPHztGLMpb5dxyoI/ATpKUgUKUtzDFBR jWp/oB166BX5ne6be4+GIW14KOOhFi3HtjELtosuj35PTmdb67z6qWAMyQDu0IGShAvA 105VvFhbMS3SVBETNp3i5ZSSmusMbrHh4n084IFFO8loaSegin/+MN3QD2vjiI9MFNbh HH6g== 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:dkim-signature:dkim-signature:delivered-to; bh=9NT04fgw2oBQIMy01z6ciKcJWWolbqDhCWU6wUE4KqY=; b=Gw4tKnjHTJd/FgvLVAy6hJd4jP2DxKzQxU/w/vyncpstnUHkzdRDuTdq995cvXbv/p cB0SRZIBWAvsf4mpw83n9sOZ+VWj0HDt834K4vhbAYBF6ddsYVp7xMnDDmWn8J+bD+JD C+2WeEYoqfhRmMyY7IZfBikvlvnbIGOMV5sx4a7QK3fx0xiPOq1AnCUor6y6dO9CVvpu OgQO3FzTicSiW+EqN5U+GYXqsKfl7y2dvG4vXVAJUne1jOsjxAD0jPxKzDcRlZiqX4BJ lmBW4d6972OsWMnNib2Ka62gcjylGXeif33BedPoJJKCsIspl3cpc7y+NTcJX9rP3noX TzTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@acc.umu.se header.s=mail1 header.b=GYGxTbJs; dkim=neutral (body hash did not verify) header.i=@acc.umu.se header.s=mail1 header.b="aE/JBFdR"; 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=NONE dis=NONE) header.from=acc.umu.se Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u25-20020aa7d999000000b0042dcbb47403si11082598eds.116.2022.06.14.07.39.59; Tue, 14 Jun 2022 07:39:59 -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=@acc.umu.se header.s=mail1 header.b=GYGxTbJs; dkim=neutral (body hash did not verify) header.i=@acc.umu.se header.s=mail1 header.b="aE/JBFdR"; 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=NONE dis=NONE) header.from=acc.umu.se Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4520768B679; Tue, 14 Jun 2022 17:39:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.acc.umu.se (mail.acc.umu.se [130.239.18.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCF1C68B64E for ; Tue, 14 Jun 2022 17:39:50 +0300 (EEST) Received: from localhost (localhost.localdomain [127.0.0.1]) by amavisd-new (Postfix) with ESMTP id 73C0E44DCB for ; Tue, 14 Jun 2022 16:39:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=acc.umu.se; s=mail1; t=1655217590; bh=zWozmcwP7VslEJ4VD62UGCno6sD7ARMbG98MptK9VXk=; h=Subject:From:To:Date:In-Reply-To:References:From; b=GYGxTbJsUMNiGFg1CYCfXQ/INhX/cntqYQRaF8RKBmfSJFA6IlYSnc2wO/GA+2Q7r UBmf/daRuS7qI32sIaeWph9m4AdkgiW0G0mpb60alJ6rKr1dBMXzMAagAf+bylSR5J IItbhzb8IWLj7lhe/7+J3/It/AsnwbryuWws8iSs9WQFPrSBEBDD1DHax6LEgcHpGN nZrT2SKBMvcvSbvVTfqBJdlmkvKA3hNB7idQGQ7MA7IogD4RUdoTINVK17wDy7+XbN w3IMAKvNRDTGt5h8m9GuQIadcQma1/U9QNgXnhSr8PsT+gNAATWCoKiIjZo+voCGSc hc9ALNLhWd9aQ== Received: from debian.lan (unknown [IPv6:2a00:66c0:a::72c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: tjoppen) by mail.acc.umu.se (Postfix) with ESMTPSA id DF4ED44DC6 for ; Tue, 14 Jun 2022 16:39:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=acc.umu.se; s=mail1; t=1655217589; bh=zWozmcwP7VslEJ4VD62UGCno6sD7ARMbG98MptK9VXk=; h=Subject:From:To:Date:In-Reply-To:References:From; b=aE/JBFdRXa9/gp6c66ZkLdWVVthEeAL1+ph/5x9X8BEoQ6cJCuY3q/xku7BtdicP8 1qOzLZOriMF7B3NhuxyVVgJaSw5otuGzPRe64h8p4ATzrBlwo3kmymxhjgmfU10Sua V0OvIQAG8cPAF8tczF2mYVKW79vH9jqzSZatBHxq7W0ua7vNUs2Ega8ag+1EYkM0o/ E6NTFQZ6YsoP0MIJ/Zu5bXNZD5/T8KQjBAhsbAXq+EfQ1WVACQnS1XgV18E4YaHtt1 vttEDG3uqP5FglMPYtoXz1HPMHH8tjg4VLUSm365XS22adFvP+lNTHKo/41uy2zqbS Z+2vM/s8rOmsQ== Message-ID: <7c5f93f13cb4bc37da1d3f0fc7cad39d39c540bf.camel@acc.umu.se> From: Tomas =?iso-8859-1?q?H=E4rdin?= To: FFmpeg development discussions and patches Date: Tue, 14 Jun 2022 16:39:49 +0200 In-Reply-To: <10ec51ef44325c2de6d5de7b994a9b6c8eb5e3a2.camel@acc.umu.se> References: <10ec51ef44325c2de6d5de7b994a9b6c8eb5e3a2.camel@acc.umu.se> User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/13] 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: gZCrkNvDG4LG From 86c30e327e1eb8ba913d74d5394ea90a87b55a69 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/13] 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 d9754fc50e..9d3d406870 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1969,26 +1969,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