\r
if(parameters->numresolution[2] != 1) {\r
parameters->transform_format = TRF_3D_DWT;\r
- //fprintf(stdout, "[Warning] Resolution level in axial dim > 1 : 3D-DWT will be performed... \n");\r
+ /*fprintf(stdout, "[Warning] Resolution level in axial dim > 1 : 3D-DWT will be performed... \n");*/\r
} else if (parameters->numresolution[2] == 1) {\r
parameters->transform_format = TRF_2D_DWT;\r
- //fprintf(stdout, "[Warning] Resolution level in axial dim == 1 : 2D-DWT will be performed... \n");\r
+ /*fprintf(stdout, "[Warning] Resolution level in axial dim == 1 : 2D-DWT will be performed... \n");*/\r
}\r
\r
if ((parameters->cod_format == J2K_CFMT) && (parameters->transform_format != TRF_2D_DWT || parameters->encoding_format != ENCOD_2EB)) {\r
cio = opj_cio_open((opj_common_ptr)cinfo, NULL, 0);\r
\r
/* encode the volume */\r
- //fprintf(stdout, "[INFO] Encode the volume\n");\r
+ /*fprintf(stdout, "[INFO] Encode the volume\n");*/\r
bSuccess = opj_encode(cinfo, cio, volume, parameters.index);\r
if (!bSuccess) {\r
opj_cio_close(cio);\r
memset(&mj2_parameters, 0, sizeof(mj2_cparameters_t));
/* default value */
/* ------------- */
- mj2_parameters.w = 352; // CIF default value
- mj2_parameters.h = 288; // CIF default value
- mj2_parameters.CbCr_subsampling_dx = 2; // CIF default value
- mj2_parameters.CbCr_subsampling_dy = 2; // CIF default value
+ mj2_parameters.w = 352; /* CIF default value*/
+ mj2_parameters.h = 288; /* CIF default value*/
+ mj2_parameters.CbCr_subsampling_dx = 2; /* CIF default value*/
+ mj2_parameters.CbCr_subsampling_dy = 2; /* CIF default value*/
mj2_parameters.frame_rate = 25;
mj2_parameters.prec = 8; /* DEFAULT */
mj2_parameters.enumcs = ENUMCS_SYCC; /* FIXME: ENUMCS_YUV420 */
return 1;
}
- // One sample per chunk
+ /* One sample per chunk*/
movie->tk[0].chunk = (mj2_chunk_t*)
malloc(movie->tk[0].num_samples * sizeof(mj2_chunk_t));
movie->tk[0].sample = (mj2_sample_t*)
return 1;
}
-// Writing JP, FTYP and MDAT boxes
-// Assuming that the JP and FTYP boxes won't be longer than 300 bytes:
+/* Writing JP, FTYP and MDAT boxes */
+/* Assuming that the JP and FTYP boxes won't be longer than 300 bytes:*/
buf = (unsigned char*)
malloc (300 * sizeof(unsigned char));
cio = opj_cio_open((opj_common_ptr)movie->cinfo, buf, buflen);
cio_skip(cio, 4);
- cio_write(cio, JP2_JP2C, 4); // JP2C
+ cio_write(cio, JP2_JP2C, 4); /* JP2C*/
/* encode the image */
#if 0 /* MM: FIXME */
tk->sample[sampleno].sample_size = len+8;
tk->sample[sampleno].offset = offset;
- tk->chunk[sampleno].offset = offset; // There is one sample per chunk
+ tk->chunk[sampleno].offset = offset; /* There is one sample per chunk */
fwrite(buf, 1, len+8, mj2file);
offset += len+8;
buf = (unsigned char*) malloc(4*sizeof(unsigned char));
-// Init a cio to write box length variable in a little endian way
+/* Init a cio to write box length variable in a little endian way */
cio = opj_cio_open(NULL, buf, 4);
cio_write(cio, offset - mdat_initpos, 4);
fwrite(buf, 4, 1, mj2file);
fseek(mj2file,0,SEEK_END);
free(buf);
-// Writing MOOV box
+/* Writing MOOV box */
buf = (unsigned char*)
malloc ((TEMP_BUF+numframes*20) * sizeof(unsigned char));
cio = opj_cio_open(movie->cinfo, buf, (TEMP_BUF+numframes*20));
fprintf(stdout,"Total encoding time: %.2f s for %d frames (%.1f fps)\n",
total_time, numframes, (float)numframes/total_time);
- // Ending program
+ /* Ending program */
fclose(mj2file);
/* free remaining compression structures */
&& (image->comps[2].dx == 2)
&& (image->comps[0].dy == 1)
&& (image->comps[1].dy == 2)
- && (image->comps[2].dy == 2))// horizontal and vertical
+ && (image->comps[2].dy == 2))/* horizontal and vertical*/
{
-// Y420
+/* Y420*/
cp->enumcs = ENUMCS_SYCC;
cp->CbCr_subsampling_dx = 2;
cp->CbCr_subsampling_dy = 2;
&& (image->comps[2].dx == 2)
&& (image->comps[0].dy == 1)
&& (image->comps[1].dy == 1)
- && (image->comps[2].dy == 1))// horizontal only
+ && (image->comps[2].dy == 1))/* horizontal only*/
{
-// Y422
+/* Y422*/
cp->enumcs = ENUMCS_SYCC;
cp->CbCr_subsampling_dx = 2;
cp->CbCr_subsampling_dy = 1;
&& (image->comps[1].dy == 1)
&& (image->comps[2].dy == 1))
{
-// Y444 or RGB
+/* Y444 or RGB */
if(image->color_space == CLRSPC_SRGB)
{
cp->enumcs = ENUMCS_SRGB;
-// cp->CbCr_subsampling_dx = 0;
-// cp->CbCr_subsampling_dy = 0;
+/* cp->CbCr_subsampling_dx = 0; */
+/* cp->CbCr_subsampling_dy = 0; */
}
else
{
else
{
cp->enumcs = ENUMCS_GRAY;
-// cp->CbCr_subsampling_dx = 0;
-// cp->CbCr_subsampling_dy = 0;
+/* cp->CbCr_subsampling_dx = 0; */
+/* cp->CbCr_subsampling_dy = 0; */
}
if(image->icc_profile_buf)
{
movie->tk[0].sample_rate = 25;
- movie->tk[0].jp2_struct.numcomps = image->numcomps; // NC
+ movie->tk[0].jp2_struct.numcomps = image->numcomps; /* NC */
/* Init Standard jp2 structure */
movie->tk[0].jp2_struct.meth = 2;
if (image->numcomps == 1)
- movie->tk[0].jp2_struct.enumcs = 17; // Grayscale
+ movie->tk[0].jp2_struct.enumcs = 17; /* Grayscale */
else
if ((image->comps[0].dx == 1)
&& (image->comps[0].dy == 1)
&& (image->comps[1].dy == 1)
&& (image->comps[2].dy == 1))
- movie->tk[0].jp2_struct.enumcs = 16; // RGB
+ movie->tk[0].jp2_struct.enumcs = 16; /* RGB */
else
if ((image->comps[0].dx == 1)
&& (image->comps[0].dy == 1)
&& (image->comps[1].dy == 2)
&& (image->comps[2].dy == 2))
- movie->tk[0].jp2_struct.enumcs = 18; // YUV
+ movie->tk[0].jp2_struct.enumcs = 18; /* YUV */
else
- movie->tk[0].jp2_struct.enumcs = 0; // Unkown profile */
+ movie->tk[0].jp2_struct.enumcs = 0; /* Unkown profile */
}
int main(int argc, char *argv[]) {
fwrite(buf,cio_tell(cio),1,mj2file);
free(buf);
- // Insert each j2k codestream in a JP2C box
+ /* Insert each j2k codestream in a JP2C box */
snum=0;
offset = 0;
while(1)
{
+ mj2_sample_t * new_sample;
+ mj2_chunk_t * new_chunk;
sample = &movie->tk[0].sample[snum];
sprintf(j2kfilename,"%s_%05d.j2k",argv[1],snum);
j2kfile = fopen(j2kfilename, "rb");
if (!j2kfile) {
- if (snum==0) { // Could not open a single codestream
+ if (snum==0) { /* Could not open a single codestream */
fprintf(stderr, "failed to open %s for reading\n",j2kfilename);
return 1;
}
- else { // Tried to open a inexistant codestream
+ else { /* Tried to open a inexistant codestream */
fprintf(stdout,"%d frames are being added to the MJ2 file\n",snum);
break;
}
}
- // Calculating offset for samples and chunks
+ /* Calculating offset for samples and chunks */
offset += cio_tell(cio);
sample->offset = offset;
- movie->tk[0].chunk[snum].offset = offset; // There will be one sample per chunk
+ movie->tk[0].chunk[snum].offset = offset; /* There will be one sample per chunk */
- // Calculating sample size
+ /* Calculating sample size */
fseek(j2kfile,0,SEEK_END);
- sample->sample_size = ftell(j2kfile) + 8; // Sample size is codestream + JP2C box header
+ sample->sample_size = ftell(j2kfile) + 8; /* Sample size is codestream + JP2C box header */
fseek(j2kfile,0,SEEK_SET);
- // Reading siz marker of j2k image for the first codestream
+ /* Reading siz marker of j2k image for the first codestream */
if (snum==0)
read_siz_marker(j2kfile, &img);
- // Writing JP2C box header
+ /* Writing JP2C box header */
frame_codestream = (unsigned char*) malloc (sample->sample_size+8);
cio = opj_cio_open(movie->cinfo, frame_codestream, sample->sample_size);
- cio_write(cio,sample->sample_size, 4); // Sample size
- cio_write(cio,JP2_JP2C, 4); // JP2C
+ cio_write(cio,sample->sample_size, 4); /* Sample size */
+ cio_write(cio,JP2_JP2C, 4); /* JP2C */
- // Writing codestream from J2K file to MJ2 file
+ /* Writing codestream from J2K file to MJ2 file */
fread(frame_codestream+8,sample->sample_size-8,1,j2kfile);
fwrite(frame_codestream,sample->sample_size,1,mj2file);
cio_skip(cio, sample->sample_size-8);
- // Ending loop
+ /* Ending loop */
fclose(j2kfile);
snum++;
- mj2_sample_t * new_sample = (mj2_sample_t*)
+ new_sample = (mj2_sample_t*)
realloc(movie->tk[0].sample, (snum+1) * sizeof(mj2_sample_t));
- mj2_chunk_t * new_chunk = (mj2_chunk_t*)
+ new_chunk = (mj2_chunk_t*)
realloc(movie->tk[0].chunk, (snum+1) * sizeof(mj2_chunk_t));
if (new_sample && new_chunk) {
movie->tk[0].sample = new_sample;
free(frame_codestream);
}
- // Writing the MDAT box length in header
+ /* Writing the MDAT box length in header */
offset += cio_tell(cio);
buf = (unsigned char*) malloc (4 * sizeof(unsigned char));
cio = opj_cio_open(movie->cinfo, buf, 4);
fseek(mj2file,0,SEEK_END);
free(buf);
- // Setting movie parameters
+ /* Setting movie parameters */
movie->tk[0].num_samples=snum;
movie->tk[0].num_chunks=snum;
setparams(movie, &img);
- // Writing MOOV box
+ /* Writing MOOV box */
buf = (unsigned char*) malloc ((TEMP_BUF+snum*20) * sizeof(unsigned char));
cio = opj_cio_open(movie->cinfo, buf, (TEMP_BUF+snum*20));
mj2_write_moov(movie, cio);
fwrite(buf,cio_tell(cio),1,mj2file);
- // Ending program
+ /* Ending program */
free(img.comps);
opj_cio_close(cio);
void opj_bio_putbit(opj_bio_t *bio, OPJ_UINT32 b) {
if (bio->ct == 0) {
- opj_bio_byteout(bio); // TODO_MSD: check this line
+ opj_bio_byteout(bio); /* TODO_MSD: check this line */
}
bio->ct--;
bio->buf |= b << bio->ct;
OPJ_UINT32 opj_bio_getbit(opj_bio_t *bio) {
if (bio->ct == 0) {
- opj_bio_bytein(bio); // TODO_MSD: check this line
+ opj_bio_bytein(bio); /* TODO_MSD: check this line */
}
bio->ct--;
return (bio->buf >> bio->ct) & 1;
/**
* Marker structure
* */
-typedef struct opj_marker_info_t {
+typedef struct opj_marker_info {
/** marker type */
unsigned short int type;
/** position in codestream */
/* ----------------------------------------------------------------------- */
/* #define RESTART 0x04 */
-// TODO MSD->LHE
+/* TODO MSD->LHE */
static void t2_putcommacode(opj_bio_t *bio, int n) {
while (--n >= 0) {
bio_write(bio, 1, 1);
for (poc = 0; poc < pocno ; ++poc) {
OPJ_UINT32 l_tp_num = compno;
- // TODO MSD : check why this function cannot fail (cf. v1)
+ /* TODO MSD : check why this function cannot fail (cf. v1) */
pi_create_encode_v2(l_pi, l_cp,p_tile_no,poc,l_tp_num,p_tp_pos,p_t2_mode);
while (pi_next(l_current_pi)) {
@return Returns the read bit\r
*/\r
/* MOD antonin */\r
-//int bio_getbit(opj_bio_t *bio);\r
+/*int bio_getbit(opj_bio_t *bio);*/\r
/* DOM */\r
/* ----------------------------------------------------------------------- */\r
/*@}*/\r
\r
#include "opj_includes.h"\r
\r
-// ==========================================================\r
+/* ==========================================================\r
// Utility functions\r
-// ==========================================================\r
+// ==========================================================*/\r
\r
#ifndef _WIN32\r
static char*\r
volume->comps[i].dz = cio_read(cio, 1); /* ZRsiz_i */\r
}\r
\r
- //Initialization of volume\r
+ /*Initialization of volume*/\r
cp->tw = int_ceildiv(volume->x1 - cp->tx0, cp->tdx);\r
cp->th = int_ceildiv(volume->y1 - cp->ty0, cp->tdy);\r
cp->tl = int_ceildiv(volume->z1 - cp->tz0, cp->tdz);\r
opj_cp_t *cp = j3d->cp;\r
\r
len = cio_read(cio, 2); /* Lsiz */\r
- dcotype = cio_read(cio, 1); //offset 8bit unsigned / 16bit signed integers\r
+ dcotype = cio_read(cio, 1); /*offset 8bit unsigned / 16bit signed integers*/\r
if (dcotype == 0) {\r
for (i = 0; i < volume->numcomps; i++) {\r
volume->comps[i].dcoffset = cio_read(cio, 1);\r
cio_write(cio, J3D_MS_SIZ, 2); /* SIZ */\r
lenp = cio_tell(cio);\r
cio_skip(cio, 2);\r
- //cio_write(cio, 0, 2); /* Rsiz (capabilities of 15444-1 only) */\r
+ /*cio_write(cio, 0, 2);*/ /* Rsiz (capabilities of 15444-1 only) */\r
Rsiz = J3D_RSIZ_DCO | J3D_RSIZ_ATK; /** | J3D_RSIZ_MCT | J3D_RSIZ_NONLT (not implemented yet)*/\r
cio_write(cio, Rsiz, 2); /* capabilities of WDv5.2*/\r
cio_write(cio, volume->x1, 4); /* Xsiz */\r
for (i = 0; i < volume->numcomps; i++) \r
volume->comps[i].dz = 1;\r
\r
- //Initialization of volume\r
+ /*Initialization of volume*/\r
cp->tw = int_ceildiv(volume->x1 - cp->tx0, cp->tdx);\r
cp->th = int_ceildiv(volume->y1 - cp->ty0, cp->tdy);\r
cp->tl = int_ceildiv(volume->z1 - cp->tz0, cp->tdz);\r
cio_write(cio, J3D_MS_COM, 2);\r
lenp = cio_tell(cio);\r
cio_skip(cio, 2);\r
- //cio_write(cio, 0, 2);\r
+ /*cio_write(cio, 0, 2);*/\r
cio_write(cio, j3d->cp->transform_format,1);\r
cio_write(cio, j3d->cp->encoding_format,1);\r
- //opj_event_msg(j3d->cinfo, EVT_INFO, "TRF %D ENCOD %d\n",j3d->cp->transform_format,j3d->cp->encoding_format);\r
+ /*opj_event_msg(j3d->cinfo, EVT_INFO, "TRF %D ENCOD %d\n",j3d->cp->transform_format,j3d->cp->encoding_format);*/\r
if (j3d->cp->comment != NULL) {\r
char *comment = j3d->cp->comment;\r
for (i = 0; i < strlen(comment); i++) {\r
\r
j3d->cp->transform_format = (OPJ_TRANSFORM) cio_read(cio, 1);\r
j3d->cp->encoding_format = (OPJ_ENTROPY_CODING) cio_read(cio, 1);\r
- //opj_event_msg(j3d->cinfo, EVT_INFO, "TRF %D ENCOD %d\n",j3d->cp->transform_format,j3d->cp->encoding_format);\r
+ /*opj_event_msg(j3d->cinfo, EVT_INFO, "TRF %D ENCOD %d\n",j3d->cp->transform_format,j3d->cp->encoding_format);*/\r
\r
- cio_skip(cio, len - 4); //posible comments\r
+ cio_skip(cio, len - 4); /*posible comments*/\r
}\r
\r
static void j3d_write_cox(opj_j3d_t *j3d, int compno) {\r
tccp->dwtid[1] = tccp->dwtid[0]; /* SPcox (L) */\r
tccp->dwtid[2] = tccp->dwtid[0]; /* SPcox (M) */\r
}\r
- tccp->reversible = (tccp->dwtid[0]>=1 && tccp->dwtid[1]>=1 && tccp->dwtid[2]>=1); //TODO: only valid for irreversible 9x7 WTs\r
+ tccp->reversible = (tccp->dwtid[0]>=1 && tccp->dwtid[1]>=1 && tccp->dwtid[2]>=1); /*TODO: only valid for irreversible 9x7 WTs*/\r
if (tccp->csty & J3D_CP_CSTY_PRT) {\r
for (i = 0; i < tccp->numresolution[0]; i++) {\r
int tmp = cio_read(cio, 2); /* SPcox (N_i) */\r
j3d_dump_cp(stdout, tcd->volume, tcd->cp);*/\r
for (i = 0; i < j3d->cp->tileno_size; i++) {\r
tileno = j3d->cp->tileno[i];\r
- //opj_event_msg(j3d->cinfo, EVT_INFO, "tcd_decode_tile \n");\r
+ /*opj_event_msg(j3d->cinfo, EVT_INFO, "tcd_decode_tile \n");*/\r
tcd_decode_tile(tcd, j3d->tile_data[tileno], j3d->tile_len[tileno], tileno);\r
opj_free(j3d->tile_data[tileno]);\r
j3d->tile_data[tileno] = NULL;\r
return 0;\r
}\r
e = j3d_dec_mstab_lookup(id);\r
- //opj_event_msg(cinfo, EVT_INFO, "MARKER %x PREVSTATE %d E->STATE %d\n",e->id,j3d->state,e->states);\r
+ /*opj_event_msg(cinfo, EVT_INFO, "MARKER %x PREVSTATE %d E->STATE %d\n",e->id,j3d->state,e->states);*/\r
if (!(j3d->state & e->states)) {\r
opj_volume_destroy(volume);\r
opj_event_msg(cinfo, EVT_ERROR, "%.8x: unexpected marker %x\n", cio_tell(cio) - 2, id);\r
if (e->handler) {\r
(*e->handler)(j3d);\r
}\r
- //opj_event_msg(cinfo, EVT_INFO, "POSTSTATE %d\n",j3d->state);\r
+ /*opj_event_msg(cinfo, EVT_INFO, "POSTSTATE %d\n",j3d->state);*/\r
if (j3d->state == J3D_STATE_MT) {\r
break;\r
}\r
tccp->cblk[1] = int_floorlog2(parameters->cblock_init[1]); \r
tccp->cblk[2] = int_floorlog2(parameters->cblock_init[2]); \r
assert (tccp->cblk[0]+tccp->cblk[1]+tccp->cblk[1] <= T1_MAXWHD);\r
- tccp->cblksty = parameters->mode; //Codeblock style --> Table A.19 (default 0)\r
+ tccp->cblksty = parameters->mode; /*Codeblock style --> Table A.19 (default 0)*/\r
\r
/*ATK / transform */\r
tccp->reversible = parameters->irreversible ? 0 : 1; /* 0 => DWT 9-7 || 1 => DWT 5-3 */\r
}\r
}\r
}\r
- //Calcular stepsize for each subband (if NOQNT -->stepsize = 1.0)\r
+ /*Calcular stepsize for each subband (if NOQNT -->stepsize = 1.0)*/\r
dwt_calc_explicit_stepsizes(tccp, volume->comps[i].prec);\r
}\r
}\r
*/\r
for (resno = 0; resno < volume_info->decomposition[0] + 1; resno++) {\r
/* I suppose components have same XRsiz, YRsiz */\r
- //int x0 = volume_info->tile_Ox + tileno - (int)floor( (float)tileno/(float)volume_info->tw ) * volume_info->tw * volume_info->tile_x;\r
- //int y0 = volume_info->tile_Ox + (int)floor( (float)tileno/(float)volume_info->tw ) * volume_info->tile_y;\r
+ /*int x0 = volume_info->tile_Ox + tileno - (int)floor( (float)tileno/(float)volume_info->tw ) * volume_info->tw * volume_info->tile_x;*/\r
+ /*int y0 = volume_info->tile_Ox + (int)floor( (float)tileno/(float)volume_info->tw ) * volume_info->tile_y;*/\r
int x0 = volume_info->tile_Ox + (int)floor( (float)tileno/(float)volume_info->tw ) * volume_info->tile_x;\r
int y0 = volume_info->tile_Oy + (int)floor( (float)tileno/(float)volume_info->th ) * volume_info->tile_y;\r
int z0 = volume_info->tile_Ox + (int)floor( (float)tileno/(float)volume_info->tl ) * volume_info->tile_z;\r
if (cp->tcps[tileno].numpocs) {\r
j3d_write_poc(j3d);\r
}\r
- j3d_write_sod(j3d, tcd); //--> tcd_encode_tile\r
+ j3d_write_sod(j3d, tcd); /*--> tcd_encode_tile*/\r
\r
/* INDEX >> */\r
if(volume_info && volume_info->index_on) {\r
#define J3D_MS_EPH 0xff92 /**< EPH marker value */\r
#define J3D_MS_CRG 0xff63 /**< CRG marker value */\r
#define J3D_MS_COM 0xff64 /**< COM marker value */\r
-//15444-2\r
+/*15444-2*/\r
#define J3D_MS_DCO 0xff70 /**< DCO marker value */\r
#define J3D_MS_VMS 0xff71 /**< VMS marker value */\r
#define J3D_MS_DFS 0xff72 /**< DFS marker value */\r
#include "int.h"
#include "fix.h"
-//#include "pred.h"
-//#include "golomb.h"
-
#endif /* OPJ_INCLUDES_H */
continue;\r
}\r
res = &comp->resolutions[pi->resno];\r
- //for (pi->precno = 0; pi->precno < (res->prctno[0] * res->prctno[1]); pi->precno++) {\r
+ /*for (pi->precno = 0; pi->precno < (res->prctno[0] * res->prctno[1]); pi->precno++) {*/\r
for (pi->precno = 0; pi->precno < (res->prctno[0] * res->prctno[1] * res->prctno[2]); pi->precno++) {\r
index = pi->layno * pi->step_l \r
+ pi->resno * pi->step_r \r
continue;\r
}\r
res = &comp->resolutions[pi->resno];\r
- //for (pi->precno = 0; pi->precno < (res->prctno[0] * res->prctno[1]); pi->precno++) {\r
+ /*for (pi->precno = 0; pi->precno < (res->prctno[0] * res->prctno[1]); pi->precno++) {*/\r
for (pi->precno = 0; pi->precno < (res->prctno[0] * res->prctno[1] * res->prctno[2]); pi->precno++) {\r
index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;\r
if (!pi->include[index]) {\r
int lut_nmsedec_ref[1 << T1_NMSEDEC_BITS];\r
int lut_nmsedec_ref0[1 << T1_NMSEDEC_BITS];\r
/** Codeblock data */\r
- int data[T1_CBLKD][T1_CBLKH][T1_CBLKW];//int ***data;\r
+ int data[T1_CBLKD][T1_CBLKH][T1_CBLKW];/*int ***data;*/\r
/** Context information for each voxel in codeblock */\r
- int flags[T1_CBLKD + 2][T1_CBLKH + 2][T1_CBLKH + 2];//int ***flags;\r
+ int flags[T1_CBLKD + 2][T1_CBLKH + 2][T1_CBLKH + 2];/*int ***flags;*/\r
} opj_t1_t;\r
\r
/** @name Exported functions */\r
#define T1_3D_SGN_B 0x8000\r
#define T1_3D_SGN (T1_3D_SGN_N|T1_3D_SGN_E|T1_3D_SGN_S|T1_3D_SGN_W|T1_3D_SGN_F|T1_3D_SGN_B)\r
\r
-#define T1_3D_SIG 0x0001 //Significance state\r
-#define T1_3D_REFINE 0x0002 //Delayed significance\r
-#define T1_3D_VISIT 0x0004 //First-pass membership\r
+#define T1_3D_SIG 0x0001 /*Significance state*/\r
+#define T1_3D_REFINE 0x0002 /*Delayed significance*/\r
+#define T1_3D_VISIT 0x0004 /*First-pass membership*/\r
\r
#define T1_3D_NUMCTXS_AGG 1\r
#define T1_3D_NUMCTXS_ZC 16\r
#define T1_3D_NUMCTXS_UNI 1\r
\r
#define T1_3D_CTXNO_AGG 0\r
-#define T1_3D_CTXNO_ZC (T1_3D_CTXNO_AGG+T1_3D_NUMCTXS_AGG) //1\r
-#define T1_3D_CTXNO_MAG (T1_3D_CTXNO_ZC+T1_3D_NUMCTXS_ZC) //17\r
-#define T1_3D_CTXNO_SC (T1_3D_CTXNO_MAG+T1_3D_NUMCTXS_MAG) //20\r
-#define T1_3D_CTXNO_UNI (T1_3D_CTXNO_SC+T1_3D_NUMCTXS_SC) //26\r
-#define T1_3D_NUMCTXS (T1_3D_CTXNO_UNI+T1_3D_NUMCTXS_UNI) //27\r
+#define T1_3D_CTXNO_ZC (T1_3D_CTXNO_AGG+T1_3D_NUMCTXS_AGG) /*1*/\r
+#define T1_3D_CTXNO_MAG (T1_3D_CTXNO_ZC+T1_3D_NUMCTXS_ZC) /*17*/\r
+#define T1_3D_CTXNO_SC (T1_3D_CTXNO_MAG+T1_3D_NUMCTXS_MAG) /*20*/\r
+#define T1_3D_CTXNO_UNI (T1_3D_CTXNO_SC+T1_3D_NUMCTXS_SC) /*26*/\r
+#define T1_3D_NUMCTXS (T1_3D_CTXNO_UNI+T1_3D_NUMCTXS_UNI) /*27*/\r
\r
\r
/* ----------------------------------------------------------------------- */\r
\r
/* ----------------------------------------------------------------------- */\r
void tcd_malloc_encode(opj_tcd_t *tcd, opj_volume_t * volume, opj_cp_t * cp, int curtileno) {\r
- int compno, resno, bandno, precno, cblkno, i, j;//, k;\r
+ int compno, resno, bandno, precno, cblkno, i, j;/*, k;*/\r
\r
opj_tcd_tile_t *tile = NULL; /* pointer to tcd->tile */\r
opj_tcd_tilecomp_t *tilec = NULL; /* pointer to tcd->tilec */\r
res_max = 0;\r
for (i = 0;i < 3; i++){\r
tilec->numresolution[i] = tccp->numresolution[i];\r
- //Greater of 3 resolutions contains all information\r
+ /*Greater of 3 resolutions contains all information*/\r
res_max = (tilec->numresolution[i] > res_max) ? tilec->numresolution[i] : res_max;\r
}\r
\r
res->x1 = int_ceildivpow2(tilec->x1, levelnox);\r
res->y1 = int_ceildivpow2(tilec->y1, levelnoy);\r
res->z1 = int_ceildivpow2(tilec->z1, levelnoz);\r
- //if (res->z1 < 0)fprintf(stdout,"Res: %d %d/%d --> %d\n",resno,tilec->z1, levelnoz, int_ceildivpow2(tilec->z1, levelnoz));\r
+ /*if (res->z1 < 0)fprintf(stdout,"Res: %d %d/%d --> %d\n",resno,tilec->z1, levelnoz, int_ceildivpow2(tilec->z1, levelnoz));*/\r
\r
res->numbands = (resno == 0) ? 1 : (resno <= diff) ? 3 : 7; /* --> 3D */\r
\r
cbglengthexpn = pdz - 1;\r
}\r
\r
- cblkwidthexpn = int_min(tccp->cblk[0], cbgwidthexpn); //6\r
- cblkheightexpn = int_min(tccp->cblk[1], cbgheightexpn); //6\r
- cblklengthexpn = int_min(tccp->cblk[2], cbglengthexpn); //6\r
+ cblkwidthexpn = int_min(tccp->cblk[0], cbgwidthexpn); /*6*/\r
+ cblkheightexpn = int_min(tccp->cblk[1], cbgheightexpn); /*6*/\r
+ cblklengthexpn = int_min(tccp->cblk[2], cbglengthexpn); /*6*/\r
\r
res->bands = (opj_tcd_band_t *) opj_malloc(res->numbands * sizeof(opj_tcd_band_t));\r
for (bandno = 0; bandno < res->numbands; bandno++) {\r
prc->cblks = (opj_tcd_cblk_t *) opj_malloc((prc->cblkno[0] * prc->cblkno[1] * prc->cblkno[2]) * sizeof(opj_tcd_cblk_t));\r
prc->incltree = tgt_create(prc->cblkno[0], prc->cblkno[1], prc->cblkno[2]);\r
prc->imsbtree = tgt_create(prc->cblkno[0], prc->cblkno[1], prc->cblkno[2]);\r
- //tgt_tree_dump(stdout,prc->incltree);\r
+ /*tgt_tree_dump(stdout,prc->incltree);*/\r
for (cblkno = 0; cblkno < (prc->cblkno[0] * prc->cblkno[1] * prc->cblkno[2]); cblkno++) {\r
int cblkxstart = tlcblkxstart + (cblkno % prc->cblkno[0]) * (1 << cblkwidthexpn);\r
int cblkystart = tlcblkystart + ((cblkno % (prc->cblkno[0] * prc->cblkno[1])) / prc->cblkno[0]) * (1 << cblkheightexpn);\r
}\r
}\r
}\r
- //tcd_dump(stdout, tcd, tcd->tcd_volume);\r
+ /*tcd_dump(stdout, tcd, tcd->tcd_volume);*/\r
\r
}\r
void tcd_init_encode(opj_tcd_t *tcd, opj_volume_t * volume, opj_cp_t * cp, int curtileno) {\r
res_max = 0;\r
for (i = 0;i < 3; i++){\r
tilec->numresolution[i] = tccp->numresolution[i];\r
- //Greater of 3 resolutions contains all information\r
+ /*Greater of 3 resolutions contains all information*/\r
res_max = (tilec->numresolution[i] > res_max) ? tilec->numresolution[i] : res_max;\r
}\r
\r
res->y1 = int_ceildivpow2(tilec->y1, levelnoy);\r
res->z1 = int_ceildivpow2(tilec->z1, levelnoz);\r
\r
- // res->numbands = resno == 0 ? 1 : 3; /* --> 2D */\r
+ /* res->numbands = resno == 0 ? 1 : 3; *//* --> 2D */\r
+\r
res->numbands = (resno == 0) ? 1 : (resno <= diff) ? 3 : 7; /* --> 3D */\r
\r
/* p. 30, table A-13, ISO/IEC IS154444-1 : 2002 */ \r
} /* bandno */\r
} /* resno */\r
} /* compno */\r
- //tcd_dump(stdout, tcd, tcd->tcd_volume);\r
+ /*tcd_dump(stdout, tcd, tcd->tcd_volume);*/\r
}\r
\r
\r
int tileno, compno, resno, bandno, precno;\r
\r
opj_tcd_tile_t *tile = NULL; /* pointer to tcd->tile */\r
-// opj_tcd_slice_t *slice = NULL; /* pointer to tcd->slice */\r
+/* opj_tcd_slice_t *slice = NULL; */ /* pointer to tcd->slice */\r
opj_tcd_tilecomp_t *tilec = NULL; /* pointer to tcd->tilec */\r
opj_tcd_resolution_t *res = NULL; /* pointer to tcd->res */\r
opj_tcd_band_t *band = NULL; /* pointer to tcd->band */\r
res_max = 0;\r
for (i = 0;i < 3; i++){\r
tilec->numresolution[i] = tccp->numresolution[i];\r
- //Greater of 3 resolutions contains all information\r
+ /*Greater of 3 resolutions contains all information*/\r
res_max = (tilec->numresolution[i] > res_max) ? tilec->numresolution[i] : res_max;\r
}\r
\r
\r
/* p. 67, B.17 & B.18, ISO/IEC IS15444-1 : 2002 */\r
if (resno == 0) {\r
- tlcbgxstart = tlprcxstart;//0\r
+ tlcbgxstart = tlprcxstart;/*0*/\r
tlcbgystart = tlprcystart;\r
tlcbgzstart = tlprczstart;\r
- brcbgxend = brprcxend;//1\r
+ brcbgxend = brprcxend;/*1*/\r
brcbgyend = brprcyend;\r
brcbgzend = brprczend;\r
- cbgwidthexpn = pdx; //15\r
+ cbgwidthexpn = pdx; /*15*/\r
cbgheightexpn = pdy;\r
cbglengthexpn = pdz;\r
} else {\r
cbglengthexpn = pdz - 1;\r
}\r
\r
- cblkwidthexpn = int_min(tccp->cblk[0], cbgwidthexpn); //6\r
- cblkheightexpn = int_min(tccp->cblk[1], cbgheightexpn); //6\r
- cblklengthexpn = int_min(tccp->cblk[2], cbglengthexpn); //6\r
+ cblkwidthexpn = int_min(tccp->cblk[0], cbgwidthexpn); /*6*/\r
+ cblkheightexpn = int_min(tccp->cblk[1], cbgheightexpn); /*6*/\r
+ cblklengthexpn = int_min(tccp->cblk[2], cbglengthexpn); /*6*/\r
\r
res->bands = (opj_tcd_band_t *) opj_malloc(res->numbands * sizeof(opj_tcd_band_t));\r
for (bandno = 0; bandno < res->numbands; bandno++) {\r
} /* compno */\r
} /* i = 0..cp->tileno_size */\r
\r
- //tcd_dump(stdout, tcd, tcd->tcd_volume);\r
+ /*tcd_dump(stdout, tcd, tcd->tcd_volume);*/\r
\r
/* \r
Allocate place to store the decoded data = final volume\r
if (final)\r
cblk->numpassesinlayers = n;\r
\r
- // fprintf(stdout,"MakeLayer : %d %f %d %d \n",layer->len, layer->disto, layer->numpasses, n);\r
+ /* fprintf(stdout,"MakeLayer : %d %f %d %d \n",layer->len, layer->disto, layer->numpasses, n);*/\r
}\r
}\r
}\r
lo = thresh;\r
} else { /* disto_alloc -r, fixed_alloc -f */\r
l = t2_encode_packets(t2, tcd->tcd_tileno, tcd_tile, layno + 1, dest, maxlen, volume_info);\r
- //fprintf(stdout, "layno %d i %d len=%d max=%d \n",layno,i,l,maxlen);\r
+ /*fprintf(stdout, "layno %d i %d len=%d max=%d \n",layno,i,l,maxlen);*/\r
if (l == -999) {\r
lo = thresh; \r
continue;\r
opj_tcd_tilecomp_t *tilec = &tile->comps[compno];\r
\r
int adjust;\r
- int offset_x = int_ceildiv(volume->x0, volume->comps[compno].dx); //ceil(x0 / subsampling_dx)\r
+ int offset_x = int_ceildiv(volume->x0, volume->comps[compno].dx); /*ceil(x0 / subsampling_dx)*/\r
int offset_y = int_ceildiv(volume->y0, volume->comps[compno].dy);\r
int offset_z = int_ceildiv(volume->z0, volume->comps[compno].dz);\r
\r
\r
\r
/* extract tile data from volume.comps[0].data to tile.comps[0].data */\r
- //fprintf(stdout,"[INFO] Extract tile data\n");\r
+ /*fprintf(stdout,"[INFO] Extract tile data\n");*/\r
if (tcd->cp->transform_format == TRF_3D_RLS || tcd->cp->transform_format == TRF_3D_LSE) {\r
adjust = 0;\r
} else {\r
- adjust = volume->comps[compno].sgnd ? 0 : 1 << (volume->comps[compno].prec - 1); //sign=='+' --> 2^(prec-1)\r
+ adjust = volume->comps[compno].sgnd ? 0 : 1 << (volume->comps[compno].prec - 1); /*sign=='+' --> 2^(prec-1)*/\r
if (volume->comps[compno].dcoffset != 0){\r
adjust += volume->comps[compno].dcoffset;\r
fprintf(stdout,"[INFO] DC Offset applied: DCO = %d -> adjust = %d\n",volume->comps[compno].dcoffset,adjust);\r
}\r
} \r
\r
- if (tcd_tcp->tccps[compno].reversible == 1) { //IF perfect reconstruction (DWT.5-3)\r
+ if (tcd_tcp->tccps[compno].reversible == 1) { /*IF perfect reconstruction (DWT.5-3)*/\r
for (z = tilec->z0; z < tilec->z1; z++) {\r
for (y = tilec->y0; y < tilec->y1; y++) {\r
/* start of the src tile scanline */\r
}\r
}\r
}\r
- } else if (tcd_tcp->tccps[compno].reversible == 0) { //IF not (DWT.9-7)\r
+ } else if (tcd_tcp->tccps[compno].reversible == 0) { /*IF not (DWT.9-7)*/\r
for (z = tilec->z0; z < tilec->z1; z++) {\r
for (y = tilec->y0; y < tilec->y1; y++) {\r
/* start of the src tile scanline */\r
if (tcd->cp->transform_format == TRF_3D_RLS || tcd->cp->transform_format == TRF_3D_LSE) {\r
adjust = 0;\r
} else {\r
- adjust = tcd->volume->comps[compno].sgnd ? 0 : 1 << (tcd->volume->comps[compno].prec - 1); //sign=='+' --> 2^(prec-1)\r
+ adjust = tcd->volume->comps[compno].sgnd ? 0 : 1 << (tcd->volume->comps[compno].prec - 1); /*sign=='+' --> 2^(prec-1)*/\r
if (tcd->volume->comps[compno].dcoffset != 0){\r
adjust += tcd->volume->comps[compno].dcoffset;\r
fprintf(stdout,"[INFO] DC Offset applied: DCO = %d -> adjust = %d\n",tcd->volume->comps[compno].dcoffset,adjust);\r
opj_tcd_pass_t passes[100];
/* Data */
unsigned char data[524288];
- //unsigned char *data;
+ /*unsigned char *data;*/
} opj_tcd_cblk_t;
/**
/* update markers struct */
j2k_add_marker(j2k->cstr_info, J2K_MS_ESD, -1, esd->Lesd + 2);
+ return OPJ_TRUE;
}
unsigned short int jpwl_double_to_pfp(double V, int bytes) {