summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-04-07 15:18:50 +0200
committerCarl Hetherington <cth@carlh.net>2024-04-07 15:18:50 +0200
commitdff786c53a9ddbc7d83f59a0f6f23ed4472e6b70 (patch)
treeda1587548bdcd9c5c7bd5ae27aca495715aecb79
parent4233dd7e462e4972c04141e841fc4b8d91bee917 (diff)
Add numgbits option patch to simplify building.videocon-1
-rw-r--r--libopenjpeg/j2k.c2
-rw-r--r--libopenjpeg/openjpeg.c1
-rw-r--r--libopenjpeg/openjpeg.h1
3 files changed, 3 insertions, 1 deletions
diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index d34c75fa..047abcfd 100644
--- a/libopenjpeg/j2k.c
+++ b/libopenjpeg/j2k.c
@@ -2205,7 +2205,7 @@ void j2k_setup_encoder(opj_j2k_t *j2k, opj_cparameters_t *parameters, opj_image_
tccp->cblksty = parameters->mode;
tccp->qmfbid = parameters->irreversible ? 0 : 1;
tccp->qntsty = parameters->irreversible ? J2K_CCP_QNTSTY_SEQNT : J2K_CCP_QNTSTY_NOQNT;
- tccp->numgbits = 2;
+ tccp->numgbits = parameters->numgbits;
if (i == parameters->roi_compno) {
tccp->roishift = parameters->roi_shift;
} else {
diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 180cc844..09d90fd5 100644
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -250,6 +250,7 @@ void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *paramete
parameters->cp_fixed_alloc = 0;
parameters->cp_fixed_quality = 0;
parameters->jpip_on = OPJ_FALSE;
+ parameters->numgbits = 2;
/* UniPG>> */
#ifdef USE_JPWL
parameters->jpwl_epc_on = OPJ_FALSE;
diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h
index 53e9fac0..077d2ec4 100644
--- a/libopenjpeg/openjpeg.h
+++ b/libopenjpeg/openjpeg.h
@@ -278,6 +278,7 @@ typedef struct opj_cparameters {
int prcw_init[J2K_MAXRLVLS];
/** initial precinct height */
int prch_init[J2K_MAXRLVLS];
+ int numgbits;
/**@name command line encoder parameters (not used inside the library) */
/*@{*/