@return
*/
static opj_bool opj_t2_encode_packet( OPJ_UINT32 tileno,
- opj_tcd_tile_v2_t *tile,
+ opj_tcd_tile_t *tile,
opj_tcp_v2_t *tcp,
opj_pi_iterator_t *pi,
OPJ_BYTE *dest,
@return FIXME DOC
*/
-static opj_bool opj_t2_decode_packet( opj_t2_v2_t* t2,
- opj_tcd_tile_v2_t *tile,
+static opj_bool opj_t2_decode_packet( opj_t2_t* t2,
+ opj_tcd_tile_t *tile,
opj_tcp_v2_t *tcp,
opj_pi_iterator_t *pi,
OPJ_BYTE *src,
OPJ_UINT32 max_length,
opj_packet_info_t *pack_info);
-static opj_bool opj_t2_skip_packet( opj_t2_v2_t* p_t2,
- opj_tcd_tile_v2_t *p_tile,
+static opj_bool opj_t2_skip_packet( opj_t2_t* p_t2,
+ opj_tcd_tile_t *p_tile,
opj_tcp_v2_t *p_tcp,
opj_pi_iterator_t *p_pi,
OPJ_BYTE *p_src,
OPJ_UINT32 p_max_length,
opj_packet_info_t *p_pack_info);
-static opj_bool opj_t2_read_packet_header( opj_t2_v2_t* p_t2,
- opj_tcd_tile_v2_t *p_tile,
+static opj_bool opj_t2_read_packet_header( opj_t2_t* p_t2,
+ opj_tcd_tile_t *p_tile,
opj_tcp_v2_t *p_tcp,
opj_pi_iterator_t *p_pi,
opj_bool * p_is_data_present,
OPJ_UINT32 p_max_length,
opj_packet_info_t *p_pack_info);
-static opj_bool opj_t2_read_packet_data(opj_t2_v2_t* p_t2,
- opj_tcd_tile_v2_t *p_tile,
+static opj_bool opj_t2_read_packet_data(opj_t2_t* p_t2,
+ opj_tcd_tile_t *p_tile,
opj_pi_iterator_t *p_pi,
OPJ_BYTE *p_src_data,
OPJ_UINT32 * p_data_read,
OPJ_UINT32 p_max_length,
opj_packet_info_t *pack_info);
-static opj_bool opj_t2_skip_packet_data(opj_t2_v2_t* p_t2,
- opj_tcd_tile_v2_t *p_tile,
+static opj_bool opj_t2_skip_packet_data(opj_t2_t* p_t2,
+ opj_tcd_tile_t *p_tile,
opj_pi_iterator_t *p_pi,
OPJ_UINT32 * p_data_read,
OPJ_UINT32 p_max_length,
@param cblksty
@param first
*/
-static opj_bool opj_t2_init_seg( opj_tcd_cblk_dec_v2_t* cblk,
+static opj_bool opj_t2_init_seg( opj_tcd_cblk_dec_t* cblk,
OPJ_UINT32 index,
OPJ_UINT32 cblksty,
OPJ_UINT32 first);
/* ----------------------------------------------------------------------- */
-opj_bool opj_t2_encode_packets( opj_t2_v2_t* p_t2,
+opj_bool opj_t2_encode_packets( opj_t2_t* p_t2,
OPJ_UINT32 p_tile_no,
- opj_tcd_tile_v2_t *p_tile,
+ opj_tcd_tile_t *p_tile,
OPJ_UINT32 p_maxlayers,
OPJ_BYTE *p_dest,
OPJ_UINT32 * p_data_written,
return OPJ_TRUE;
}
-opj_bool opj_t2_decode_packets( opj_t2_v2_t *p_t2,
+opj_bool opj_t2_decode_packets( opj_t2_t *p_t2,
OPJ_UINT32 p_tile_no,
- opj_tcd_tile_v2_t *p_tile,
+ opj_tcd_tile_t *p_tile,
OPJ_BYTE *p_src,
OPJ_UINT32 * p_data_read,
OPJ_UINT32 p_max_len,
}
l_img_comp = &(l_image->comps[l_current_pi->compno]);
- l_img_comp->resno_decoded = uint_max(l_current_pi->resno, l_img_comp->resno_decoded);
+ l_img_comp->resno_decoded = opj_uint_max(l_current_pi->resno, l_img_comp->resno_decoded);
}
else {
l_nb_bytes_read = 0;
* @param p_cp Image coding parameters.
* @return a new T2 handle if successful, NULL otherwise.
*/
-opj_t2_v2_t* opj_t2_create(opj_image_t *p_image, opj_cp_v2_t *p_cp)
+opj_t2_t* opj_t2_create(opj_image_t *p_image, opj_cp_v2_t *p_cp)
{
/* create the t2 structure */
- opj_t2_v2_t *l_t2 = (opj_t2_v2_t*)opj_malloc(sizeof(opj_t2_v2_t));
+ opj_t2_t *l_t2 = (opj_t2_t*)opj_malloc(sizeof(opj_t2_t));
if (!l_t2) {
return NULL;
}
- memset(l_t2,0,sizeof(opj_t2_v2_t));
+ memset(l_t2,0,sizeof(opj_t2_t));
l_t2->image = p_image;
l_t2->cp = p_cp;
return l_t2;
}
-void opj_t2_destroy(opj_t2_v2_t *t2) {
+void opj_t2_destroy(opj_t2_t *t2) {
if(t2) {
opj_free(t2);
}
}
-opj_bool opj_t2_decode_packet( opj_t2_v2_t* p_t2,
- opj_tcd_tile_v2_t *p_tile,
+opj_bool opj_t2_decode_packet( opj_t2_t* p_t2,
+ opj_tcd_tile_t *p_tile,
opj_tcp_v2_t *p_tcp,
opj_pi_iterator_t *p_pi,
OPJ_BYTE *p_src,
}
opj_bool opj_t2_encode_packet( OPJ_UINT32 tileno,
- opj_tcd_tile_v2_t * tile,
+ opj_tcd_tile_t * tile,
opj_tcp_v2_t * tcp,
opj_pi_iterator_t *pi,
OPJ_BYTE *dest,
OPJ_UINT32 precno = pi->precno; /* precinct value */
OPJ_UINT32 layno = pi->layno; /* quality layer value */
OPJ_UINT32 l_nb_blocks;
- opj_tcd_band_v2_t *band = 00;
- opj_tcd_cblk_enc_v2_t* cblk = 00;
- opj_tcd_pass_v2_t *pass = 00;
+ opj_tcd_band_t *band = 00;
+ opj_tcd_cblk_enc_t* cblk = 00;
+ opj_tcd_pass_t *pass = 00;
- opj_tcd_tilecomp_v2_t *tilec = &tile->comps[compno];
- opj_tcd_resolution_v2_t *res = &tilec->resolutions[resno];
+ opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+ opj_tcd_resolution_t *res = &tilec->resolutions[resno];
opj_bio_t *bio = 00; /* BIO component */
band = res->bands;
for(bandno = 0; bandno < res->numbands; ++bandno) {
- opj_tcd_precinct_v2_t *prc = &band->precincts[precno];
+ opj_tcd_precinct_t *prc = &band->precincts[precno];
- tgt_reset(prc->incltree);
- tgt_reset(prc->imsbtree);
+ opj_tgt_reset(prc->incltree);
+ opj_tgt_reset(prc->imsbtree);
l_nb_blocks = prc->cw * prc->ch;
for (cblkno = 0; cblkno < l_nb_blocks; ++cblkno) {
- opj_tcd_cblk_enc_v2_t* cblk = &prc->cblks.enc[cblkno];
+ opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
cblk->numpasses = 0;
- tgt_setvalue(prc->imsbtree, cblkno, band->numbps - cblk->numbps);
+ opj_tgt_setvalue(prc->imsbtree, cblkno, band->numbps - cblk->numbps);
}
++band;
}
/* Writing Packet header */
band = res->bands;
for (bandno = 0; bandno < res->numbands; ++bandno) {
- opj_tcd_precinct_v2_t *prc = &band->precincts[precno];
+ opj_tcd_precinct_t *prc = &band->precincts[precno];
l_nb_blocks = prc->cw * prc->ch;
cblk = prc->cblks.enc;
opj_tcd_layer_t *layer = &cblk->layers[layno];
if (!cblk->numpasses && layer->numpasses) {
- tgt_setvalue(prc->incltree, cblkno, layno);
+ opj_tgt_setvalue(prc->incltree, cblkno, layno);
}
++cblk;
/* cblk inclusion bits */
if (!cblk->numpasses) {
- tgt_encode(bio, prc->incltree, cblkno, layno + 1);
+ opj_tgt_encode(bio, prc->incltree, cblkno, layno + 1);
} else {
opj_bio_write(bio, layer->numpasses != 0, 1);
}
/* if first instance of cblk --> zero bit-planes information */
if (!cblk->numpasses) {
cblk->numlenbits = 3;
- tgt_encode(bio, prc->imsbtree, cblkno, 999);
+ opj_tgt_encode(bio, prc->imsbtree, cblkno, 999);
}
/* number of coding passes included */
len += pass->len;
if (pass->term || passno == (cblk->numpasses + layer->numpasses) - 1) {
- increment = int_max(increment, int_floorlog2(len) + 1 - (cblk->numlenbits + int_floorlog2(nump)));
+ increment = opj_int_max(increment, opj_int_floorlog2(len) + 1 - (cblk->numlenbits + opj_int_floorlog2(nump)));
len = 0;
nump = 0;
}
len += pass->len;
if (pass->term || passno == (cblk->numpasses + layer->numpasses) - 1) {
- opj_bio_write(bio, len, cblk->numlenbits + int_floorlog2(nump));
+ opj_bio_write(bio, len, cblk->numlenbits + opj_int_floorlog2(nump));
len = 0;
nump = 0;
}
/* Writing the packet body */
band = res->bands;
for (bandno = 0; bandno < res->numbands; bandno++) {
- opj_tcd_precinct_v2_t *prc = &band->precincts[precno];
+ opj_tcd_precinct_t *prc = &band->precincts[precno];
l_nb_blocks = prc->cw * prc->ch;
cblk = prc->cblks.enc;
return OPJ_TRUE;
}
-static opj_bool opj_t2_skip_packet( opj_t2_v2_t* p_t2,
- opj_tcd_tile_v2_t *p_tile,
+static opj_bool opj_t2_skip_packet( opj_t2_t* p_t2,
+ opj_tcd_tile_t *p_tile,
opj_tcp_v2_t *p_tcp,
opj_pi_iterator_t *p_pi,
OPJ_BYTE *p_src,
-opj_bool opj_t2_read_packet_header( opj_t2_v2_t* p_t2,
- opj_tcd_tile_v2_t *p_tile,
+opj_bool opj_t2_read_packet_header( opj_t2_t* p_t2,
+ opj_tcd_tile_t *p_tile,
opj_tcp_v2_t *p_tcp,
opj_pi_iterator_t *p_pi,
opj_bool * p_is_data_present,
OPJ_BYTE *l_current_data = p_src_data;
opj_cp_v2_t *l_cp = p_t2->cp;
opj_bio_t *l_bio = 00; /* BIO component */
- opj_tcd_band_v2_t *l_band = 00;
- opj_tcd_cblk_dec_v2_t* l_cblk = 00;
- opj_tcd_resolution_v2_t* l_res = &p_tile->comps[p_pi->compno].resolutions[p_pi->resno];
+ opj_tcd_band_t *l_band = 00;
+ opj_tcd_cblk_dec_t* l_cblk = 00;
+ opj_tcd_resolution_t* l_res = &p_tile->comps[p_pi->compno].resolutions[p_pi->resno];
OPJ_BYTE *l_header_data = 00;
OPJ_BYTE **l_header_data_start = 00;
/* reset tagtrees */
for (bandno = 0; bandno < l_res->numbands; ++bandno) {
- opj_tcd_precinct_v2_t *l_prc = &l_band->precincts[p_pi->precno];
+ opj_tcd_precinct_t *l_prc = &l_band->precincts[p_pi->precno];
if ( ! ((l_band->x1-l_band->x0 == 0)||(l_band->y1-l_band->y0 == 0)) ) {
- tgt_reset(l_prc->incltree);
- tgt_reset(l_prc->imsbtree);
+ opj_tgt_reset(l_prc->incltree);
+ opj_tgt_reset(l_prc->imsbtree);
l_cblk = l_prc->cblks.dec;
l_nb_code_blocks = l_prc->cw * l_prc->ch;
l_band = l_res->bands;
for (bandno = 0; bandno < l_res->numbands; ++bandno) {
- opj_tcd_precinct_v2_t *l_prc = &(l_band->precincts[p_pi->precno]);
+ opj_tcd_precinct_t *l_prc = &(l_band->precincts[p_pi->precno]);
if ((l_band->x1-l_band->x0 == 0)||(l_band->y1-l_band->y0 == 0)) {
++l_band;
/* if cblk not yet included before --> inclusion tagtree */
if (!l_cblk->numsegs) {
- l_included = tgt_decode(l_bio, l_prc->incltree, cblkno, p_pi->layno + 1);
+ l_included = opj_tgt_decode(l_bio, l_prc->incltree, cblkno, p_pi->layno + 1);
/* else one bit */
}
else {
if (!l_cblk->numsegs) {
OPJ_UINT32 i = 0;
- while (!tgt_decode(l_bio, l_prc->imsbtree, cblkno, i)) {
+ while (!opj_tgt_decode(l_bio, l_prc->imsbtree, cblkno, i)) {
++i;
}
n = l_cblk->numnewpasses;
do {
- l_cblk->segs[l_segno].numnewpasses = int_min(l_cblk->segs[l_segno].maxpasses - l_cblk->segs[l_segno].numpasses, n);
- l_cblk->segs[l_segno].newlen = opj_bio_read(l_bio, l_cblk->numlenbits + uint_floorlog2(l_cblk->segs[l_segno].numnewpasses));
+ l_cblk->segs[l_segno].numnewpasses = opj_int_min(l_cblk->segs[l_segno].maxpasses - l_cblk->segs[l_segno].numpasses, n);
+ l_cblk->segs[l_segno].newlen = opj_bio_read(l_bio, l_cblk->numlenbits + opj_uint_floorlog2(l_cblk->segs[l_segno].numnewpasses));
n -= l_cblk->segs[l_segno].numnewpasses;
if (n > 0) {
return OPJ_TRUE;
}
-opj_bool opj_t2_read_packet_data( opj_t2_v2_t* p_t2,
- opj_tcd_tile_v2_t *p_tile,
+opj_bool opj_t2_read_packet_data( opj_t2_t* p_t2,
+ opj_tcd_tile_t *p_tile,
opj_pi_iterator_t *p_pi,
OPJ_BYTE *p_src_data,
OPJ_UINT32 * p_data_read,
OPJ_UINT32 bandno, cblkno;
OPJ_UINT32 l_nb_code_blocks;
OPJ_BYTE *l_current_data = p_src_data;
- opj_tcd_band_v2_t *l_band = 00;
- opj_tcd_cblk_dec_v2_t* l_cblk = 00;
- opj_tcd_resolution_v2_t* l_res = &p_tile->comps[p_pi->compno].resolutions[p_pi->resno];
+ opj_tcd_band_t *l_band = 00;
+ opj_tcd_cblk_dec_t* l_cblk = 00;
+ opj_tcd_resolution_t* l_res = &p_tile->comps[p_pi->compno].resolutions[p_pi->resno];
l_band = l_res->bands;
for (bandno = 0; bandno < l_res->numbands; ++bandno) {
- opj_tcd_precinct_v2_t *l_prc = &l_band->precincts[p_pi->precno];
+ opj_tcd_precinct_t *l_prc = &l_band->precincts[p_pi->precno];
if ((l_band->x1-l_band->x0 == 0)||(l_band->y1-l_band->y0 == 0)) {
++l_band;
return OPJ_TRUE;
}
-opj_bool opj_t2_skip_packet_data( opj_t2_v2_t* p_t2,
- opj_tcd_tile_v2_t *p_tile,
+opj_bool opj_t2_skip_packet_data( opj_t2_t* p_t2,
+ opj_tcd_tile_t *p_tile,
opj_pi_iterator_t *p_pi,
OPJ_UINT32 * p_data_read,
OPJ_UINT32 p_max_length,
{
OPJ_UINT32 bandno, cblkno;
OPJ_UINT32 l_nb_code_blocks;
- opj_tcd_band_v2_t *l_band = 00;
- opj_tcd_cblk_dec_v2_t* l_cblk = 00;
- opj_tcd_resolution_v2_t* l_res = &p_tile->comps[p_pi->compno].resolutions[p_pi->resno];
+ opj_tcd_band_t *l_band = 00;
+ opj_tcd_cblk_dec_t* l_cblk = 00;
+ opj_tcd_resolution_t* l_res = &p_tile->comps[p_pi->compno].resolutions[p_pi->resno];
*p_data_read = 0;
l_band = l_res->bands;
for (bandno = 0; bandno < l_res->numbands; ++bandno) {
- opj_tcd_precinct_v2_t *l_prc = &l_band->precincts[p_pi->precno];
+ opj_tcd_precinct_t *l_prc = &l_band->precincts[p_pi->precno];
if ((l_band->x1-l_band->x0 == 0)||(l_band->y1-l_band->y0 == 0)) {
++l_band;
}
-opj_bool opj_t2_init_seg( opj_tcd_cblk_dec_v2_t* cblk,
+opj_bool opj_t2_init_seg( opj_tcd_cblk_dec_t* cblk,
OPJ_UINT32 index,
OPJ_UINT32 cblksty,
OPJ_UINT32 first)
opj_free(cblk->segs);
cblk->segs = NULL;
cblk->m_current_max_segs = 0;
- /* opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to initialize segment %d\n", l_nb_segs); */
+ /* opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to initialize segment %d\n", l_nb_segs); */
return OPJ_FALSE;
}
cblk->segs = new_segs;
projects / openjpeg.git / blobdiff