From 497d58c1ee9980213ec99c0f8d42627e7307c0e5 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 13 Nov 2024 17:26:11 +0100 Subject: [PATCH 1/2] Do not turn on 'TPsot==TNsot detection fix' when TNsot==1, and add a OPJ_DPARAMETERS_DISABLE_TPSOT_FIX flag to disable it Adresses the use case of https://lists.osgeo.org/pipermail/gdal-dev/2024-November/059805.html where Sentinel2 L1C JPEG2000 files are made of a single tile-part per tile. --- src/lib/openjp2/j2k.c | 19 ++++++++++++++++--- src/lib/openjp2/openjpeg.h | 7 ++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c index 7dc389fa2..4de78e86c 100644 --- a/src/lib/openjp2/j2k.c +++ b/src/lib/openjp2/j2k.c @@ -6752,6 +6752,9 @@ void opj_j2k_setup_decoder(opj_j2k_t *j2k, opj_dparameters_t *parameters) j2k->m_cp.m_specific_param.m_dec.m_reduce = parameters->cp_reduce; j2k->dump_state = (parameters->flags & OPJ_DPARAMETERS_DUMP_FLAG); + if (parameters->flags & OPJ_DPARAMETERS_DISABLE_TPSOT_FIX) { + j2k->m_specific_param.m_decoder.m_nb_tile_parts_correction_checked = 1; + } #ifdef USE_JPWL j2k->m_cp.correct = parameters->jpwl_correct; j2k->m_cp.exp_comps = parameters->jpwl_exp_comps; @@ -9964,11 +9967,21 @@ OPJ_BOOL opj_j2k_read_tile_header(opj_j2k_t * p_j2k, if (p_j2k->m_specific_param.m_decoder.m_can_decode && !p_j2k->m_specific_param.m_decoder.m_nb_tile_parts_correction_checked) { /* Issue 254 */ - OPJ_BOOL l_correction_needed; + OPJ_BOOL l_correction_needed = OPJ_FALSE; p_j2k->m_specific_param.m_decoder.m_nb_tile_parts_correction_checked = 1; - if (!opj_j2k_need_nb_tile_parts_correction(p_stream, - p_j2k->m_current_tile_number, &l_correction_needed, p_manager)) { + if (p_j2k->m_cp.tcps[p_j2k->m_current_tile_number].m_nb_tile_parts == 1) { + /* Skip opj_j2k_need_nb_tile_parts_correction() if there is + * only a single tile part declared. The + * opj_j2k_need_nb_tile_parts_correction() hack was needed + * for files with 5 declared tileparts (where they were + * actually 6). + * Doing it systematically hurts performance when reading + * Sentinel2 L1C JPEG2000 files as explained in + * https://lists.osgeo.org/pipermail/gdal-dev/2024-November/059805.html + */ + } else if (!opj_j2k_need_nb_tile_parts_correction(p_stream, + p_j2k->m_current_tile_number, &l_correction_needed, p_manager)) { opj_event_msg(p_manager, EVT_ERROR, "opj_j2k_apply_nb_tile_parts_correction error\n"); return OPJ_FALSE; diff --git a/src/lib/openjp2/openjpeg.h b/src/lib/openjp2/openjpeg.h index 113481bbb..05cec0e3c 100644 --- a/src/lib/openjp2/openjpeg.h +++ b/src/lib/openjp2/openjpeg.h @@ -546,7 +546,12 @@ typedef struct opj_cparameters { } opj_cparameters_t; #define OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG 0x0001 -#define OPJ_DPARAMETERS_DUMP_FLAG 0x0002 +#define OPJ_DPARAMETERS_DUMP_FLAG 0x0002 + +/** Disable at runtime the check for invalid TPSOT values added in + * https://github.com/uclouvain/openjpeg/pull/514. + */ +#define OPJ_DPARAMETERS_DISABLE_TPSOT_FIX 0x0004 /** * Decompression parameters From 2be5f148ebff79e7456c77e57f85af640cf211de Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 13 Nov 2024 18:24:17 +0100 Subject: [PATCH 2/2] Ammend previous commit to remove new OPJ_DPARAMETERS_DISABLE_TPSOT_FIX flag, and make it active when opj_decoder_set_strict_mode() is called with true --- src/lib/openjp2/j2k.c | 6 +++--- src/lib/openjp2/openjpeg.h | 15 +++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c index 4de78e86c..190829744 100644 --- a/src/lib/openjp2/j2k.c +++ b/src/lib/openjp2/j2k.c @@ -6752,9 +6752,6 @@ void opj_j2k_setup_decoder(opj_j2k_t *j2k, opj_dparameters_t *parameters) j2k->m_cp.m_specific_param.m_dec.m_reduce = parameters->cp_reduce; j2k->dump_state = (parameters->flags & OPJ_DPARAMETERS_DUMP_FLAG); - if (parameters->flags & OPJ_DPARAMETERS_DISABLE_TPSOT_FIX) { - j2k->m_specific_param.m_decoder.m_nb_tile_parts_correction_checked = 1; - } #ifdef USE_JPWL j2k->m_cp.correct = parameters->jpwl_correct; j2k->m_cp.exp_comps = parameters->jpwl_exp_comps; @@ -6767,6 +6764,9 @@ void opj_j2k_decoder_set_strict_mode(opj_j2k_t *j2k, OPJ_BOOL strict) { if (j2k) { j2k->m_cp.strict = strict; + if (strict) { + j2k->m_specific_param.m_decoder.m_nb_tile_parts_correction_checked = 1; + } } } diff --git a/src/lib/openjp2/openjpeg.h b/src/lib/openjp2/openjpeg.h index 05cec0e3c..59abd323a 100644 --- a/src/lib/openjp2/openjpeg.h +++ b/src/lib/openjp2/openjpeg.h @@ -548,11 +548,6 @@ typedef struct opj_cparameters { #define OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG 0x0001 #define OPJ_DPARAMETERS_DUMP_FLAG 0x0002 -/** Disable at runtime the check for invalid TPSOT values added in - * https://github.com/uclouvain/openjpeg/pull/514. - */ -#define OPJ_DPARAMETERS_DISABLE_TPSOT_FIX 0x0004 - /** * Decompression parameters * */ @@ -1353,9 +1348,13 @@ OPJ_API OPJ_BOOL OPJ_CALLCONV opj_setup_decoder(opj_codec_t *p_codec, opj_dparameters_t *parameters); /** - * Set strict decoding parameter for this decoder. If strict decoding is enabled, partial bit - * streams will fail to decode. If strict decoding is disabled, the decoder will decode partial - * bitstreams as much as possible without erroring + * Set strict decoding parameter for this decoder. + * If strict decoding is enabled, partial bit streams will fail to decode, and + * the check for invalid TPSOT values added in https://github.com/uclouvain/openjpeg/pull/514 + * will be disabled. + * If strict decoding is disabled, the decoder will decode partial + * bitstreams as much as possible without erroring, and the TPSOT fixing logic + * will be enabled. * * @param p_codec decompressor handler * @param strict OPJ_TRUE to enable strict decoding, OPJ_FALSE to disable