Added option for Digital cinema profile compliant codestream. This can be chosen by "-cinema2K" or "-cinema4K" for a 2K and 4K compliance respectively. The feature for tileparts has not been implemented in this version. Modification in image_to_j2k.c

Added the Digital Cinema profiles (CINEMA2K and CINEMA4K) to the list of profiles recognized in the codestream SIZ marker segment. Modification in openjpeg.h,j2k.c
Added feature for constant quality within bitrate defined in Digital cinema standards. Modification in tcd.c
Modified the method of generation of buffer length. Modification in cio.c

1 files changed, 59 insertions, 35 deletions

diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index db291ff2..fb9aeaff 100644
--- a/libopenjpeg/j2k.c
+++ b/libopenjpeg/j2k.c
@@ -324,7 +324,7 @@ static void j2k_write_siz(opj_j2k_t *j2k) {
 	cio_write(cio, J2K_MS_SIZ, 2);	/* SIZ */
 	lenp = cio_tell(cio);
 	cio_skip(cio, 2);
-	cio_write(cio, 0, 2);			/* Rsiz (capabilities) */
+	cio_write(cio, cp->rsiz, 2);			/* Rsiz (capabilities) */
 	cio_write(cio, image->x1, 4);	/* Xsiz */
 	cio_write(cio, image->y1, 4);	/* Ysiz */
 	cio_write(cio, image->x0, 4);	/* X0siz */
@@ -1780,7 +1780,8 @@ void j2k_setup_encoder(opj_j2k_t *j2k, opj_cparameters_t *parameters, opj_image_
 	/* 
 	copy user encoding parameters 
 	*/
-
+	cp->cinema = parameters->cp_cinema;
+	cp->rsiz   = parameters->cp_rsiz;
 	cp->disto_alloc = parameters->cp_disto_alloc;
 	cp->fixed_alloc = parameters->cp_fixed_alloc;
 	cp->fixed_quality = parameters->cp_fixed_quality;
@@ -1826,6 +1827,11 @@ void j2k_setup_encoder(opj_j2k_t *j2k, opj_cparameters_t *parameters, opj_image_
 		cp->tdy = image->y1 - cp->ty0;
 	}
 
+	cp->img_size = 0;
+	for(i=0;i<image->numcomps ;i++){
+	cp->img_size += (image->comps[i].w *image->comps[i].h * image->comps[i].prec);
+	}
+
 /* UniPG>> */
 #ifdef USE_JPWL
 	/*
@@ -1940,42 +1946,60 @@ void j2k_setup_encoder(opj_j2k_t *j2k, opj_cparameters_t *parameters, opj_image_
 			} else {
 				tccp->roishift = 0;
 			}
-			if (parameters->csty & J2K_CCP_CSTY_PRT) {
-				int p = 0;
-				for (j = tccp->numresolutions - 1; j >= 0; j--) {
-					if (p < parameters->res_spec) {
-						if (parameters->prcw_init[p] < 1) {
-							tccp->prcw[j] = 1;
-						} else {
-							tccp->prcw[j] = int_floorlog2(parameters->prcw_init[p]);
-						}
-						if (parameters->prch_init[p] < 1) {
-							tccp->prch[j] = 1;
-						} else {
-							tccp->prch[j] = int_floorlog2(parameters->prch_init[p]);
-						}
-					} else {
-						int res_spec = parameters->res_spec;
-						int size_prcw = parameters->prcw_init[res_spec - 1] >> (p - (res_spec - 1));
-						int size_prch = parameters->prch_init[res_spec - 1] >> (p - (res_spec - 1));
-						if (size_prcw < 1) {
-							tccp->prcw[j] = 1;
-						} else {
-							tccp->prcw[j] = int_floorlog2(size_prcw);
-						}
-						if (size_prch < 1) {
-							tccp->prch[j] = 1;
+
+			if(parameters->cp_cinema)
+			{
+				//Precinct size for lowest frequency subband=128
+				tccp->prcw[0] = 7;
+				tccp->prch[0] = 7;
+				//Precinct size at all other resolutions = 256
+				for (j = 1; j < tccp->numresolutions; j++) {
+					tccp->prcw[j] = 8;
+					tccp->prch[j] = 8;
+				}
+			}else{
+				if (parameters->csty & J2K_CCP_CSTY_PRT) {
+					int p = 0;
+					for (j = tccp->numresolutions - 1; j >= 0; j--) {
+						if (p < parameters->res_spec) {
+							
+							if (parameters->prcw_init[p] < 1) {
+								tccp->prcw[j] = 1;
+							} else {
+								tccp->prcw[j] = int_floorlog2(parameters->prcw_init[p]);
+							}
+							
+							if (parameters->prch_init[p] < 1) {
+								tccp->prch[j] = 1;
+							}else {
+								tccp->prch[j] = int_floorlog2(parameters->prch_init[p]);
+							}
+
 						} else {
-							tccp->prch[j] = int_floorlog2(size_prch);
+							int res_spec = parameters->res_spec;
+							int size_prcw = parameters->prcw_init[res_spec - 1] >> (p - (res_spec - 1));
+							int size_prch = parameters->prch_init[res_spec - 1] >> (p - (res_spec - 1));
+							
+							if (size_prcw < 1) {
+								tccp->prcw[j] = 1;
+							} else {
+								tccp->prcw[j] = int_floorlog2(size_prcw);
+							}
+							
+							if (size_prch < 1) {
+								tccp->prch[j] = 1;
+							} else {
+								tccp->prch[j] = int_floorlog2(size_prch);
+							}
 						}
+						p++;
+						/*printf("\nsize precinct for level %d : %d,%d\n", j,tccp->prcw[j], tccp->prch[j]); */
+					}	//end for
+				} else {
+					for (j = 0; j < tccp->numresolutions; j++) {
+						tccp->prcw[j] = 15;
+						tccp->prch[j] = 15;
 					}
-					p++;
-					/*printf("\nsize precinct for level %d : %d,%d\n", j,tccp->prcw[j], tccp->prch[j]); */
-				}
-			} else {
-				for (j = 0; j < tccp->numresolutions; j++) {
-					tccp->prcw[j] = 15;
-					tccp->prch[j] = 15;
 				}
 			}