[trunk][JPIP] enabled OpenJPEG V2 API

diff --git a/applications/jpip/CHANGES b/applications/jpip/CHANGES
index 902eff404180821eaccb3754ad68d3ebc3491196..14ac96d724dde04213453ed62bbf3af90efb2968 100644 (file)
--- a/applications/jpip/CHANGES
+++ b/applications/jpip/CHANGES
@@ -7,6 +7,7 @@ What's New for OpenJPIP
 
 November 8, 2011
 ! [kaori] updated main page of doxygen
+! [kaori] enabled OpenJPEG V2 API
 
 November 3, 2011
 * [kaori] solved memory leak of opj_server

diff --git a/applications/jpip/libopenjpip/dec_clientmsg_handler.c b/applications/jpip/libopenjpip/dec_clientmsg_handler.c
index 294285af23eaa93c0348141903ff4f90e7bc514c..f001238fd3f46f28c70fc07807ee8cdf54af1ce8 100644 (file)
--- a/applications/jpip/libopenjpip/dec_clientmsg_handler.c
+++ b/applications/jpip/libopenjpip/dec_clientmsg_handler.c
@@ -112,7 +112,8 @@ void handle_PNMreqMSG( SOCKET connected_socket, Byte_t *jpipstream, msgqueue_par
 
   send_PNMstream( connected_socket, pnmstream, ihdrbox->width, ihdrbox->height, ihdrbox->nc, ihdrbox->bpc > 8 ? 255 : (1 << ihdrbox->bpc) - 1);
 
-  free( pnmstream);
+  if( pnmstream)
+    free( pnmstream);
 }
 
 void handle_XMLreqMSG( SOCKET connected_socket, Byte_t *jpipstream, cachelist_param_t *cachelist)

diff --git a/applications/jpip/libopenjpip/imgsock_manager.c b/applications/jpip/libopenjpip/imgsock_manager.c
index 79149f5fe4d5c704c9c236249d8bad12c1c71546..6caf727873c7a677c48827ca6d1e40bd8e8b40ec 100644 (file)
--- a/applications/jpip/libopenjpip/imgsock_manager.c
+++ b/applications/jpip/libopenjpip/imgsock_manager.c
@@ -85,7 +85,7 @@ SOCKET open_listeningsocket()
     close_socket(listening_socket);
     exit(1);
   }
-  printf("port %d is listened\n", port);
+  fprintf( stderr, "port %d is listened\n", port);
 
   return listening_socket;
 }
@@ -114,7 +114,7 @@ msgtype_t identify_clientmsg( SOCKET connected_socket)
 
   for( i=0; i<NUM_OF_MSGTYPES; i++){
     if( strncasecmp( magicid[i], buf, strlen(magicid[i])) == 0){
-      printf("%s\n", magicid[i]);
+      fprintf( stderr, "%s\n", magicid[i]);
       return i;
     }
   }

diff --git a/applications/jpip/libopenjpip/jp2k_decoder.c b/applications/jpip/libopenjpip/jp2k_decoder.c
index 933331b287e1f5740c7ef66d56b1a10e3793c843..935d6599b4ba6ff8222fcbc37e27f07780017c9b 100644 (file)
--- a/applications/jpip/libopenjpip/jp2k_decoder.c
+++ b/applications/jpip/libopenjpip/jp2k_decoder.c
@@ -41,14 +41,14 @@ void info_callback(const char *msg, void *client_data);
 
 Byte_t * imagetopnm(opj_image_t *image, ihdrbox_param_t **ihdrbox);
 
-Byte_t * j2k_to_pnm( Byte_t *j2kstream, Byte8_t j2klen, ihdrbox_param_t **ihdrbox)
+Byte_t * j2k_to_pnm( FILE *fp, ihdrbox_param_t **ihdrbox)
 {
   Byte_t *pnmstream = NULL;
   opj_dparameters_t parameters;        /* decompression parameters */
   opj_event_mgr_t event_mgr;           /* event manager */
   opj_image_t *image = NULL;
-  opj_dinfo_t* dinfo = NULL;   /* handle to a decompressor */
-  opj_cio_t *cio = NULL;
+  opj_codec_t *dinfo = NULL;   /* handle to a decompressor */
+  opj_stream_t *cio = NULL;
 
   /* configure the event callbacks (not required) */
   memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
@@ -59,35 +59,61 @@ Byte_t * j2k_to_pnm( Byte_t *j2kstream, Byte8_t j2klen, ihdrbox_param_t **ihdrbo
   /* set decoding parameters to default values */
   opj_set_default_decoder_parameters(&parameters);
 
+  /* Set default event mgr */
+  opj_initialize_default_event_handler(&event_mgr, 1);  
+
+  /* set a byte stream */
+  cio = opj_stream_create_default_file_stream( fp, 1);
+  if (!cio){
+    fprintf(stderr, "ERROR -> failed to create the stream from the file\n");
+    return NULL;
+  }
+  
   /* decode the code-stream */
   /* ---------------------- */
 
   /* JPEG-2000 codestream */
   /* get a decoder handle */
-  dinfo = opj_create_decompress( CODEC_J2K);
-
-  /* catch events using our callbacks and give a local context */
-  opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
+  dinfo = opj_create_decompress_v2(CODEC_J2K);
 
   /* setup the decoder decoding parameters using user parameters */
-  opj_setup_decoder(dinfo, &parameters);
-  /* open a byte stream */
-  cio = opj_cio_open((opj_common_ptr)dinfo, j2kstream, j2klen);
-
-  fprintf( stderr, "opj_decode dinfo:%p cio:%p\n", dinfo, cio);
-  /* decode the stream and fill the image structure */
-  image = opj_decode(dinfo, cio);
-
-  fprintf( stderr, "done\n");
-  if(!image) {
-    fprintf(stderr, "ERROR -> jp2_to_image: failed to decode image!\n");
-    opj_destroy_decompress(dinfo);
-    opj_cio_close(cio);
+  if ( !opj_setup_decoder_v2(dinfo, &parameters, &event_mgr) ){
+    fprintf(stderr, "ERROR -> j2k_dump: failed to setup the decoder\n");
+    return NULL;
+  }
+
+  /* Read the main header of the codestream and if necessary the JP2 boxes*/
+  if(! opj_read_header( cio, dinfo, &image)){
+    fprintf(stderr, "ERROR -> j2k_to_image: failed to read the header\n");
+    opj_stream_destroy(cio);
+    opj_destroy_codec(dinfo);
+    opj_image_destroy(image);
+    return NULL;
+  }
+  
+#ifdef TODO //decode area could be set from j2k_to_pnm call, modify the protocol between JPIP viewer and opj_dec_server
+  if (! opj_set_decode_area( dinfo, image, parameters.DA_x0, parameters.DA_y0, parameters.DA_x1, parameters.DA_y1)){
+    fprintf(stderr, "ERROR -> j2k_to_image: failed to set the decoded area\n");
+    opj_stream_destroy(cio);
+    opj_destroy_codec(dinfo);
+    opj_image_destroy(image);
     return NULL;
   }
+#endif //TODO
+
+  /* Get the decoded image */
+  if ( !( opj_decode_v2(dinfo, cio, image) && opj_end_decompress(dinfo,cio) ) ) {
+    fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
+    opj_stream_destroy(cio);
+    opj_destroy_codec(dinfo);
+    opj_image_destroy(image);
+    return NULL;
+  }
+
+  fprintf(stderr, "image is decoded!\n");
 
   /* close the byte stream */
-  opj_cio_close(cio);
+  opj_stream_destroy(cio);
   
   /* create output image */
   /* ------------------- */
@@ -96,7 +122,7 @@ Byte_t * j2k_to_pnm( Byte_t *j2kstream, Byte8_t j2klen, ihdrbox_param_t **ihdrbo
 
   /* free remaining structures */
   if(dinfo) {
-    opj_destroy_decompress(dinfo);
+    opj_destroy_codec(dinfo);
   }
 
   /* free image data structure */

diff --git a/applications/jpip/libopenjpip/jp2k_decoder.h b/applications/jpip/libopenjpip/jp2k_decoder.h
index 59c8dc97e0032b0963af10096e463c0a32bd6331..c999cdf1624f86b017586710f5369df6769aa271 100644 (file)
--- a/applications/jpip/libopenjpip/jp2k_decoder.h
+++ b/applications/jpip/libopenjpip/jp2k_decoder.h
@@ -34,6 +34,6 @@
 #include "byte_manager.h"
 #include "ihdrbox_manager.h"
 
-Byte_t * j2k_to_pnm( Byte_t *j2kstream, Byte8_t j2klen, ihdrbox_param_t **ihdrbox);
+Byte_t * j2k_to_pnm( FILE *fp, ihdrbox_param_t **ihdrbox);
 
 #endif             /* !JP2K_DECODER_H_ */

diff --git a/applications/jpip/libopenjpip/jpipstream_manager.c b/applications/jpip/libopenjpip/jpipstream_manager.c
index 97b61526cea1cd8e1a9cf40a0bd61622ef5e215e..983aac486e3201e93a11c14d075213e3759a7a5e 100644 (file)
--- a/applications/jpip/libopenjpip/jpipstream_manager.c
+++ b/applications/jpip/libopenjpip/jpipstream_manager.c
@@ -73,11 +73,20 @@ Byte_t * jpipstream_to_pnm( Byte_t *jpipstream, msgqueue_param_t *msgqueue, Byte
   Byte_t *pnmstream;
   Byte_t *j2kstream; // j2k or jp2 codestream
   Byte8_t j2klen;
+  FILE *fp;
+  char j2kfname[] = "tmp.j2k";
 
   j2kstream = recons_j2k( msgqueue, jpipstream, csn, fw, fh, &j2klen); 
-  pnmstream = j2k_to_pnm( j2kstream, j2klen, ihdrbox);
 
+  fp = fopen( j2kfname, "w+b");
+  fwrite( j2kstream, j2klen, 1, fp);
   free( j2kstream);
+  fseek( fp, 0, SEEK_SET);
+
+  pnmstream = j2k_to_pnm( fp, ihdrbox);
+
+  fclose( fp);
+  remove( j2kfname);
 
   return pnmstream;
 }

diff --git a/applications/jpip/libopenjpip/openjpip.c b/applications/jpip/libopenjpip/openjpip.c
index a4f3000a0e2e15c8f30c10a1819583474f6d0160..7bdedea0eb9315c42a3f2e1ec53e85e028303056 100644 (file)
--- a/applications/jpip/libopenjpip/openjpip.c
+++ b/applications/jpip/libopenjpip/openjpip.c
@@ -218,7 +218,7 @@ bool handle_clientreq( client_t client, dec_server_record_t *rec)
     break;
   }
         
-  printf("\t end of the connection\n\n");
+  fprintf( stderr, "\t end of the connection\n\n");
   if( close_socket(client) != 0){
     perror("close");
     return false;