major change in the dwt-module, thanks to Ive (aka Reiner Wahler): thanks a lot ...

[openjpeg.git] / libopenjpeg / jp2.c

diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index a7f9fddcbce1be1c96cbaecec5e6534a604dcb52..4380093d47f16d2b4680faeb55fcb397c114ffe2 100644 (file)
--- a/libopenjpeg/jp2.c
+++ b/libopenjpeg/jp2.c
@@ -32,8 +32,6 @@
 #include "j2k.h"
 #include "jp2.h"
 #include "cio.h"
-#include "tcd.h"
-#include "int.h"
 
 #define JPIP_JPIP 0x6a706970
 
@@ -65,6 +63,11 @@ int jp2_read_boxhdr(jp2_box_t * box)
       return 1;
     };
     box->length = cio_read(4);
+    if (box->length == 0) 
+      box->length = cio_numbytesleft() + 12;
+  }
+  else if (box->length == 0) {
+    box->length = cio_numbytesleft() + 8;
   }
   return 0;
 }
@@ -74,61 +77,24 @@ int jp2_read_boxhdr(jp2_box_t * box)
 * Initialisation of a Standard JP2 structure
 */
 
-int jp2_init_stdjp2(jp2_struct_t * jp2_struct, j2k_image_t * img)
+int jp2_init_stdjp2(jp2_struct_t * jp2_struct)
 {
-  int depth_0, sign, depth, i;
-
 
-  jp2_struct->h = img->y1 - img->y0;   // HEIGHT
-  jp2_struct->w = img->x1 - img->x0;   // WIDTH
-  jp2_struct->numcomps = img->numcomps;        // NC
   jp2_struct->comps = (jp2_comps_t *) malloc(jp2_struct->numcomps * sizeof(jp2_comps_t));
 
-  depth_0 = img->comps[0].prec - 1;
-  sign = img->comps[0].sgnd;
-  jp2_struct->bpc = depth_0 + (sign << 7);
-
-  for (i = 1; i < img->numcomps; i++) {
-    depth = img->comps[i].prec - 1;
-    sign = img->comps[i].sgnd;
-    if (depth_0 != depth)
-      jp2_struct->bpc = 255;
-  }
-
-
-
-  jp2_struct->C = 7;           // C : Always 7
-  jp2_struct->UnkC = 0;                // UnkC, colorspace specified in colr box
-  jp2_struct->IPR = 0;         // IPR, no intellectual property
-
-  for (i = 0; i < img->numcomps; i++)
-    jp2_struct->comps[i].bpcc =
-      img->comps[i].prec - 1 + (img->comps[i].sgnd << 7);
-
   jp2_struct->precedence = 0;  // PRECEDENCE
   jp2_struct->approx = 0;      // APPROX
 
-  if ((img->numcomps == 1 || img->numcomps == 3)
-      && (jp2_struct->bpc != 255))
-    jp2_struct->meth = 1;
-  else
-    jp2_struct->meth = 2;
-
-  if (jp2_struct->meth == 1) {
-    if (img->color_space == 1)
-      jp2_struct->enumcs = 16;
-    else if (img->color_space == 2)
-      jp2_struct->enumcs = 17;
-    else if (img->color_space == 3)
-      jp2_struct->enumcs = 18; // YUV                          
-  } else
-    jp2_struct->enumcs = 0;    // PROFILE (??)
-
   jp2_struct->brand = JP2_JP2; /* BR         */
   jp2_struct->minversion = 0;  /* MinV       */
   jp2_struct->numcl = 1;
   jp2_struct->cl = (int *) malloc(jp2_struct->numcl * sizeof(int));
   jp2_struct->cl[0] = JP2_JP2; /* CL0 : JP2  */
+
+  jp2_struct->C = 7;           // C : Always 7
+  jp2_struct->UnkC = 0;                // UnkC, colorspace specified in colr box
+  jp2_struct->IPR = 0;         // IPR, no intellectual property
+
   return 0;
 }
 
@@ -415,38 +381,37 @@ int jp2_read_ftyp(jp2_struct_t * jp2_struct)
   jp2_struct->cl =
     (unsigned int *) malloc(jp2_struct->numcl * sizeof(unsigned int));
 
-  for (i = jp2_struct->numcl; i > 0; i--)
+  for (i = 0; i < (int)jp2_struct->numcl; i++)
     jp2_struct->cl[i] = cio_read(4);   /* CLi */
 
   if (cio_tell() - box.init_pos != box.length) {
-    fprintf(stderr, "Error with FTYP Box\n");
+    fprintf(stderr, "Error with FTYP Box\n"); 
     return 1;
   }
   return 0;
 }
 
-int jp2_write_jp2c(j2k_image_t * img, j2k_cp_t * cp, char *jp2_buffer,
-                  char *index)
+int jp2_write_jp2c(int j2k_codestream_len, int *j2k_codestream_offset, char *j2k_codestream)
 {
-  int len;
   jp2_box_t box;
 
   box.init_pos = cio_tell();
   cio_skip(4);
   cio_write(JP2_JP2C, 4);      // JP2C
 
-  len = j2k_encode(img, cp, jp2_buffer, cp->tdx * cp->tdy * cp->th * cp->tw * 2, index);
+  *j2k_codestream_offset = cio_tell();
+  memcpy(cio_getbp(),j2k_codestream, j2k_codestream_len);
 
-  box.length = cio_tell() - box.init_pos;
+  box.length = 8 + j2k_codestream_len;
   cio_seek(box.init_pos);
   cio_write(box.length, 4);    /*    L       */
   cio_seek(box.init_pos + box.length);
+
   return box.length;
 }
 
 
-int jp2_read_jp2c(unsigned char *src, int len, jp2_struct_t * jp2_struct,
-                 j2k_cp_t * cp)
+int jp2_read_jp2c(unsigned int *j2k_codestream_len, unsigned int *j2k_codestream_offset)
 {
   jp2_box_t box;
 
@@ -456,12 +421,8 @@ int jp2_read_jp2c(unsigned char *src, int len, jp2_struct_t * jp2_struct,
     return 1;
   }
 
-  src += cio_tell();
-
-  if (j2k_decode(src, len, jp2_struct->image, cp) == 0) {
-    fprintf(stderr, "JP2F box: failed to decode J2K bitstream image!\n");
-    return 1;
-  }
+  *j2k_codestream_offset = cio_tell();
+  *j2k_codestream_len = box.length - 8;
 
   return 0;
 }
@@ -509,8 +470,8 @@ int jp2_read_jp()
 
 }
 
-int jp2_decode(unsigned char *src, int len, jp2_struct_t * jp2_struct,
-              j2k_cp_t * cp)
+
+int jp2_read_struct(unsigned char *src, jp2_struct_t * jp2_struct, int len)
 {
   cio_init(src, len);
 
@@ -520,20 +481,18 @@ int jp2_decode(unsigned char *src, int len, jp2_struct_t * jp2_struct,
     return 1;
   if (jp2_read_jp2h(jp2_struct))
     return 1;
-  if (jp2_read_jp2c(src, len, jp2_struct, cp))
+  if (jp2_read_jp2c(&jp2_struct->j2k_codestream_len, &jp2_struct->j2k_codestream_offset))
     return 1;
   return 0;
 }
 
-int jp2_encode(jp2_struct_t * jp2_struct, j2k_cp_t * cp, char *output,
-              char *index)
+int jp2_wrap_j2k(jp2_struct_t * jp2_struct, char *j2k_codestream, char *output)
 {
-  int len;
-
   jp2_write_jp();
   jp2_write_ftyp(jp2_struct);
   jp2_write_jp2h(jp2_struct);
-  len = jp2_write_jp2c(jp2_struct->image, cp, output, index);
+
+  jp2_write_jp2c(jp2_struct->j2k_codestream_len, &jp2_struct->j2k_codestream_offset, j2k_codestream);
 
   return cio_tell();
 }