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

Message ID	2d15f1c2d49261ae16970f5eaf87c983b87407ef.camel@haerdin.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; Message-ID: <2d15f1c2d49261ae16970f5eaf87c983b87407ef.camel@haerdin.se> From: Tomas =?iso-8859-1?q?H=E4rdin?= <git@haerdin.se> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Date: Wed, 28 Sep 2022 12:05:11 +0200 In-Reply-To: <65e79fe701374868bb2f4b70ce8fd220938e2e86.camel@haerdin.se> References: <65e79fe701374868bb2f4b70ce8fd220938e2e86.camel@haerdin.se> Content-Type: multipart/mixed; boundary="=-fY++OTJhxJ08aDSFfdjF" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/11] 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/11] lavc/jpeg2000dec: Finer granularity threading \| expand [FFmpeg-devel,01/11] lavc/jpeg2000dec: Finer granularity threading [FFmpeg-devel,02/11] lavc/jpeg2000dec: Reindent [FFmpeg-devel,03/11] lavc/jpeg2000dwt: Implement sliced transforms [FFmpeg-devel,04/11] lavc/jpeg2000dec: Thread init_tile() [FFmpeg-devel,05/11] lavc/jpeg2000*: Use av_realloc_array_reuse() and av_reallocz_array_reuse() to … [FFmpeg-devel,06/11] lavc/jpeg2000: Switch Jpeg2000TgtNode to int32_t parent [FFmpeg-devel,07/11] lavc/jpeg2000: Speed up ff_jpeg2000_tag_tree_init() using stereotypes for size… [FFmpeg-devel,08/11] lavc/jpeg2000: Reindent [FFmpeg-devel,09/11] lavc/jpeg2000: Minimize calls to av_codec_is_encoder() [FFmpeg-devel,11/11] lavc/jpeg2000dec: Component-level threading of write_frame()

Message ID

2d15f1c2d49261ae16970f5eaf87c983b87407ef.camel@haerdin.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: <2d15f1c2d49261ae16970f5eaf87c983b87407ef.camel@haerdin.se>
From: Tomas =?iso-8859-1?q?H=E4rdin?= <git@haerdin.se>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Date: Wed, 28 Sep 2022 12:05:11 +0200
In-Reply-To: <65e79fe701374868bb2f4b70ce8fd220938e2e86.camel@haerdin.se>
References: <65e79fe701374868bb2f4b70ce8fd220938e2e86.camel@haerdin.se>
Content-Type: multipart/mixed; boundary="=-fY++OTJhxJ08aDSFfdjF"
User-Agent: Evolution 3.38.3-1 
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH 02/11] 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/11] 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 Sept. 28, 2022, 10:05 a.m. UTC

From 99e9b6cf421538dee6e0280daf3d1ffc71c1acda 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/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<<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/11] lavc/jpeg2000dec: Reindent

Checks

Commit Message

Patch