[FFmpeg-devel,02/13] lavc/jpeg2000dec: Reindent

Message ID	7c5f93f13cb4bc37da1d3f0fc7cad39d39c540bf.camel@acc.umu.se
State	New
Headers	show Delivered-To: ffmpegpatchwork2@gmail.com 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; sender: tjoppen) by mail.acc.umu.se (Postfix) with ESMTPSA id DF4ED44DC6 for <ffmpeg-devel@ffmpeg.org>; Tue, 14 Jun 2022 16:39:49 +0200 (CEST) Message-ID: <7c5f93f13cb4bc37da1d3f0fc7cad39d39c540bf.camel@acc.umu.se> From: Tomas =?iso-8859-1?q?H=E4rdin?= <tjoppen@acc.umu.se> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Date: Tue, 14 Jun 2022 16:39:49 +0200 In-Reply-To: <10ec51ef44325c2de6d5de7b994a9b6c8eb5e3a2.camel@acc.umu.se> References: <10ec51ef44325c2de6d5de7b994a9b6c8eb5e3a2.camel@acc.umu.se> Content-Type: multipart/mixed; boundary="=-O4WBWF59cnoMpwC3/SLW" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/13] lavc/jpeg2000dec: Reindent Precedence: list Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Series	[FFmpeg-devel,01/13] lavc/jpeg2000dec: Finer granularity threading \| expand [FFmpeg-devel,01/13] lavc/jpeg2000dec: Finer granularity threading [FFmpeg-devel,02/13] lavc/jpeg2000dec: Reindent [FFmpeg-devel,03/13] lavc/jpeg2000dwt: Implement sliced transforms [FFmpeg-devel,04/13] lavc/jpeg2000dec: Implement IDWT slicing [FFmpeg-devel,05/13] lavc/jpeg2000dec: Thread init_tile() [FFmpeg-devel,06/13] lavu/mem: Add ff_fast_recalloc() [FFmpeg-devel,07/13] lavc/jpeg2000*: Use ff_fast_recalloc() to eliminate lots of allocations [FFmpeg-devel,08/13] lavc/jpeg2000: Switch Jpeg2000TgtNode to int32_t parent [FFmpeg-devel,09/13] lavc/jpeg2000: Speed up ff_jpeg2000_tag_tree_init() using stereotypes for size… [FFmpeg-devel,10/13] lavc/jpeg2000: Reindent [FFmpeg-devel,11/13] lavc/jpeg2000: Minimize calls to av_codec_is_encoder() [FFmpeg-devel,12/13] lavc/jpeg2000dec: Use coarser slicing for initial reslevels [FFmpeg-devel,13/13] lavc/jpeg2000dec: Component-level threading of write_frame()

Message ID

7c5f93f13cb4bc37da1d3f0fc7cad39d39c540bf.camel@acc.umu.se

State

New

Headers

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;
Message-ID: <7c5f93f13cb4bc37da1d3f0fc7cad39d39c540bf.camel@acc.umu.se>
From: Tomas =?iso-8859-1?q?H=E4rdin?= <tjoppen@acc.umu.se>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Date: Tue, 14 Jun 2022 16:39:49 +0200
In-Reply-To: <10ec51ef44325c2de6d5de7b994a9b6c8eb5e3a2.camel@acc.umu.se>
References: <10ec51ef44325c2de6d5de7b994a9b6c8eb5e3a2.camel@acc.umu.se>
Content-Type: multipart/mixed; boundary="=-O4WBWF59cnoMpwC3/SLW"
User-Agent: Evolution 3.38.3-1 
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH 02/13] lavc/jpeg2000dec: Reindent
Precedence: list
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>

Series

[FFmpeg-devel,01/13] lavc/jpeg2000dec: Finer granularity threading | expand

Context	Check	Description
andriy/configure_x86	warning	Failed to apply patch

Context

Check

Description

andriy/configure_x86

warning

Failed to apply patch

Commit Message

Tomas Härdin June 14, 2022, 2:39 p.m. UTC

From 86c30e327e1eb8ba913d74d5394ea90a87b55a69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= <git@haerdin.se>
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<<codsty->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

[FFmpeg-devel,02/13] lavc/jpeg2000dec: Reindent

Checks

Commit Message

Patch