Revert "Packet header writing: set empty packet header bit to 0 when appropriate...

[openjpeg.git] / src / lib / openjp2 / t2.c

diff --git a/src/lib/openjp2/t2.c b/src/lib/openjp2/t2.c
index 6f956d1c7f6f988d243a86f64c34f2e8020c7f5e..381d7863322640320f334ad2a331c8c605aecc2a 100644 (file)
--- a/src/lib/openjp2/t2.c
+++ b/src/lib/openjp2/t2.c
@@ -667,7 +667,6 @@ static OPJ_BOOL opj_t2_encode_packet(OPJ_UINT32 tileno,
     opj_tcd_resolution_t *res = &tilec->resolutions[resno];
 
     opj_bio_t *bio = 00;    /* BIO component */
-    OPJ_BOOL packet_empty = OPJ_TRUE;
 
     /* <SOP 0xff91> */
     if (tcp->csty & J2K_CP_CSTY_SOP) {
@@ -727,42 +726,11 @@ static OPJ_BOOL opj_t2_encode_packet(OPJ_UINT32 tileno,
         return OPJ_FALSE;
     }
     opj_bio_init_enc(bio, c, length);
-
-    /* Check if the packet is empty */
-    /* Note: we could also skip that step and always write a packet header */
-    band = res->bands;
-    for (bandno = 0; bandno < res->numbands; ++bandno, ++band) {
-        opj_tcd_precinct_t *prc;
-        /* Skip empty bands */
-        if (opj_tcd_is_band_empty(band)) {
-            continue;
-        }
-
-        prc = &band->precincts[precno];
-        l_nb_blocks = prc->cw * prc->ch;
-        cblk = prc->cblks.enc;
-        for (cblkno = 0; cblkno < l_nb_blocks; cblkno++, ++cblk) {
-            opj_tcd_layer_t *layer = &cblk->layers[layno];
-
-            /* if cblk not included, go to the next cblk  */
-            if (!layer->numpasses) {
-                continue;
-            }
-            packet_empty = OPJ_FALSE;
-            break;
-        }
-        if (!packet_empty) {
-            break;
-        }
-    }
-
-    opj_bio_write(bio, packet_empty ? 0 : 1, 1);           /* Empty header bit */
-
+    opj_bio_write(bio, 1, 1);           /* Empty header bit */
 
     /* Writing Packet header */
     band = res->bands;
-    for (bandno = 0; !packet_empty &&
-            bandno < res->numbands; ++bandno, ++band)      {
+    for (bandno = 0; bandno < res->numbands; ++bandno, ++band)      {
         opj_tcd_precinct_t *prc;
 
         /* Skip empty bands */
@@ -895,7 +863,7 @@ static OPJ_BOOL opj_t2_encode_packet(OPJ_UINT32 tileno,
 
     /* Writing the packet body */
     band = res->bands;
-    for (bandno = 0; !packet_empty && bandno < res->numbands; bandno++, ++band) {
+    for (bandno = 0; bandno < res->numbands; bandno++, ++band) {
         opj_tcd_precinct_t *prc;
 
         /* Skip empty bands */