From 49a0f0db8fe8c85f3e808e4857ee48322c47dcea Mon Sep 17 00:00:00 2001
From: Antonin Descampe <antonin@gmail.com>
Date: Tue, 1 Nov 2011 23:28:07 +0000
Subject: [PATCH] [1.5] backport revisions 996, 997, 1000, 1008-1012 from trunk
 (JPIP modifications)

---
 CHANGES                                       |   1 +
 applications/JavaOpenJPEG/JavaOpenJPEG.c      |   8 +-
 applications/codec/image_to_j2k.c             |   8 +-
 applications/jpip/CHANGES                     |   9 +
 applications/jpip/README                      |   4 +-
 .../jpip/libopenjpip/j2kheader_manager.c      |   4 +-
 applications/jpip/libopenjpip/jp2k_encoder.c  | 324 +++++++++--
 .../jpip/libopenjpip/msgqueue_manager.c       |  58 +-
 .../jpip/libopenjpip/msgqueue_manager.h       |   3 +-
 .../opj_client/opj_dec_server/CMakeLists.txt  |   1 +
 .../opj_client/opj_dec_server/Makefile.am     |   4 +-
 .../opj_client/opj_dec_server/Makefile.nix    |   5 +-
 .../opj_dec_server/dec_clientmsg_handler.c    | 307 ++++++++++
 .../opj_dec_server/dec_clientmsg_handler.h    |  53 ++
 .../opj_dec_server/imgsock_manager.c          |  23 +-
 .../opj_dec_server/imgsock_manager.h          |  20 +-
 .../opj_dec_server/opj_dec_server.c           | 292 +---------
 .../opj_viewer/dist/opj_viewer-20111018.jar   | Bin 0 -> 15873 bytes
 .../opj_client/opj_viewer/dist/opj_viewer.jar |   2 +-
 applications/jpip/opj_server/CMakeLists.txt   |   1 +
 applications/jpip/opj_server/Makefile.am      |   4 +-
 applications/jpip/opj_server/Makefile.nix     |   4 +-
 applications/jpip/opj_server/jpip_parser.c    | 536 ++++++++++++++++++
 applications/jpip/opj_server/jpip_parser.h    |  56 ++
 applications/jpip/opj_server/opj_server.c     | 495 +---------------
 applications/jpip/opj_server/query_parser.c   |  31 +-
 applications/jpip/opj_server/query_parser.h   |   2 +
 applications/jpip/tools/jpip_to_j2k.c         |   1 +
 28 files changed, 1384 insertions(+), 872 deletions(-)
 create mode 100644 applications/jpip/opj_client/opj_dec_server/dec_clientmsg_handler.c
 create mode 100644 applications/jpip/opj_client/opj_dec_server/dec_clientmsg_handler.h
 create mode 100644 applications/jpip/opj_client/opj_viewer/dist/opj_viewer-20111018.jar
 create mode 100644 applications/jpip/opj_server/jpip_parser.c
 create mode 100644 applications/jpip/opj_server/jpip_parser.h

diff --git a/CHANGES b/CHANGES
index 5565b914..1c7d7746 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ What's New for OpenJPEG
 
 October 21, 2011
 * [mickael] remove one obvious memory leak from test functions
+! [kaori]   change -v option was renamed to -u, which is equivalent to -TP long option
 
 October 20, 2011
 * [mickael] remove obvious memory leak from applications
diff --git a/applications/JavaOpenJPEG/JavaOpenJPEG.c b/applications/JavaOpenJPEG/JavaOpenJPEG.c
index 0926b77c..eea41c25 100644
--- a/applications/JavaOpenJPEG/JavaOpenJPEG.c
+++ b/applications/JavaOpenJPEG/JavaOpenJPEG.c
@@ -204,6 +204,8 @@ void encode_help_display() {
 	fprintf(stdout,"                 Indicate multiple modes by adding their values. \n");
 	fprintf(stdout,"                 ex: RESTART(4) + RESET(2) + SEGMARK(32) = -M 38\n");
 	fprintf(stdout,"\n");
+	fprintf(stdout,"-TP          : devide packets of every tile into tile-parts (-TP R) [R, L, C]\n");
+	fprintf(stdout,"\n");
 	fprintf(stdout,"-x           : create an index file *.Idx (-x index_name.Idx) \n");
 	fprintf(stdout,"\n");
 	fprintf(stdout,"-ROI         : c=%%d,U=%%d : quantization indices upshifted \n");
@@ -499,7 +501,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
 		{"cinema2K",REQ_ARG, NULL ,'w'},
 		{"cinema4K",NO_ARG, NULL ,'y'},
 		{"ImgDir",REQ_ARG, NULL ,'z'},
-		{"TP",REQ_ARG, NULL ,'v'},
+		{"TP",REQ_ARG, NULL ,'u'},
 		{"SOP",NO_ARG, NULL ,'S'},
 		{"EPH",NO_ARG, NULL ,'E'},
 		{"OutFor",REQ_ARG, NULL ,'O'},
@@ -510,7 +512,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
 
 	/* parse the command line */
 /* UniPG>> */
-	const char optlist[] = "i:o:hr:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:"
+	const char optlist[] = "i:o:hr:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:u:J"
 #ifdef USE_JPWL
 		"W:"
 #endif /* USE_JPWL */
@@ -871,7 +873,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
 
 			/* ------------------------------------------------------ */
 			
-			case 'v':			/* Tile part generation*/
+			case 'u':			/* Tile part generation*/
 			{
 				parameters->tp_flag = opj_optarg[0];
 				parameters->tp_on = 1;
diff --git a/applications/codec/image_to_j2k.c b/applications/codec/image_to_j2k.c
index 93d0c6ff..968afcc6 100644
--- a/applications/codec/image_to_j2k.c
+++ b/applications/codec/image_to_j2k.c
@@ -193,6 +193,8 @@ void encode_help_display(void) {
 	fprintf(stdout,"                 Indicate multiple modes by adding their values. \n");
 	fprintf(stdout,"                 ex: RESTART(4) + RESET(2) + SEGMARK(32) = -M 38\n");
 	fprintf(stdout,"\n");
+	fprintf(stdout,"-TP          : devide packets of every tile into tile-parts (-TP R) [R, L, C]\n");
+	fprintf(stdout,"\n");
 	fprintf(stdout,"-x           : create an index file *.Idx (-x index_name.Idx) \n");
 	fprintf(stdout,"\n");
 	fprintf(stdout,"-ROI         : c=%%d,U=%%d : quantization indices upshifted \n");
@@ -581,7 +583,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
 		{"cinema2K",REQ_ARG, NULL ,'w'},
 		{"cinema4K",NO_ARG, NULL ,'y'},
 		{"ImgDir",REQ_ARG, NULL ,'z'},
-		{"TP",REQ_ARG, NULL ,'v'},
+		{"TP",REQ_ARG, NULL ,'u'},
 		{"SOP",NO_ARG, NULL ,'S'},
 		{"EPH",NO_ARG, NULL ,'E'},
 		{"OutFor",REQ_ARG, NULL ,'O'},
@@ -591,7 +593,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
 	};
 
 	/* parse the command line */
-	const char optlist[] = "i:o:r:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:v:"
+	const char optlist[] = "i:o:r:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:u:J"
 #ifdef USE_JPWL
 		"W:"
 #endif /* USE_JPWL */
@@ -1005,7 +1007,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
 
 			/* ------------------------------------------------------ */
 
-			case 'v':			/* Tile part generation*/
+			case 'u':			/* Tile part generation*/
 			{
 				parameters->tp_flag = opj_optarg[0];
 				parameters->tp_on = 1;
diff --git a/applications/jpip/CHANGES b/applications/jpip/CHANGES
index 34fa3cfc..c5ae11ad 100644
--- a/applications/jpip/CHANGES
+++ b/applications/jpip/CHANGES
@@ -5,6 +5,15 @@ What's New for OpenJPIP
 ! : changed
 + : added
 
+October 14, 2011
+! [kaori] rearranged opj_server, opj_dec_server directory
+
+October 14, 2011
++ [kaori] enable all progression orders
+
+October 12, 2011
++ [kaori] enable layers requests; restricting the number of codesream quality layers
+
 October 11, 2011
 + [antonin] enable JPT-stream request from client viewer option (credit to kaori)
 
diff --git a/applications/jpip/README b/applications/jpip/README
index 0bd22fda..9842b936 100644
--- a/applications/jpip/README
+++ b/applications/jpip/README
@@ -126,11 +126,11 @@ Client:
 ----------
 
 An example to encode a TIF image "copenhague1.tif" at resolution 4780x4050, 8bit/pixel, grayscale.
-   % ./image_to_j2k -i copenhague1.tif -o copenhague1.jp2 -p RPCL -c [64,64] -t 640,480 -jpip -v R
+   % ./image_to_j2k -i copenhague1.tif -o copenhague1.jp2 -p RPCL -c [64,64] -t 640,480 -jpip -TP R
 
  options
   -jpip : embed index table box into the output JP2 file (obligation for JPIP)
-  -v R  : partition a tile into tile parts of different resolution levels (obligation for JPT-stream)
+  -TP R : partition a tile into tile parts of different resolution levels (obligation for JPT-stream)
 
 <Option>
  3. Embed metadata into JP2 file
diff --git a/applications/jpip/libopenjpip/j2kheader_manager.c b/applications/jpip/libopenjpip/j2kheader_manager.c
index ad94d587..afbb2525 100644
--- a/applications/jpip/libopenjpip/j2kheader_manager.c
+++ b/applications/jpip/libopenjpip/j2kheader_manager.c
@@ -162,8 +162,7 @@ bool modify_mainheader( Byte_t *j2kstream, int numOfdecomp, SIZmarker_param_t SI
   if( !(newLcod = modify_CODmkrstream( COD, numOfdecomp, j2kstream)))
     return false;
 
-  // memmove( j2kstream+2+newLcod, j2kstream+2+COD.Lcod, (*j2klen)-(SIZ.Lsiz+newLcod+6));// new->oldLcod
-   memmove( j2kstream+2+newLcod, j2kstream+2+COD.Lcod, (*j2klen)-(SIZ.Lsiz+COD.Lcod+6));
+  memmove( j2kstream+2+newLcod, j2kstream+2+COD.Lcod, (*j2klen)-(SIZ.Lsiz+COD.Lcod+6));
   *j2klen -= ( COD.Lcod - newLcod);
   
   return true;
@@ -222,6 +221,7 @@ Byte2_t modify_CODmkrstream( CODmarker_param_t COD, int numOfdecomp, Byte_t *COD
     newLcod = COD.Lcod;
     CODstream += 2;
   }
+  
   CODstream += 5; // skip Scod & SGcod
   
   // SPcod
diff --git a/applications/jpip/libopenjpip/jp2k_encoder.c b/applications/jpip/libopenjpip/jp2k_encoder.c
index e1488cde..5025bf8e 100644
--- a/applications/jpip/libopenjpip/jp2k_encoder.c
+++ b/applications/jpip/libopenjpip/jp2k_encoder.c
@@ -221,10 +221,11 @@ Byte_t * recons_codestream_from_JPTstream( msgqueue_param_t *msgqueue, Byte_t *j
   return j2kstream;
 }
 
-Byte_t * recons_RPCLbitstream( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte_t *j2kstream, Byte8_t csn, 
-			       Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int mindeclev, 
-			       int *max_reslev, Byte8_t *j2klen);
+Byte_t * add_SOTmkr( Byte_t *j2kstream, Byte8_t *j2klen);
 
+Byte_t * recons_bitstream( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte_t *j2kstream, Byte8_t csn, 
+			   Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int mindeclev, 
+			   int *max_reslev, Byte8_t *j2klen);
 
 Byte_t * recons_codestream_from_JPPstream( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte8_t csn, int fw, int fh, Byte8_t *j2klen)
 {
@@ -244,11 +245,6 @@ Byte_t * recons_codestream_from_JPPstream( msgqueue_param_t *msgqueue, Byte_t *j
   if( !get_mainheader_from_j2kstream( j2kstream, &SIZ, &COD))
     return j2kstream;
 
-  if( COD.prog_order != RPCL){
-    fprintf( FCGI_stderr, "Error, Only RPCL order supported\n");
-    return j2kstream;
-  }
-
   if( fw == 0 || fh == 0)
     mindeclev = 0;
   else
@@ -265,6 +261,7 @@ Byte_t * recons_codestream_from_JPPstream( msgqueue_param_t *msgqueue, Byte_t *j
     SOToffset = *j2klen;
     while(( ptr = search_message( TILE_HEADER_MSG, tileID, csn, ptr))!=NULL){
       if( ptr->bin_offset == binOffset){
+	j2kstream = add_SOTmkr( j2kstream, j2klen);
 	j2kstream = add_msgstream( ptr, jpipstream, j2kstream, j2klen);
 	foundTH = true;
 	binOffset += ptr->length;
@@ -273,17 +270,17 @@ Byte_t * recons_codestream_from_JPPstream( msgqueue_param_t *msgqueue, Byte_t *j
     }
 
     if( foundTH){
-      j2kstream = recons_RPCLbitstream( msgqueue, jpipstream, j2kstream, csn, tileID, SIZ, COD, mindeclev, &max_reslev, j2klen);
+      j2kstream = recons_bitstream( msgqueue, jpipstream, j2kstream, csn, tileID, SIZ, COD, mindeclev, &max_reslev, j2klen);     
       modify_tileheader( j2kstream, SOToffset, (max_reslev<COD.numOfdecomp ? max_reslev : -1), SIZ.Csiz, j2klen);
     }
     else
       j2kstream = add_emptytilestream( tileID, j2kstream, j2klen);
   }
-  
+
   if( max_reslev < COD.numOfdecomp)
     if( !modify_mainheader( j2kstream, max_reslev, SIZ, COD, j2klen))
       return j2kstream;
-  
+
   j2kstream = add_EOC( j2kstream, j2klen);
   return j2kstream;
 }
@@ -306,55 +303,300 @@ Byte_t * add_mainhead_msgstream( msgqueue_param_t *msgqueue, Byte_t *origstream,
   return j2kstream;
 }
 
-Byte_t * add_padding( Byte8_t padding, Byte_t *j2kstream, Byte8_t *j2klen);
+Byte_t * add_SOTmkr( Byte_t *j2kstream, Byte8_t *j2klen)
+{
+  Byte_t *buf;
+  const Byte2_t SOT = 0x90ff;
+
+  buf = (Byte_t *)malloc(( *j2klen)+2);
+
+  memcpy( buf, j2kstream, *j2klen);
+  memcpy( buf+(*j2klen), &SOT, 2);
+  
+  *j2klen += 2;
+
+  if(j2kstream) free(j2kstream);
+
+  return buf;
+}
+
+Byte_t * recons_LRCPbitstream( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte_t *j2kstream, Byte8_t csn, 
+			       Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int mindeclev, 
+			       int *max_reslev, Byte8_t *j2klen);
+
+Byte_t * recons_RLCPbitstream( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte_t *j2kstream, Byte8_t csn, 
+			       Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int mindeclev, 
+			       int *max_reslev, Byte8_t *j2klen);
+
+Byte_t * recons_RPCLbitstream( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte_t *j2kstream, Byte8_t csn, 
+			       Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int mindeclev, 
+			       int *max_reslev, Byte8_t *j2klen);
+
+Byte_t * recons_PCRLbitstream( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte_t *j2kstream, Byte8_t csn, 
+			       Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int mindeclev, 
+			       int *max_reslev, Byte8_t *j2klen);
+
+Byte_t * recons_CPRLbitstream( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte_t *j2kstream, Byte8_t csn, 
+			       Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int mindeclev, 
+			       int *max_reslev, Byte8_t *j2klen);
+
+Byte_t * recons_bitstream( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte_t *j2kstream, Byte8_t csn, 
+			   Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int mindeclev, 
+			   int *max_reslev, Byte8_t *j2klen)
+{
+  switch( COD.prog_order){
+  case LRCP:
+    return recons_LRCPbitstream( msgqueue, jpipstream, j2kstream, csn, tileID, SIZ, COD, mindeclev, max_reslev, j2klen);
+  case RLCP:
+    return recons_RLCPbitstream( msgqueue, jpipstream, j2kstream, csn, tileID, SIZ, COD, mindeclev, max_reslev, j2klen);
+  case RPCL:
+    return recons_RPCLbitstream( msgqueue, jpipstream, j2kstream, csn, tileID, SIZ, COD, mindeclev, max_reslev, j2klen);
+  case PCRL:
+    return recons_PCRLbitstream( msgqueue, jpipstream, j2kstream, csn, tileID, SIZ, COD, mindeclev, max_reslev, j2klen);
+  case CPRL:
+    return recons_CPRLbitstream( msgqueue, jpipstream, j2kstream, csn, tileID, SIZ, COD, mindeclev, max_reslev, j2klen);
+  default:
+    fprintf( FCGI_stderr, "Error, progression order not supported\n");
+  }
+  return j2kstream;
+}
+
+int comp_numOfprcts( Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int r);
+Byte8_t comp_seqID( Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int r, int p);
+
+Byte_t * recons_packet( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte_t *j2kstream, Byte8_t csn, 
+			Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int *max_reslev, 
+			int comp_idx, int res_idx, int prct_idx, int lay_idx, Byte8_t *j2klen);
+
+Byte_t * recons_LRCPbitstream( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte_t *j2kstream, Byte8_t csn, 
+			       Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int mindeclev, 
+			       int *max_reslev, Byte8_t *j2klen)
+{
+  int r, p, c, l, numOfprcts;
+
+  for( l=0; l<COD.numOflayers; l++)
+    for( r=0; r<=(COD.numOfdecomp-mindeclev); r++){
+      if( COD.Scod & 0x01)
+	numOfprcts = comp_numOfprcts( tileID, SIZ, COD, r);
+      else
+	numOfprcts = 1;
+      
+      for( c=0; c<SIZ.Csiz; c++)
+	for( p=0; p<numOfprcts; p++)
+	  j2kstream = recons_packet( msgqueue, jpipstream, j2kstream, csn, tileID, SIZ, COD, max_reslev, c, r, p, l, j2klen);
+    }
+  
+  return j2kstream;
+}
+
+Byte_t * recons_RLCPbitstream( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte_t *j2kstream, Byte8_t csn, 
+			       Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int mindeclev, 
+			       int *max_reslev, Byte8_t *j2klen)
+{
+  int r, p, c, l, numOfprcts;
+  
+  for( r=0; r<=(COD.numOfdecomp-mindeclev); r++){
+    if( COD.Scod & 0x01)
+      numOfprcts = comp_numOfprcts( tileID, SIZ, COD, r);
+    else
+      numOfprcts = 1;
+
+    for( l=0; l<COD.numOflayers; l++)
+      for( c=0; c<SIZ.Csiz; c++)
+	for( p=0; p<numOfprcts; p++)
+	  j2kstream = recons_packet( msgqueue, jpipstream, j2kstream, csn, tileID, SIZ, COD, max_reslev, c, r, p, l, j2klen);
+  }
+      
+  return j2kstream;
+}
+
+Byte_t * recons_precinct( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte_t *j2kstream, Byte8_t csn, 
+			  Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int *max_reslev, 
+			  int comp_idx, int res_idx, Byte8_t seqID, Byte8_t *j2klen);
 
 Byte_t * recons_RPCLbitstream( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte_t *j2kstream, Byte8_t csn, 
 			       Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int mindeclev, 
 			       int *max_reslev, Byte8_t *j2klen)
 {
   int r, p, c, numOfprcts;
-  bool foundPrec;
-  Byte8_t binOffset, precID, seqID;
-  Byte4_t XTsiz, YTsiz;
-  message_param_t *ptr;
+  Byte8_t seqID;
   
   for( r=0, seqID=0; r<=(COD.numOfdecomp-mindeclev); r++){
     
-    if( COD.Scod & 0x01){
-      XTsiz = get_tile_XSiz( SIZ, tileID, COD.numOfdecomp-r);
-      YTsiz = get_tile_YSiz( SIZ, tileID, COD.numOfdecomp-r);
-      numOfprcts = ceil((double)XTsiz/(double)COD.XPsiz[r])*ceil((double)YTsiz/(double)COD.YPsiz[r]);
-    }
+    if( COD.Scod & 0x01)
+      numOfprcts = comp_numOfprcts( tileID, SIZ, COD, r);
     else
       numOfprcts = 1;
     
-    for( p=0; p<numOfprcts; p++, seqID++){      
-      for( c=0; c<SIZ.Csiz; c++){
+    for( p=0; p<numOfprcts; p++, seqID++)
+      for( c=0; c<SIZ.Csiz; c++)
+	j2kstream = recons_precinct( msgqueue, jpipstream, j2kstream, csn, tileID, SIZ, COD, max_reslev, c, r, seqID, j2klen);
+  }
+      
+  return j2kstream;
+}
 
-	precID = comp_precinct_id( tileID, c, seqID, SIZ.Csiz, SIZ.XTnum*SIZ.YTnum);
+Byte_t * recons_PCRLbitstream( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte_t *j2kstream, Byte8_t csn, 
+			       Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int mindeclev, 
+			       int *max_reslev, Byte8_t *j2klen)
+{
+  int r, p, c, min_numOfprcts, numOfprcts, min_numOfres;
+  Byte8_t seqID;
+  
+  min_numOfres = COD.numOfdecomp-mindeclev + 1;
 
-	ptr = msgqueue->first;
-	binOffset = 0;
-	foundPrec = false;
-	while(( ptr = search_message( PRECINCT_MSG, precID, csn, ptr))!=NULL){
-	  if( ptr->bin_offset == binOffset){
-	    j2kstream = add_msgstream( ptr, jpipstream, j2kstream, j2klen);
-	    
-	    foundPrec = true;
-	    binOffset += ptr->length;
-	    if( *max_reslev < r)
-	      *max_reslev = r;
-	  }
-	  ptr = ptr->next;
-	}
-	if(!foundPrec && COD.Scod & 0x01)
-	  j2kstream = add_padding( 1, j2kstream, j2klen);
-      }
+  if( COD.Scod & 0x01){
+    min_numOfprcts = 0;
+    for( r=0; r<min_numOfres; r++){
+      numOfprcts = comp_numOfprcts( tileID, SIZ, COD, r);
+      
+      if( numOfprcts < min_numOfprcts || min_numOfprcts == 0)
+	min_numOfprcts = numOfprcts;
     }
   }
+  else
+    min_numOfprcts = 1;
+  
+  for( p=0; p<min_numOfprcts; p++)
+    for( c=0; c<SIZ.Csiz; c++)
+      for( r=0; r<min_numOfres; r++){
+	seqID = comp_seqID( tileID, SIZ, COD, r, p);
+	j2kstream = recons_precinct( msgqueue, jpipstream, j2kstream, csn, tileID, SIZ, COD, max_reslev, c, r, seqID, j2klen);
+      }
+    
   return j2kstream;
 }
 
+
+Byte_t * recons_CPRLbitstream( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte_t *j2kstream, Byte8_t csn, 
+			       Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int mindeclev, 
+			       int *max_reslev, Byte8_t *j2klen)
+{
+  int r, p, c, min_numOfprcts, numOfprcts, min_numOfres;
+  Byte8_t seqID;
+  
+  min_numOfres = COD.numOfdecomp-mindeclev + 1;
+
+  if( COD.Scod & 0x01){
+    min_numOfprcts = 0;
+    for( r=0; r<min_numOfres; r++){
+      numOfprcts = comp_numOfprcts( tileID, SIZ, COD, r);
+      
+      if( numOfprcts < min_numOfprcts || min_numOfprcts == 0)
+	min_numOfprcts = numOfprcts;
+    }
+  }
+  else
+    min_numOfprcts = 1;
+  
+  for( c=0; c<SIZ.Csiz; c++)
+    for( p=0; p<min_numOfprcts; p++)
+      for( r=0; r<min_numOfres; r++){
+	seqID = comp_seqID( tileID, SIZ, COD, r, p);
+	j2kstream = recons_precinct( msgqueue, jpipstream, j2kstream, csn, tileID, SIZ, COD, max_reslev, c, r, seqID, j2klen);
+      }
+  
+  return j2kstream;
+}
+
+int comp_numOfprcts( Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int r)
+{  
+  Byte4_t XTsiz, YTsiz;
+  
+  XTsiz = get_tile_XSiz( SIZ, tileID, COD.numOfdecomp-r);
+  YTsiz = get_tile_YSiz( SIZ, tileID, COD.numOfdecomp-r);
+  
+  return ceil((double)XTsiz/(double)COD.XPsiz[r])*ceil((double)YTsiz/(double)COD.YPsiz[r]);    
+}
+
+Byte_t * add_padding( Byte8_t padding, Byte_t *j2kstream, Byte8_t *j2klen);
+
+Byte_t * recons_packet( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte_t *j2kstream, Byte8_t csn, 
+			Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int *max_reslev, 
+			int comp_idx, int res_idx, int prct_idx, int lay_idx, Byte8_t *j2klen)
+{
+  Byte8_t seqID, precID, binOffset;
+  message_param_t *ptr;
+  bool foundPrec;
+  int l;
+
+  seqID = comp_seqID( tileID, SIZ, COD, res_idx, prct_idx);
+  precID = comp_precinct_id( tileID, comp_idx, seqID, SIZ.Csiz, SIZ.XTnum*SIZ.YTnum);
+	  	  
+  ptr = msgqueue->first;
+  binOffset = 0;
+  foundPrec = false;
+  l = 0;
+	  
+  while(( ptr = search_message( PRECINCT_MSG, precID, csn, ptr))!=NULL){
+    if( ptr->bin_offset == binOffset){
+      if( lay_idx == l){
+	j2kstream = add_msgstream( ptr, jpipstream, j2kstream, j2klen);
+	foundPrec = true;
+	if( *max_reslev < res_idx)
+	  *max_reslev = res_idx;
+		
+	break;
+      }
+      binOffset += ptr->length;
+      l++;
+    }
+    ptr = ptr->next;
+  }
+  if( !foundPrec && COD.Scod & 0x01)
+    j2kstream = add_padding( 1, j2kstream, j2klen);
+  
+  return j2kstream;
+}
+
+
+Byte_t * recons_precinct( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte_t *j2kstream, Byte8_t csn, 
+			  Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int *max_reslev, 
+			  int comp_idx, int res_idx, Byte8_t seqID, Byte8_t *j2klen)
+{
+  Byte8_t precID, binOffset;
+  message_param_t *ptr;
+  bool foundPrec;
+
+  precID = comp_precinct_id( tileID, comp_idx, seqID, SIZ.Csiz, SIZ.XTnum*SIZ.YTnum);
+  
+  ptr = msgqueue->first;
+  binOffset = 0;
+  foundPrec = false;
+
+  while(( ptr = search_message( PRECINCT_MSG, precID, csn, ptr))!=NULL){
+    if( ptr->bin_offset == binOffset){
+      j2kstream = add_msgstream( ptr, jpipstream, j2kstream, j2klen);
+      
+      foundPrec = true;
+      binOffset += ptr->length;
+      if( *max_reslev < res_idx)
+	*max_reslev = res_idx;
+
+      if( ptr->last_byte)
+	break;
+    }
+    ptr = ptr->next;
+  }
+  if(!foundPrec && COD.Scod & 0x01)
+    j2kstream = add_padding( COD.numOflayers, j2kstream, j2klen);
+
+  return j2kstream;
+}
+
+Byte8_t comp_seqID( Byte8_t tileID, SIZmarker_param_t SIZ, CODmarker_param_t COD, int r, int p)
+{
+  Byte8_t seqID = 0;
+  int rr;
+  
+  for( rr=0; rr<r; rr++)
+    seqID += comp_numOfprcts( tileID, SIZ, COD, rr);
+  
+  seqID += p;
+  
+  return seqID;
+}
+
 Byte8_t get_last_tileID( msgqueue_param_t *msgqueue, Byte8_t csn, bool isJPPstream)
 {
   Byte8_t last_tileID = 0;
diff --git a/applications/jpip/libopenjpip/msgqueue_manager.c b/applications/jpip/libopenjpip/msgqueue_manager.c
index 8cc89f48..295c2360 100644
--- a/applications/jpip/libopenjpip/msgqueue_manager.c
+++ b/applications/jpip/libopenjpip/msgqueue_manager.c
@@ -101,7 +101,8 @@ void print_msgqueue( msgqueue_param_t *msgqueue)
     fprintf( logstream, "\t csn: %lld\n", ptr->csn );
     fprintf( logstream, "\t bin_offset: %#llx\n", ptr->bin_offset );
     fprintf( logstream, "\t length: %#llx\n", ptr->length );
-    fprintf( logstream, "\t aux: %lld\n", ptr->aux );
+    if( ptr->class_id%2)
+      fprintf( logstream, "\t aux: %lld\n", ptr->aux );
     fprintf( logstream, "\t last_byte: %d\n", ptr->last_byte );
     if( ptr->phld)
       print_placeholder( ptr->phld);
@@ -162,9 +163,9 @@ void enqueue_tileheader( int tile_id, msgqueue_param_t *msgqueue)
     msg->class_id = TILE_HEADER_MSG;
     msg->csn = target->csn;
     msg->bin_offset = 0;
-    msg->length = codeidx->tileheader[tile_id]->tlen;
+    msg->length = codeidx->tileheader[tile_id]->tlen-2; // SOT marker segment is removed
     msg->aux = 0; // non exist
-    msg->res_offset = codeidx->offset + get_elemOff( codeidx->tilepart, 0, tile_id);
+    msg->res_offset = codeidx->offset + get_elemOff( codeidx->tilepart, 0, tile_id) + 2; // skip SOT marker seg
     msg->phld = NULL;
     msg->next = NULL;
     
@@ -210,7 +211,7 @@ void enqueue_tile( int tile_id, int level, msgqueue_param_t *msgqueue)
     if( !tp_model[i]){
       msg = (message_param_t *)malloc( sizeof(message_param_t));
       
-      msg->last_byte = i==numOftparts-1? true : false;
+      msg->last_byte = (i==numOftparts-1);
       msg->in_class_id = tile_id;
       msg->class_id = class_id;
       msg->csn = target->csn;
@@ -229,35 +230,48 @@ void enqueue_tile( int tile_id, int level, msgqueue_param_t *msgqueue)
   }
 }
 
-void enqueue_precinct( int seq_id, int tile_id, int comp_id, msgqueue_param_t *msgqueue)
+void enqueue_precinct( int seq_id, int tile_id, int comp_id, int layers, msgqueue_param_t *msgqueue)
 {
   cachemodel_param_t *cachemodel;
   index_param_t *codeidx;
   faixbox_param_t *precpacket;
   message_param_t *msg;
-  Byte8_t nmax;
-
+  Byte8_t nmax, binOffset, binLength;
+  int layer_id, numOflayers;
+  
   cachemodel = msgqueue->cachemodel;
   codeidx = cachemodel->target->codeidx;
   precpacket = codeidx->precpacket[ comp_id];
+  numOflayers = codeidx->COD.numOflayers;
 
   nmax = get_nmax(precpacket);
-  
-  if( !cachemodel->pp_model[comp_id][ tile_id*nmax+seq_id]){
-    msg = (message_param_t *)malloc( sizeof(message_param_t));
-    msg->last_byte = true;
-    msg->in_class_id = comp_precinct_id( tile_id, comp_id, seq_id, codeidx->SIZ.Csiz, codeidx->SIZ.XTnum * codeidx->SIZ.YTnum);
-    msg->class_id = PRECINCT_MSG;
-    msg->csn = cachemodel->target->csn;
-    msg->bin_offset = 0;
-    msg->length = get_elemLen( precpacket, seq_id, tile_id);
-    msg->aux = 0;
-    msg->res_offset = codeidx->offset+get_elemOff( precpacket, seq_id, tile_id);
-    msg->phld = NULL;
-    msg->next = NULL;
+  if( layers < 0)
+    layers = numOflayers;
+    
+  binOffset = 0;
+  for( layer_id = 0; layer_id < layers; layer_id++){
 
-    enqueue_message( msg, msgqueue);
-    cachemodel->pp_model[comp_id][ tile_id*nmax+seq_id] = true;
+    binLength = get_elemLen( precpacket, seq_id*numOflayers+layer_id, tile_id);
+    
+    if( !cachemodel->pp_model[comp_id][ tile_id*nmax+seq_id*numOflayers+layer_id]){
+  
+      msg = (message_param_t *)malloc( sizeof(message_param_t));
+      msg->last_byte = (layer_id == (numOflayers-1));
+      msg->in_class_id = comp_precinct_id( tile_id, comp_id, seq_id, codeidx->SIZ.Csiz, codeidx->SIZ.XTnum * codeidx->SIZ.YTnum);
+      msg->class_id = PRECINCT_MSG;
+      msg->csn = cachemodel->target->csn;
+      msg->bin_offset = binOffset;
+      msg->length = binLength;
+      msg->aux = 0;
+      msg->res_offset = codeidx->offset+get_elemOff( precpacket, seq_id*numOflayers+layer_id, tile_id);
+      msg->phld = NULL;
+      msg->next = NULL;
+
+      enqueue_message( msg, msgqueue);
+      
+      cachemodel->pp_model[comp_id][ tile_id*nmax+seq_id*numOflayers+layer_id] = true;
+    }
+    binOffset += binLength;
   }
 }
 
diff --git a/applications/jpip/libopenjpip/msgqueue_manager.h b/applications/jpip/libopenjpip/msgqueue_manager.h
index d75a5518..7236d89c 100644
--- a/applications/jpip/libopenjpip/msgqueue_manager.h
+++ b/applications/jpip/libopenjpip/msgqueue_manager.h
@@ -129,9 +129,10 @@ void enqueue_tile( int tile_id, int level, msgqueue_param_t *msgqueue);
  * @param[in]     seq_id   precinct sequence number within its tile
  * @param[in]     tile_id  tile index
  * @param[in]     comp_id  component number
+ * @param[in]     layers   num of layers
  * @param[in,out] msgqueue message queue
  */
-void enqueue_precinct( int seq_id, int tile_id, int comp_id, msgqueue_param_t *msgqueue);
+void enqueue_precinct( int seq_id, int tile_id, int comp_id, int layers, msgqueue_param_t *msgqueue);
 
 
 /**
diff --git a/applications/jpip/opj_client/opj_dec_server/CMakeLists.txt b/applications/jpip/opj_client/opj_dec_server/CMakeLists.txt
index 56c4c7af..10e9aa5c 100644
--- a/applications/jpip/opj_client/opj_dec_server/CMakeLists.txt
+++ b/applications/jpip/opj_client/opj_dec_server/CMakeLists.txt
@@ -5,6 +5,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/opj_dec_server.c
 ${CMAKE_CURRENT_SOURCE_DIR}/jp2k_decoder.c
 ${CMAKE_CURRENT_SOURCE_DIR}/imgsock_manager.c
 ${CMAKE_CURRENT_SOURCE_DIR}/jpipstream_manager.c
+${CMAKE_CURRENT_SOURCE_DIR}/dec_clientmsg_handler.c
 )
 
 INCLUDE_DIRECTORIES(
diff --git a/applications/jpip/opj_client/opj_dec_server/Makefile.am b/applications/jpip/opj_client/opj_dec_server/Makefile.am
index 96c10ebe..b9e32c92 100644
--- a/applications/jpip/opj_client/opj_dec_server/Makefile.am
+++ b/applications/jpip/opj_client/opj_dec_server/Makefile.am
@@ -20,10 +20,12 @@ cache_manager.h \
 imgsock_manager.c \
 imgsock_manager.h \
 jp2k_decoder.c \
+dec_clientmsg_handler.c \
+dec_clientmsg_handler.h \
 jp2k_decoder.h \
 jpipstream_manager.c \
 jpipstream_manager.h \
-opj_dec_server.c
+opj_dec_server.c 
 
 
 install-data-hook:
diff --git a/applications/jpip/opj_client/opj_dec_server/Makefile.nix b/applications/jpip/opj_client/opj_dec_server/Makefile.nix
index dd8e06cf..b29671f2 100644
--- a/applications/jpip/opj_client/opj_dec_server/Makefile.nix
+++ b/applications/jpip/opj_client/opj_dec_server/Makefile.nix
@@ -10,7 +10,8 @@ ALL = opj_dec_server
 
 all: $(ALL)
 
-opj_dec_server: opj_dec_server.o jp2k_decoder.o imgsock_manager.o jpipstream_manager.o cache_manager.o $(LIBFNAME)
-	$(CC) $(CFLAGS) $< jp2k_decoder.o imgsock_manager.o jpipstream_manager.o cache_manager.o $(LDFLAGS) $(LIBFNAME) -o $@
+opj_dec_server: opj_dec_server.o jp2k_decoder.o imgsock_manager.o jpipstream_manager.o cache_manager.o dec_clientmsg_handler.o $(LIBFNAME)
+	$(CC) $(CFLAGS) $< jp2k_decoder.o imgsock_manager.o jpipstream_manager.o cache_manager.o dec_clientmsg_handler.o $(LDFLAGS) $(LIBFNAME) -o $@
+
 clean:
 	rm -f $(ALL) *.o *~
diff --git a/applications/jpip/opj_client/opj_dec_server/dec_clientmsg_handler.c b/applications/jpip/opj_client/opj_dec_server/dec_clientmsg_handler.c
new file mode 100644
index 00000000..e7b64ee4
--- /dev/null
+++ b/applications/jpip/opj_client/opj_dec_server/dec_clientmsg_handler.c
@@ -0,0 +1,307 @@
+/*
+ * $Id$
+ *
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
+ * Copyright (c) 2010-2011, Kaori Hagihara
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include "dec_clientmsg_handler.h"
+#include "ihdrbox_manager.h"
+#include "jpipstream_manager.h"
+#include "jp2k_encoder.h"
+
+
+//! maximum length of channel identifier
+#define MAX_LENOFCID 30
+
+/**
+ * handle JPT- JPP- stream message
+ *
+ * @param[in]     connected_socket socket descriptor
+ * @param[in]     cachelist        cache list pointer
+ * @param[in,out] jpipstream       address of JPT- JPP- stream pointer
+ * @param[in,out] streamlen        address of stream length
+ * @param[in,out] msgqueue         message queue pointer
+ */
+void handle_JPIPstreamMSG( SOCKET connected_socket, cachelist_param_t *cachelist, Byte_t **jpipstream, int *streamlen, msgqueue_param_t *msgqueue);
+
+/**
+ * handle PNM request message
+ *
+ * @param[in] connected_socket socket descriptor
+ * @param[in] jpipstream       jpipstream pointer
+ * @param[in] msgqueue         message queue pointer
+ * @param[in] cachelist        cache list pointer
+ */
+void handle_PNMreqMSG( SOCKET connected_socket, Byte_t *jpipstream, msgqueue_param_t *msgqueue, cachelist_param_t *cachelist);
+
+/**
+ * handle XML request message
+ *
+ * @param[in] connected_socket socket descriptor
+ * @param[in] jpipstream       address of caching jpipstream pointer
+ * @param[in] cachelist        cache list pointer
+ */
+void handle_XMLreqMSG( SOCKET connected_socket, Byte_t *jpipstream, cachelist_param_t *cachelist);
+
+/**
+ * handle TargetID request message
+ *
+ * @param[in] connected_socket socket descriptor
+ * @param[in] cachelist        cache list pointer
+ */
+void handle_TIDreqMSG( SOCKET connected_socket, cachelist_param_t *cachelist);
+
+/**
+ * handle ChannelID request message
+ *
+ * @param[in] connected_socket socket descriptor
+ * @param[in] cachelist        cache list pointer
+ */
+void handle_CIDreqMSG( SOCKET connected_socket, cachelist_param_t *cachelist);
+
+/**
+ * handle distroy ChannelID message
+ *
+ * @param[in]     connected_socket socket descriptor
+ * @param[in,out] cachelist        cache list pointer
+ */
+void handle_dstCIDreqMSG( SOCKET connected_socket, cachelist_param_t *cachelist);
+
+/**
+ * handle saving JP2 file request message
+ *
+ * @param[in] connected_socket socket descriptor
+ * @param[in] cachelist        cache list pointer
+ * @param[in] msgqueue         message queue pointer
+ * @param[in] jpipstream       address of caching jpipstream pointer
+ */
+void handle_JP2saveMSG( SOCKET connected_socket, cachelist_param_t *cachelist, msgqueue_param_t *msgqueue, Byte_t *jpipstream);
+
+bool handle_clientmsg( SOCKET connected_socket, cachelist_param_t *cachelist, Byte_t **jpipstream, int *streamlen, msgqueue_param_t *msgqueue)
+{
+  bool quit = false;
+  msgtype_t msgtype = identify_clientmsg( connected_socket);
+  
+  switch( msgtype){
+  case JPIPSTREAM:
+    handle_JPIPstreamMSG( connected_socket, cachelist, jpipstream, streamlen, msgqueue);
+    break;
+      
+  case PNMREQ:
+    handle_PNMreqMSG( connected_socket, *jpipstream, msgqueue, cachelist);
+    break;
+    
+  case XMLREQ:
+    handle_XMLreqMSG( connected_socket, *jpipstream, cachelist);
+    break;
+
+  case TIDREQ:
+    handle_TIDreqMSG( connected_socket, cachelist);
+    break;
+						
+  case CIDREQ:
+    handle_CIDreqMSG( connected_socket, cachelist);
+    break;
+
+  case CIDDST:
+    handle_dstCIDreqMSG( connected_socket, cachelist);
+    break;
+
+  case JP2SAVE:
+    handle_JP2saveMSG( connected_socket, cachelist, msgqueue, *jpipstream);
+    break;
+
+  case QUIT:
+    quit = true;
+    save_codestream( *jpipstream, *streamlen, "jpt");
+    break;
+  case MSGERROR:
+    break;
+  }
+        
+  printf("\t end of the connection\n\n");
+  if( close_socket(connected_socket) != 0){
+    perror("close");
+    return false;
+  }
+  if( quit)
+    return false;
+
+  return true;
+}
+
+
+void handle_JPIPstreamMSG( SOCKET connected_socket, cachelist_param_t *cachelist,
+			   Byte_t **jpipstream, int *streamlen, msgqueue_param_t *msgqueue)
+{
+  Byte_t *newjpipstream;
+  int newstreamlen = 0;
+  cache_param_t *cache;
+  char target[MAX_LENOFTARGET], tid[MAX_LENOFTID], cid[MAX_LENOFCID];
+  metadatalist_param_t *metadatalist;
+  
+  newjpipstream = receive_JPIPstream( connected_socket, target, tid, cid, &newstreamlen);
+
+  parse_JPIPstream( newjpipstream, newstreamlen, *streamlen, msgqueue);
+
+  *jpipstream = update_JPIPstream( newjpipstream, newstreamlen, *jpipstream, streamlen);
+  free( newjpipstream);
+
+  metadatalist = gene_metadatalist();
+  parse_metamsg( msgqueue, *jpipstream, *streamlen, metadatalist);
+
+  // cid registration
+  if( target[0] != 0){
+    if((cache = search_cache( target, cachelist))){
+      if( tid[0] != 0)
+	update_cachetid( tid, cache);
+      if( cid[0] != 0)
+	add_cachecid( cid, cache);
+    }
+    else{
+      cache = gene_cache( target, msgqueue->last->csn, tid, cid);
+      insert_cache_into_list( cache, cachelist);
+    }
+  }
+  else
+    cache = search_cacheBycsn( msgqueue->last->csn, cachelist);
+
+  if( cache->metadatalist)
+    delete_metadatalist( &cache->metadatalist);
+  cache->metadatalist = metadatalist;
+
+  response_signal( connected_socket, true);
+}
+
+void handle_PNMreqMSG( SOCKET connected_socket, Byte_t *jpipstream, msgqueue_param_t *msgqueue, cachelist_param_t *cachelist)
+{
+  Byte_t *pnmstream;
+  ihdrbox_param_t *ihdrbox;
+  char cid[MAX_LENOFCID], tmp[10];
+  cache_param_t *cache;
+  int fw, fh;
+
+  receive_line( connected_socket, cid);
+  if(!(cache = search_cacheBycid( cid, cachelist)))
+    if(!(cache = search_cacheBytid( cid, cachelist)))
+      return;
+
+  receive_line( connected_socket, tmp);
+  fw = atoi( tmp);
+  
+  receive_line( connected_socket, tmp);
+  fh = atoi( tmp);
+
+  pnmstream = jpipstream_to_pnm( jpipstream, msgqueue, cache->csn, fw, fh, &cache->ihdrbox);
+  ihdrbox = cache->ihdrbox;
+
+  send_PNMstream( connected_socket, pnmstream, ihdrbox->width, ihdrbox->height, ihdrbox->nc, ihdrbox->bpc > 8 ? 255 : (1 << ihdrbox->bpc) - 1);
+
+  free( pnmstream);
+}
+
+void handle_XMLreqMSG( SOCKET connected_socket, Byte_t *jpipstream, cachelist_param_t *cachelist)
+{
+  char cid[MAX_LENOFCID];
+  cache_param_t *cache;
+
+  receive_line( connected_socket, cid);
+  if(!(cache = search_cacheBycid( cid, cachelist)))
+    return;
+  
+  boxcontents_param_t *boxcontents = cache->metadatalist->last->boxcontents;
+  Byte_t *xmlstream = (Byte_t *)malloc( boxcontents->length);
+  memcpy( xmlstream, jpipstream+boxcontents->offset, boxcontents->length);
+  send_XMLstream( connected_socket, xmlstream, boxcontents->length);
+  free( xmlstream);
+}
+
+void handle_TIDreqMSG( SOCKET connected_socket, cachelist_param_t *cachelist)
+{
+  char target[MAX_LENOFTARGET], *tid = NULL;
+  cache_param_t *cache;
+  int tidlen = 0;
+
+  receive_line( connected_socket, target);
+  cache = search_cache( target, cachelist);
+  
+  if( cache){
+    tid = cache->tid;
+    tidlen = strlen(tid);
+  }
+  send_TIDstream( connected_socket, tid, tidlen);
+}
+
+void handle_CIDreqMSG( SOCKET connected_socket, cachelist_param_t *cachelist)
+{
+  char target[MAX_LENOFTARGET], *cid = NULL;
+  cache_param_t *cache;
+  int cidlen = 0;
+
+  receive_line( connected_socket, target);
+  cache = search_cache( target, cachelist);
+  
+  if( cache){
+    if( cache->numOfcid > 0){
+      cid = cache->cid[ cache->numOfcid-1];
+      cidlen = strlen(cid);
+    }
+  }
+  send_CIDstream( connected_socket, cid, cidlen);
+}
+
+void handle_dstCIDreqMSG( SOCKET connected_socket, cachelist_param_t *cachelist)
+{
+  char cid[MAX_LENOFCID];
+
+  receive_line( connected_socket, cid);
+  remove_cachecid( cid, cachelist);
+  response_signal( connected_socket, true);
+}
+
+void handle_JP2saveMSG( SOCKET connected_socket, cachelist_param_t *cachelist, msgqueue_param_t *msgqueue, Byte_t *jpipstream)
+{
+  char cid[MAX_LENOFCID];
+  cache_param_t *cache;
+  Byte_t *jp2stream;
+  Byte8_t jp2len;
+
+  receive_line( connected_socket, cid);
+  if(!(cache = search_cacheBycid( cid, cachelist)))
+    return;
+  
+  jp2stream = recons_jp2( msgqueue, jpipstream, cache->csn, &jp2len);
+
+  if( jp2stream){
+    save_codestream( jp2stream, jp2len, "jp2");
+    free( jp2stream);
+  }
+}
diff --git a/applications/jpip/opj_client/opj_dec_server/dec_clientmsg_handler.h b/applications/jpip/opj_client/opj_dec_server/dec_clientmsg_handler.h
new file mode 100644
index 00000000..0170c164
--- /dev/null
+++ b/applications/jpip/opj_client/opj_dec_server/dec_clientmsg_handler.h
@@ -0,0 +1,53 @@
+/*
+ * $Id$
+ *
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
+ * Copyright (c) 2010-2011, Kaori Hagihara 
+ * Copyright (c) 2011,      Lucian Corlaciu, GSoC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef   	DEC_CLIENTMSG_HANDLER_H_
+# define   	DEC_CLIENTMSG_HANDLER_H_
+
+#include "bool.h"
+#include "imgsock_manager.h"
+#include "cache_manager.h"
+#include "byte_manager.h"
+#include "msgqueue_manager.h"
+
+/**
+ * handle client message
+ *
+ * @param[in]     connected_socket socket descriptor
+ * @param[in]     cachelist        cache list pointer
+ * @param[in,out] jpipstream       address of JPT- JPP- stream pointer
+ * @param[in,out] streamlen        address of stream length
+ * @param[in,out] msgqueue         message queue pointer
+ */
+bool handle_clientmsg( SOCKET connected_socket, cachelist_param_t *cachelist, Byte_t **jpipstream, int *streamlen, msgqueue_param_t *msgqueue);
+
+
+#endif 	    /* !DEC_CLIENTMSG_HANDLER_H_ */
diff --git a/applications/jpip/opj_client/opj_dec_server/imgsock_manager.c b/applications/jpip/opj_client/opj_dec_server/imgsock_manager.c
index 4e6652ac..ccc2b04c 100644
--- a/applications/jpip/opj_client/opj_dec_server/imgsock_manager.c
+++ b/applications/jpip/opj_client/opj_dec_server/imgsock_manager.c
@@ -56,7 +56,7 @@ SOCKET open_listeningsocket()
   struct sockaddr_in sin;
   int sock_optval = 1;
   int port = 5000;
-
+  
   listening_socket = socket(AF_INET, SOCK_STREAM, 0);
   if ( listening_socket == -1 ){
     perror("socket");
@@ -76,13 +76,13 @@ SOCKET open_listeningsocket()
 
   if ( bind(listening_socket, (struct sockaddr *)&sin, sizeof(sin)) < 0 ){
     perror("bind");
-    closesocket(listening_socket);
+    close_socket(listening_socket);
     exit(1);
   }
 
   if( listen(listening_socket, SOMAXCONN) == -1){
     perror("listen");
-    closesocket(listening_socket);
+    close_socket(listening_socket);
     exit(1);
   }
   printf("port %d is listened\n", port);
@@ -90,6 +90,14 @@ SOCKET open_listeningsocket()
   return listening_socket;
 }
 
+SOCKET accept_socket( SOCKET listening_socket)
+{
+  struct sockaddr_in peer_sin;
+  unsigned int addrlen = sizeof(peer_sin);
+
+  return accept( listening_socket, (struct sockaddr *)&peer_sin, &addrlen);
+}
+
 msgtype_t identify_clientmsg( SOCKET connected_socket)
 {
   int receive_size;
@@ -285,3 +293,12 @@ void response_signal( SOCKET connected_socket, bool succeed)
   if( send( connected_socket, &code, 1, 0) != 1)
     fprintf( stderr, "Response signalling error\n");
 }
+
+int close_socket( SOCKET sock)
+{
+#ifdef _WIN32
+  return closesocket( sock);
+#else
+  return close( sock);
+#endif
+}
diff --git a/applications/jpip/opj_client/opj_dec_server/imgsock_manager.h b/applications/jpip/opj_client/opj_dec_server/imgsock_manager.h
index 713c099e..bb8e1bcf 100644
--- a/applications/jpip/opj_client/opj_dec_server/imgsock_manager.h
+++ b/applications/jpip/opj_client/opj_dec_server/imgsock_manager.h
@@ -38,7 +38,6 @@
 #include <winsock2.h>
 #else
 typedef int SOCKET;
-#define closesocket close
 #endif //_WIN32
 
 /**
@@ -48,6 +47,15 @@ typedef int SOCKET;
  */
 SOCKET open_listeningsocket();
 
+/**
+ * accept a new connection to the listenning socket
+ *
+ * @param listening_socket listenning socket
+ * @return                 connected socket (-1 if error occurs)
+ */
+SOCKET accept_socket( SOCKET listening_socket);
+
+
 #define NUM_OF_MSGTYPES 8
 typedef enum eMSGTYPE{ JPIPSTREAM, PNMREQ, XMLREQ, TIDREQ, CIDREQ, CIDDST, JP2SAVE, QUIT, MSGERROR} msgtype_t;
 
@@ -125,8 +133,16 @@ void response_signal( SOCKET connected_socket, bool succeed);
  * @param [out] buf              string to be stored
  * @return                       red size
  */
-
 int receive_line(SOCKET connected_socket, char *buf);
+
+/**
+ * close socket
+ *
+ * @param [in] sock closing socket
+ * @return     0 if succeed, -1 if failed
+ */
+int close_socket( SOCKET sock);
+
 #endif /* !IMGSOCK_MANAGER_H_ */
 
 /*! \file
diff --git a/applications/jpip/opj_client/opj_dec_server/opj_dec_server.c b/applications/jpip/opj_client/opj_dec_server/opj_dec_server.c
index 5786397e..6e8957a2 100644
--- a/applications/jpip/opj_client/opj_dec_server/opj_dec_server.c
+++ b/applications/jpip/opj_client/opj_dec_server/opj_dec_server.c
@@ -46,102 +46,23 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
+#include "dec_clientmsg_handler.h"
+#include "imgsock_manager.h"
 #include "byte_manager.h"
 #include "msgqueue_manager.h"
-#include "ihdrbox_manager.h"
-#include "imgsock_manager.h"
-#include "jpipstream_manager.h"
 #include "cache_manager.h"
-#include "jp2k_encoder.h"
+
 
 #ifdef _WIN32
 WSADATA initialisation_win32;
-#else
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#endif //_WIN32
-
-//! maximum length of target name
-#define MAX_LENOFTARGET 128
-
-//! maximum length of channel identifier
-#define MAX_LENOFCID 30
-
-/**
- * handle JPT- JPP- stream message
- *
- * @param[in]     connected_socket socket descriptor
- * @param[in]     cachelist        cache list pointer
- * @param[in,out] jpipstream       address of JPT- JPP- stream pointer
- * @param[in,out] streamlen        address of stream length
- * @param[in,out] msgqueue         message queue pointer
- */
-void handle_JPIPstreamMSG( SOCKET connected_socket, cachelist_param_t *cachelist, Byte_t **jpipstream, int *streamlen, msgqueue_param_t *msgqueue);
-
-/**
- * handle PNM request message
- *
- * @param[in] connected_socket socket descriptor
- * @param[in] jpipstream       jpipstream pointer
- * @param[in] msgqueue         message queue pointer
- * @param[in] cachelist        cache list pointer
- */
-void handle_PNMreqMSG( SOCKET connected_socket, Byte_t *jpipstream, msgqueue_param_t *msgqueue, cachelist_param_t *cachelist);
-
-/**
- * handle XML request message
- *
- * @param[in] connected_socket socket descriptor
- * @param[in] jpipstream       address of caching jpipstream pointer
- * @param[in] cachelist        cache list pointer
- */
-void handle_XMLreqMSG( SOCKET connected_socket, Byte_t *jpipstream, cachelist_param_t *cachelist);
-
-/**
- * handle TargetID request message
- *
- * @param[in] connected_socket socket descriptor
- * @param[in] cachelist        cache list pointer
- */
-void handle_TIDreqMSG( SOCKET connected_socket, cachelist_param_t *cachelist);
-
-/**
- * handle ChannelID request message
- *
- * @param[in] connected_socket socket descriptor
- * @param[in] cachelist        cache list pointer
- */
-void handle_CIDreqMSG( SOCKET connected_socket, cachelist_param_t *cachelist);
-
-/**
- * handle distroy ChannelID message
- *
- * @param[in]     connected_socket socket descriptor
- * @param[in,out] cachelist        cache list pointer
- */
-void handle_dstCIDreqMSG( SOCKET connected_socket, cachelist_param_t *cachelist);
-
-/**
- * handle saving JP2 file request message
- *
- * @param[in] connected_socket socket descriptor
- * @param[in] cachelist        cache list pointer
- * @param[in] msgqueue         message queue pointer
- * @param[in] jpipstream       address of caching jpipstream pointer
- */
-void handle_JP2saveMSG( SOCKET connected_socket, cachelist_param_t *cachelist, msgqueue_param_t *msgqueue, Byte_t *jpipstream);
+#endif
 
 int main(int argc, char *argv[]){
-
+  
   SOCKET connected_socket;
-  struct sockaddr_in peer_sin;
   Byte_t *jpipstream = NULL;
   int jpipstreamlen = 0;
   msgqueue_param_t *msgqueue = gene_msgqueue( true, NULL);
-  bool quit = false;
 
 #ifdef _WIN32
   int erreur = WSAStartup(MAKEWORD(2,2),&initialisation_win32);
@@ -151,60 +72,15 @@ int main(int argc, char *argv[]){
     printf( "Initialisation Winsock\n");
 #endif //_WIN32
   
-  int listening_socket = open_listeningsocket();
+  SOCKET listening_socket = open_listeningsocket();
   
-  unsigned int addrlen = sizeof(peer_sin);
-
   cachelist_param_t *cachelist = gene_cachelist();
   
-  while(( connected_socket = accept(listening_socket, (struct sockaddr *)&peer_sin, &addrlen))!=-1 ){
-    msgtype_t msgtype = identify_clientmsg( connected_socket);
-    
-    switch( msgtype){
-    case JPIPSTREAM:
-      handle_JPIPstreamMSG( connected_socket, cachelist, &jpipstream, &jpipstreamlen, msgqueue);
+  while(( connected_socket = accept_socket( listening_socket)) != -1 )
+    if(!(handle_clientmsg( connected_socket, cachelist, &jpipstream, &jpipstreamlen, msgqueue)))
       break;
-      
-    case PNMREQ:
-      handle_PNMreqMSG( connected_socket, jpipstream, msgqueue, cachelist);
-      break;
-    
-    case XMLREQ:
-      handle_XMLreqMSG( connected_socket, jpipstream, cachelist);
-      break;
-
-    case TIDREQ:
-      handle_TIDreqMSG( connected_socket, cachelist);
-      break;
-						
-    case CIDREQ:
-      handle_CIDreqMSG( connected_socket, cachelist);
-      break;
-
-    case CIDDST:
-      handle_dstCIDreqMSG( connected_socket, cachelist);
-      break;
-
-    case JP2SAVE:
-      handle_JP2saveMSG( connected_socket, cachelist, msgqueue, jpipstream);
-      break;
-
-    case QUIT:
-      quit = true;
-      break;
-    case MSGERROR:
-      break;
-    }
-        
-    printf("\t end of the connection\n\n");
-    if( closesocket(connected_socket) != 0){
-      perror("close");
-      return -1;
-    }
-    if( quit)
-      break;
-  }
-  if( closesocket(listening_socket) != 0){
+  
+  if( close_socket(listening_socket) != 0){
     perror("close");
     return -1;
   }
@@ -214,7 +90,6 @@ int main(int argc, char *argv[]){
   if( msgqueue)
     delete_msgqueue( &msgqueue);
   
-  //save_codestream( jpipstream, jpipstreamlen, "jpt");
   free( jpipstream);
 
 #ifdef _WIN32
@@ -227,150 +102,3 @@ int main(int argc, char *argv[]){
 
   return 0;
 }
-
-void handle_JPIPstreamMSG( SOCKET connected_socket, cachelist_param_t *cachelist,
-			   Byte_t **jpipstream, int *streamlen, msgqueue_param_t *msgqueue)
-{
-  Byte_t *newjpipstream;
-  int newstreamlen = 0;
-  cache_param_t *cache;
-  char target[MAX_LENOFTARGET], tid[MAX_LENOFTID], cid[MAX_LENOFCID];
-  metadatalist_param_t *metadatalist;
-  
-  newjpipstream = receive_JPIPstream( connected_socket, target, tid, cid, &newstreamlen);
-
-  parse_JPIPstream( newjpipstream, newstreamlen, *streamlen, msgqueue);
-
-  *jpipstream = update_JPIPstream( newjpipstream, newstreamlen, *jpipstream, streamlen);
-  free( newjpipstream);
-
-  metadatalist = gene_metadatalist();
-  parse_metamsg( msgqueue, *jpipstream, *streamlen, metadatalist);
-
-  // cid registration
-  if( target[0] != 0){
-    if((cache = search_cache( target, cachelist))){
-      if( tid[0] != 0)
-	update_cachetid( tid, cache);
-      if( cid[0] != 0)
-	add_cachecid( cid, cache);
-    }
-    else{
-      cache = gene_cache( target, msgqueue->last->csn, tid, cid);
-      insert_cache_into_list( cache, cachelist);
-    }
-  }
-  else
-    cache = search_cacheBycsn( msgqueue->last->csn, cachelist);
-
-  if( cache->metadatalist)
-    delete_metadatalist( &cache->metadatalist);
-  cache->metadatalist = metadatalist;
-
-  response_signal( connected_socket, true);
-}
-
-void handle_PNMreqMSG( SOCKET connected_socket, Byte_t *jpipstream, msgqueue_param_t *msgqueue, cachelist_param_t *cachelist)
-{
-  Byte_t *pnmstream;
-  ihdrbox_param_t *ihdrbox;
-  char cid[MAX_LENOFCID], tmp[10];
-  cache_param_t *cache;
-  int fw, fh;
-
-  receive_line( connected_socket, cid);
-  if(!(cache = search_cacheBycid( cid, cachelist)))
-    if(!(cache = search_cacheBytid( cid, cachelist)))
-      return;
-
-  receive_line( connected_socket, tmp);
-  fw = atoi( tmp);
-  
-  receive_line( connected_socket, tmp);
-  fh = atoi( tmp);
-
-  pnmstream = jpipstream_to_pnm( jpipstream, msgqueue, cache->csn, fw, fh, &cache->ihdrbox);
-  ihdrbox = cache->ihdrbox;
-
-  send_PNMstream( connected_socket, pnmstream, ihdrbox->width, ihdrbox->height, ihdrbox->nc, ihdrbox->bpc > 8 ? 255 : (1 << ihdrbox->bpc) - 1);
-
-  free( pnmstream);
-}
-
-void handle_XMLreqMSG( SOCKET connected_socket, Byte_t *jpipstream, cachelist_param_t *cachelist)
-{
-  char cid[MAX_LENOFCID];
-  cache_param_t *cache;
-
-  receive_line( connected_socket, cid);
-  if(!(cache = search_cacheBycid( cid, cachelist)))
-    return;
-  
-  boxcontents_param_t *boxcontents = cache->metadatalist->last->boxcontents;
-  Byte_t *xmlstream = (Byte_t *)malloc( boxcontents->length);
-  memcpy( xmlstream, jpipstream+boxcontents->offset, boxcontents->length);
-  send_XMLstream( connected_socket, xmlstream, boxcontents->length);
-  free( xmlstream);
-}
-
-void handle_TIDreqMSG( SOCKET connected_socket, cachelist_param_t *cachelist)
-{
-  char target[MAX_LENOFTARGET], *tid = NULL;
-  cache_param_t *cache;
-  int tidlen = 0;
-
-  receive_line( connected_socket, target);
-  cache = search_cache( target, cachelist);
-  
-  if( cache){
-    tid = cache->tid;
-    tidlen = strlen(tid);
-  }
-  send_TIDstream( connected_socket, tid, tidlen);
-}
-
-void handle_CIDreqMSG( SOCKET connected_socket, cachelist_param_t *cachelist)
-{
-  char target[MAX_LENOFTARGET], *cid = NULL;
-  cache_param_t *cache;
-  int cidlen = 0;
-
-  receive_line( connected_socket, target);
-  cache = search_cache( target, cachelist);
-  
-  if( cache){
-    if( cache->numOfcid > 0){
-      cid = cache->cid[ cache->numOfcid-1];
-      cidlen = strlen(cid);
-    }
-  }
-  send_CIDstream( connected_socket, cid, cidlen);
-}
-
-void handle_dstCIDreqMSG( SOCKET connected_socket, cachelist_param_t *cachelist)
-{
-  char cid[MAX_LENOFCID];
-
-  receive_line( connected_socket, cid);
-  remove_cachecid( cid, cachelist);
-  response_signal( connected_socket, true);
-}
-
-void handle_JP2saveMSG( SOCKET connected_socket, cachelist_param_t *cachelist, msgqueue_param_t *msgqueue, Byte_t *jpipstream)
-{
-  char cid[MAX_LENOFCID];
-  cache_param_t *cache;
-  Byte_t *jp2stream;
-  Byte8_t jp2len;
-
-  receive_line( connected_socket, cid);
-  if(!(cache = search_cacheBycid( cid, cachelist)))
-    return;
-  
-  jp2stream = recons_jp2( msgqueue, jpipstream, cache->csn, &jp2len);
-
-  if( jp2stream){
-    save_codestream( jp2stream, jp2len, "jp2");
-    free( jp2stream);
-  }
-}
diff --git a/applications/jpip/opj_client/opj_viewer/dist/opj_viewer-20111018.jar b/applications/jpip/opj_client/opj_viewer/dist/opj_viewer-20111018.jar
new file mode 100644
index 0000000000000000000000000000000000000000..a17ca3b6a28603bc30d6f3ab53102e37b5e31203
GIT binary patch
literal 15873
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

literal 0
HcmV?d00001

diff --git a/applications/jpip/opj_client/opj_viewer/dist/opj_viewer.jar b/applications/jpip/opj_client/opj_viewer/dist/opj_viewer.jar
index 2c3fead7..b135bb0f 120000
--- a/applications/jpip/opj_client/opj_viewer/dist/opj_viewer.jar
+++ b/applications/jpip/opj_client/opj_viewer/dist/opj_viewer.jar
@@ -1 +1 @@
-opj_viewer-20111007.jar
\ No newline at end of file
+opj_viewer-20111018.jar
\ No newline at end of file
diff --git a/applications/jpip/opj_server/CMakeLists.txt b/applications/jpip/opj_server/CMakeLists.txt
index 29007e1b..e0ed5469 100644
--- a/applications/jpip/opj_server/CMakeLists.txt
+++ b/applications/jpip/opj_server/CMakeLists.txt
@@ -10,6 +10,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/opj_server.c
 ${CMAKE_CURRENT_SOURCE_DIR}/query_parser.c
 ${CMAKE_CURRENT_SOURCE_DIR}/channel_manager.c
 ${CMAKE_CURRENT_SOURCE_DIR}/session_manager.c
+${CMAKE_CURRENT_SOURCE_DIR}/jpip_parser.c
 )
 
 # Build executable
diff --git a/applications/jpip/opj_server/Makefile.am b/applications/jpip/opj_server/Makefile.am
index 9fa75b79..cb03c9ce 100644
--- a/applications/jpip/opj_server/Makefile.am
+++ b/applications/jpip/opj_server/Makefile.am
@@ -18,9 +18,11 @@ channel_manager.c \
 opj_server.c \
 query_parser.c \
 session_manager.c \
+jpip_parser.c \
 channel_manager.h \
 query_parser.h \
-session_manager.h
+session_manager.h \
+jpip_parser.h
 
 install-data-hook:
 	@echo -e " (B)\t$(bindir)/opj_server$(EXEEXT)" >> $(top_builddir)/report.txt
diff --git a/applications/jpip/opj_server/Makefile.nix b/applications/jpip/opj_server/Makefile.nix
index 3df9a6ee..ac2389b4 100644
--- a/applications/jpip/opj_server/Makefile.nix
+++ b/applications/jpip/opj_server/Makefile.nix
@@ -8,8 +8,8 @@ ALL = opj_server
 
 all: $(ALL)
 
-opj_server: opj_server.o query_parser.o channel_manager.o session_manager.o $(LIBFNAME)
-	  $(CC) $(CFLAGS) $< query_parser.o channel_manager.o session_manager.o $(LDFLAGS) -o $@
+opj_server: opj_server.o query_parser.o channel_manager.o session_manager.o jpip_parser.o $(LIBFNAME)
+	  $(CC) $(CFLAGS) $< query_parser.o channel_manager.o session_manager.o jpip_parser.o $(LDFLAGS) -o $@
 
 clean:
 	rm -f $(ALL) *.o *~
diff --git a/applications/jpip/opj_server/jpip_parser.c b/applications/jpip/opj_server/jpip_parser.c
new file mode 100644
index 00000000..9b49a362
--- /dev/null
+++ b/applications/jpip/opj_server/jpip_parser.c
@@ -0,0 +1,536 @@
+/*
+ * $Id$
+ *
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
+ * Copyright (c) 2010-2011, Kaori Hagihara 
+ * Copyright (c) 2011,      Lucian Corlaciu, GSoC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+#include "jpip_parser.h"
+#include "channel_manager.h"
+#include "imgreg_manager.h"
+
+#ifdef SERVER
+#include "fcgi_stdio.h"
+#define logstream FCGI_stdout
+#else
+#define FCGI_stdout stdout
+#define FCGI_stderr stderr
+#define logstream stderr
+#endif //SERVER
+
+/**
+ * REQUEST: target identification by target or tid request
+ *
+ * @param[in]     query_param   structured query
+ * @param[in]     targetlist    target list pointer
+ * @param[out]    target        address of target pointer
+ * @return                      if succeeded (true) or failed (false)
+ */
+bool identify_target( query_param_t query_param, targetlist_param_t *targetlist, target_param_t **target);
+
+/**
+ * REQUEST: channel association
+ *          this must be processed before any process
+ *
+ * @param[in]     query_param   structured query
+ * @param[in]     sessionlist   session list pointer
+ * @param[out]    cursession    address of the associated session pointer
+ * @param[out]    curchannel    address of the associated channel pointer
+ * @return                      if succeeded (true) or failed (false)
+ */
+bool associate_channel( query_param_t    query_param, 
+			sessionlist_param_t *sessionlist,
+			session_param_t **cursession, 
+			channel_param_t **curchannel);
+/**
+ * REQUEST: new channel (cnew) assignment
+ *
+ * @param[in]     query_param   structured query
+ * @param[in]     sessionlist   session list pointer
+ * @param[in]     target        requested target pointer
+ * @param[in,out] cursession    address of the associated/opened session pointer
+ * @param[in,out] curchannel    address of the associated/opened channel pointer
+ * @return                      if succeeded (true) or failed (false)
+ */
+bool open_channel( query_param_t query_param, 
+		   sessionlist_param_t *sessionlist,
+		   target_param_t *target,
+		   session_param_t **cursession, 
+		   channel_param_t **curchannel);
+
+/**
+ * REQUEST: channel close (cclose)
+ *
+ * @param[in]     query_param   structured query
+ * @param[in]     sessionlist   session list pointer
+ * @param[in,out] cursession    address of the session pointer of deleting channel
+ * @param[in,out] curchannel    address of the deleting channel pointer
+ * @return                      if succeeded (true) or failed (false)
+ */
+bool close_channel( query_param_t query_param, 
+		    sessionlist_param_t *sessionlist,
+		    session_param_t **cursession, 
+		    channel_param_t **curchannel);
+
+/**
+ * REQUEST: view-window (fsiz)
+ *
+ * @param[in]     query_param structured query
+ * @param[in]     target      requested target pointer
+ * @param[in,out] cursession  associated session pointer
+ * @param[in,out] curchannel  associated channel pointer
+ * @param[out]    msgqueue    address of the message queue pointer
+ * @return                    if succeeded (true) or failed (false)
+ */
+bool gene_JPIPstream( query_param_t query_param,
+		     target_param_t *target,
+		     session_param_t *cursession, 
+		     channel_param_t *curchannel,
+		     msgqueue_param_t **msgqueue);
+
+bool parse_JPIPrequest( query_param_t query_param,
+			sessionlist_param_t *sessionlist,
+			targetlist_param_t *targetlist,
+			msgqueue_param_t **msgqueue)
+{ 
+  target_param_t *target = NULL;
+  session_param_t *cursession = NULL;
+  channel_param_t *curchannel = NULL;
+
+  if( query_param.target[0] != '\0' || query_param.tid[0] != '\0'){
+    if( !identify_target( query_param, targetlist, &target))
+      return false;
+  }
+
+  if( query_param.cid[0] != '\0'){
+    if( !associate_channel( query_param, sessionlist, &cursession, &curchannel))
+      return false;
+  }
+
+  if( query_param.cnew){
+    if( !open_channel( query_param, sessionlist, target, &cursession, &curchannel))
+      return false;
+  }
+  if( query_param.cclose[0][0] != '\0')
+    if( !close_channel( query_param, sessionlist, &cursession, &curchannel))
+      return false;
+  
+  if( (query_param.fx > 0 && query_param.fy > 0) || query_param.box_type[0][0] != 0)
+    if( !gene_JPIPstream( query_param, target, cursession, curchannel, msgqueue))
+      return false;
+  
+  return true;
+}
+
+bool identify_target( query_param_t query_param, targetlist_param_t *targetlist, target_param_t **target)
+{
+  if( query_param.tid[0] !='\0' && strcmp( query_param.tid, "0") != 0 ){
+    if( query_param.cid[0] != '\0'){
+      fprintf( FCGI_stdout, "Reason: Target can not be specified both through tid and cid\r\n");
+      fprintf( FCGI_stdout, "Status: 400\r\n");
+      return false;
+    }
+    if( ( *target = search_targetBytid( query_param.tid, targetlist)))
+      return true;
+  }
+
+  if( query_param.target[0] !='\0')
+    if( !( *target = search_target( query_param.target, targetlist)))
+      if(!( *target = gene_target( targetlist, query_param.target)))
+	return false;
+
+  if( *target){
+    fprintf( FCGI_stdout, "JPIP-tid: %s\r\n", (*target)->tid);
+    return true;
+  }
+  else{
+    fprintf( FCGI_stdout, "Reason: target not found\r\n");
+    fprintf( FCGI_stdout, "Status: 400\r\n");
+    return false;
+  }
+}
+
+bool associate_channel( query_param_t    query_param, 
+			sessionlist_param_t *sessionlist,
+			session_param_t **cursession, 
+			channel_param_t **curchannel)
+{
+  if( search_session_and_channel( query_param.cid, sessionlist, cursession, curchannel)){
+    
+    if( !query_param.cnew)
+      set_channel_variable_param( query_param, *curchannel);
+  }
+  else{
+    fprintf( FCGI_stderr, "Error: process canceled\n");
+    return false;
+  }
+  return true;
+}
+
+bool open_channel( query_param_t query_param, 
+		   sessionlist_param_t *sessionlist,
+		   target_param_t *target,
+		   session_param_t **cursession, 
+		   channel_param_t **curchannel)
+{
+  cachemodel_param_t *cachemodel = NULL;
+
+  if( target){
+    if( !(*cursession))
+      *cursession = gene_session( sessionlist);
+    if( !( cachemodel = search_cachemodel( target, (*cursession)->cachemodellist)))
+      if( !(cachemodel = gene_cachemodel( (*cursession)->cachemodellist, target, query_param.return_type==JPPstream)))
+	return false;
+  }
+  else
+    if( *curchannel)
+      cachemodel = (*curchannel)->cachemodel;
+
+  *curchannel = gene_channel( query_param, cachemodel, (*cursession)->channellist);
+  if( *curchannel == NULL)
+    return false;
+
+  return true;
+}
+
+bool close_channel( query_param_t query_param, 
+		    sessionlist_param_t *sessionlist,
+		    session_param_t **cursession, 
+		    channel_param_t **curchannel)
+{
+  if( query_param.cclose[0][0] =='*'){
+#ifndef SERVER
+    fprintf( logstream, "local log: close all\n");
+#endif
+    // all channels associatd with the session will be closed
+    if( !delete_session( cursession, sessionlist))
+      return false;
+  }
+  else{
+    // check if all entry belonging to the same session
+    int i=0;
+    while( query_param.cclose[i][0] !='\0'){
+      
+      // In case of the first entry of close cid
+      if( *cursession == NULL){
+	if( !search_session_and_channel( query_param.cclose[i], sessionlist, cursession, curchannel))
+	  return false;
+      }
+      else // second or more entry of close cid
+	if( !(*curchannel=search_channel( query_param.cclose[i], (*cursession)->channellist))){
+	  fprintf( FCGI_stdout, "Reason: Cclose id %s is from another session\r\n", query_param.cclose[i]); 
+	  return false;
+	}
+      i++;
+    }
+    // delete channels
+    i=0;
+    while( query_param.cclose[i][0] !='\0'){
+      
+      *curchannel = search_channel( query_param.cclose[i], (*cursession)->channellist);
+      delete_channel( curchannel, (*cursession)->channellist);
+      i++;
+    }
+    
+    if( (*cursession)->channellist->first == NULL || (*cursession)->channellist->last == NULL)
+      // In case of empty session
+      delete_session( cursession, sessionlist);
+  }
+  return true;
+}
+
+
+/**
+ * enqueue tiles or precincts into the message queue
+ *
+ * @param[in] query_param structured query
+ * @param[in] msgqueue    message queue pointer  
+ */
+void enqueue_imagedata( query_param_t query_param, msgqueue_param_t *msgqueue);
+
+/**
+ * enqueue metadata bins into the message queue
+ *
+ * @param[in]     query_param  structured query
+ * @param[in]     metadatalist pointer to metadata bin list
+ * @param[in,out] msgqueue     message queue pointer  
+ */
+void enqueue_metabins( query_param_t query_param, metadatalist_param_t *metadatalist, msgqueue_param_t *msgqueue);
+
+
+bool gene_JPIPstream( query_param_t query_param,
+		      target_param_t *target,
+		      session_param_t *cursession, 
+		      channel_param_t *curchannel,
+		      msgqueue_param_t **msgqueue)
+{
+  index_param_t *codeidx;
+  cachemodel_param_t *cachemodel;
+  
+  if( !cursession || !curchannel){ // stateless
+    if( !target)
+      return false;
+    if( !(cachemodel = gene_cachemodel( NULL, target, query_param.return_type==JPPstream)))
+      return false;
+    *msgqueue = gene_msgqueue( true, cachemodel);
+  }
+  else{ // session
+    cachemodel  = curchannel->cachemodel;
+    target = cachemodel->target;
+    *msgqueue = gene_msgqueue( false, cachemodel);
+  }
+  
+  codeidx = target->codeidx;
+
+  if( cachemodel->jppstream)
+    fprintf( FCGI_stdout, "Content-type: image/jpp-stream\r\n");
+  else
+    fprintf( FCGI_stdout, "Content-type: image/jpt-stream\r\n");
+  
+  if( query_param.layers != -1){
+    if( query_param.layers  > codeidx->COD.numOflayers){
+      fprintf( FCGI_stdout, "JPIP-layers: %d\r\n", codeidx->COD.numOflayers);
+      query_param.layers = codeidx->COD.numOflayers;
+    }
+  }
+
+  //meta
+  if( query_param.box_type[0][0] != 0  && query_param.len != 0)
+    enqueue_metabins( query_param, codeidx->metadatalist, *msgqueue); 
+
+  // image codestream
+  if( query_param.fx > 0 && query_param.fy > 0){
+    if( !cachemodel->mhead_model && query_param.len != 0)
+      enqueue_mainheader( *msgqueue);
+    enqueue_imagedata( query_param, *msgqueue);
+  }
+  return true;
+}
+
+
+/**
+ * enqueue precinct data-bins into the queue
+ *
+ * @param[in] xmin      min x coordinate in the tile at the decomposition level
+ * @param[in] xmax      max x coordinate in the tile at the decomposition level
+ * @param[in] ymin      min y coordinate in the tile at the decomposition level
+ * @param[in] ymax      max y coordinate in the tile at the decomposition level
+ * @param[in] tile_id   tile index
+ * @param[in] level     decomposition level
+ * @param[in] lastcomp  last component number
+ * @param[in] comps     pointer to the array that stores the requested components
+ * @param[in] layers    number of quality layers
+ * @param[in] msgqueue  message queue
+ * @return
+ */
+void enqueue_precincts( int xmin, int xmax, int ymin, int ymax, int tile_id, int level, int lastcomp, bool *comps, int layers, msgqueue_param_t *msgqueue);
+
+/**
+ * enqueue all precincts inside a tile into the queue
+ *
+ * @param[in] tile_id   tile index
+ * @param[in] level     decomposition level
+ * @param[in] lastcomp  last component number
+ * @param[in] comps     pointer to the array that stores the requested components
+ * @param[in] layers    number of quality layers
+ * @param[in] msgqueue  message queue
+ * @return
+ */
+void enqueue_allprecincts( int tile_id, int level, int lastcomp, bool *comps, int layers, msgqueue_param_t *msgqueue);
+
+void enqueue_imagedata( query_param_t query_param, msgqueue_param_t *msgqueue)
+{
+  index_param_t *codeidx;
+  imgreg_param_t imgreg;
+  range_param_t tile_Xrange, tile_Yrange;
+  int u, v, tile_id;
+  int xmin, xmax, ymin, ymax;
+  int numOfreslev;
+
+  codeidx = msgqueue->cachemodel->target->codeidx;
+
+  if( !(msgqueue->cachemodel->jppstream)  &&  get_nmax( codeidx->tilepart) == 1) // normally not the case
+    numOfreslev = 1;
+  else
+    numOfreslev = codeidx->COD.numOfdecomp+1;
+
+  imgreg  = map_viewin2imgreg( query_param.fx, query_param.fy, 
+			       query_param.rx, query_param.ry, query_param.rw, query_param.rh,
+			       codeidx->SIZ.XOsiz, codeidx->SIZ.YOsiz, codeidx->SIZ.Xsiz, codeidx->SIZ.Ysiz, 
+			       numOfreslev );
+
+  if( query_param.len == 0)
+    return;
+
+  for( u=0, tile_id=0; u<codeidx->SIZ.YTnum; u++){
+    tile_Yrange = get_tile_Yrange( codeidx->SIZ, tile_id, imgreg.level);
+    
+    for( v=0; v<codeidx->SIZ.XTnum; v++, tile_id++){
+      tile_Xrange = get_tile_Xrange( codeidx->SIZ, tile_id, imgreg.level);
+	
+      if( tile_Xrange.minvalue < tile_Xrange.maxvalue && tile_Yrange.minvalue < tile_Yrange.maxvalue){
+	if( tile_Xrange.maxvalue <= imgreg.xosiz + imgreg.ox || 
+	    tile_Xrange.minvalue >= imgreg.xosiz + imgreg.ox + imgreg.sx ||
+	    tile_Yrange.maxvalue <= imgreg.yosiz + imgreg.oy || 
+	    tile_Yrange.minvalue >= imgreg.yosiz + imgreg.oy + imgreg.sy) {
+	  //printf("Tile completely excluded from view-window %d\n", tile_id);
+	  // Tile completely excluded from view-window
+	}
+	else if( tile_Xrange.minvalue >= imgreg.xosiz + imgreg.ox && 
+		 tile_Xrange.maxvalue <= imgreg.xosiz + imgreg.ox + imgreg.sx && 
+		 tile_Yrange.minvalue >= imgreg.yosiz + imgreg.oy && 
+		 tile_Yrange.maxvalue <= imgreg.yosiz + imgreg.oy + imgreg.sy) {
+	  // Tile completely contained within view-window
+	  // high priority
+	  //printf("Tile completely contained within view-window %d\n", tile_id);
+	  if( msgqueue->cachemodel->jppstream){
+	    enqueue_tileheader( tile_id, msgqueue);
+	    enqueue_allprecincts( tile_id, imgreg.level, query_param.lastcomp, query_param.comps, query_param.layers, msgqueue);
+	  }
+	  else
+	    enqueue_tile( tile_id, imgreg.level, msgqueue);
+	}
+	else{
+	  // Tile partially overlaps view-window
+	  // low priority
+	  //printf("Tile partially overlaps view-window %d\n", tile_id);
+	  if( msgqueue->cachemodel->jppstream){
+	    enqueue_tileheader( tile_id, msgqueue);
+
+	    xmin = tile_Xrange.minvalue >= imgreg.xosiz + imgreg.ox ? 0 : imgreg.xosiz + imgreg.ox - tile_Xrange.minvalue;
+	    xmax = tile_Xrange.maxvalue <= imgreg.xosiz + imgreg.ox + imgreg.sx ? tile_Xrange.maxvalue - tile_Xrange.minvalue -1 : imgreg.xosiz + imgreg.ox + imgreg.sx - tile_Xrange.minvalue -1;
+	    ymin = tile_Yrange.minvalue >= imgreg.yosiz + imgreg.oy ? 0 : imgreg.yosiz + imgreg.oy - tile_Yrange.minvalue;
+	    ymax = tile_Yrange.maxvalue <= imgreg.yosiz + imgreg.oy + imgreg.sy ? tile_Yrange.maxvalue - tile_Yrange.minvalue -1 : imgreg.yosiz + imgreg.oy + imgreg.sy - tile_Yrange.minvalue -1;
+	    enqueue_precincts( xmin, xmax, ymin, ymax, tile_id, imgreg.level, query_param.lastcomp, query_param.comps, query_param.layers, msgqueue);
+	  }
+	  else
+	    enqueue_tile( tile_id, imgreg.level, msgqueue);
+	}
+      }
+    }
+  }
+}
+
+
+void enqueue_precincts( int xmin, int xmax, int ymin, int ymax, int tile_id, int level, int lastcomp, bool *comps, int layers, msgqueue_param_t *msgqueue)
+{
+  index_param_t *codeidx;
+  int c, u, v, res_lev, dec_lev;
+  int seq_id;
+  Byte4_t XTsiz, YTsiz;
+  Byte4_t XPsiz, YPsiz;
+  Byte4_t xminP, xmaxP, yminP, ymaxP;
+
+  codeidx  = msgqueue->cachemodel->target->codeidx;
+
+  for( c=0; c<codeidx->SIZ.Csiz; c++)
+    if( lastcomp == -1 /*all*/ || ( c<=lastcomp && comps[c])){
+      seq_id = 0;
+      for( res_lev=0, dec_lev=codeidx->COD.numOfdecomp; dec_lev>=level; res_lev++, dec_lev--){
+	
+	XTsiz = get_tile_XSiz( codeidx->SIZ, tile_id, dec_lev);
+	YTsiz = get_tile_YSiz( codeidx->SIZ, tile_id, dec_lev);
+	
+	XPsiz = ( codeidx->COD.Scod & 0x01) ? codeidx->COD.XPsiz[ res_lev] : XTsiz;
+	YPsiz = ( codeidx->COD.Scod & 0x01) ? codeidx->COD.YPsiz[ res_lev] : YTsiz;
+	  
+	for( u=0; u<ceil((double)YTsiz/(double)YPsiz); u++){
+	  yminP = u*YPsiz;
+	  ymaxP = (u+1)*YPsiz-1;
+	  if( YTsiz <= ymaxP)
+	    ymaxP = YTsiz-1;
+	  
+	  for( v=0; v<ceil((double)XTsiz/(double)XPsiz); v++, seq_id++){
+	    xminP = v*XPsiz;
+	    xmaxP = (v+1)*XPsiz-1;
+	    if( XTsiz <= xmaxP)
+	      xmaxP = XTsiz-1;
+	    
+	    if( xmaxP < xmin || xminP > xmax || ymaxP < ymin || yminP > ymax){
+	      // Precinct completely excluded from view-window
+	    }
+	    else if( xminP >= xmin && xmaxP <= xmax && yminP >= ymin && ymaxP <= ymax){
+	      // Precinct completely contained within view-window
+	      // high priority
+	      enqueue_precinct( seq_id, tile_id, c, (dec_lev>level)?-1:layers, msgqueue);
+	    }
+	    else{
+	      // Precinct partially overlaps view-window
+	      // low priority
+	      enqueue_precinct( seq_id, tile_id, c, (dec_lev>level)?-1:layers, msgqueue);
+	    }
+	  }
+	}
+      }
+    }
+}
+
+void enqueue_allprecincts( int tile_id, int level, int lastcomp, bool *comps, int layers, msgqueue_param_t *msgqueue)
+{
+  index_param_t *codeidx;
+  int c, i, res_lev, dec_lev;
+  int seq_id;
+  Byte4_t XTsiz, YTsiz;
+  Byte4_t XPsiz, YPsiz;
+
+  codeidx  = msgqueue->cachemodel->target->codeidx;
+
+  for( c=0; c<codeidx->SIZ.Csiz; c++)
+    if( lastcomp == -1 /*all*/ || ( c<=lastcomp && comps[c])){
+      seq_id = 0;
+      for( res_lev=0, dec_lev=codeidx->COD.numOfdecomp; dec_lev>=level; res_lev++, dec_lev--){
+	
+	XTsiz = get_tile_XSiz( codeidx->SIZ, tile_id, dec_lev);
+	YTsiz = get_tile_YSiz( codeidx->SIZ, tile_id, dec_lev);
+	
+	XPsiz = ( codeidx->COD.Scod & 0x01) ? codeidx->COD.XPsiz[ res_lev] : XTsiz;
+	YPsiz = ( codeidx->COD.Scod & 0x01) ? codeidx->COD.YPsiz[ res_lev] : YTsiz;
+	
+	for( i=0; i<ceil((double)YTsiz/(double)YPsiz)*ceil((double)XTsiz/(double)XPsiz); i++, seq_id++)
+	  enqueue_precinct( seq_id, tile_id, c, (dec_lev>level)?-1:layers, msgqueue);
+      }
+    }
+}
+
+void enqueue_metabins( query_param_t query_param, metadatalist_param_t *metadatalist, msgqueue_param_t *msgqueue)
+{
+  int i;
+  for( i=0; query_param.box_type[i][0]!=0 && i<MAX_NUMOFBOX; i++){
+    if( query_param.box_type[i][0] == '*'){
+      // not implemented
+    }
+    else{
+      int idx = search_metadataidx( query_param.box_type[i], metadatalist);
+
+      if( idx != -1)
+	enqueue_metadata( idx, msgqueue);
+    }
+  }
+}
diff --git a/applications/jpip/opj_server/jpip_parser.h b/applications/jpip/opj_server/jpip_parser.h
new file mode 100644
index 00000000..bcb5edbf
--- /dev/null
+++ b/applications/jpip/opj_server/jpip_parser.h
@@ -0,0 +1,56 @@
+/*
+ * $Id$
+ *
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
+ * Copyright (c) 2010-2011, Kaori Hagihara 
+ * Copyright (c) 2011,      Lucian Corlaciu, GSoC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef   	JPIP_PARSER_H_
+# define   	JPIP_PARSER_H_
+
+#include "bool.h"
+#include "query_parser.h"
+#include "session_manager.h"
+#include "target_manager.h"
+#include "msgqueue_manager.h"
+
+/**
+ * parse JPIP request
+ *
+ * @param[in]     query_param   structured query
+ * @param[in]     sessionlist   session list pointer
+ * @param[in]     targetlist    target list pointer
+ * @param[in,out] msgqueue      address of the message queue pointer
+ * @return                      if succeeded (true) or failed (false)
+ */
+bool parse_JPIPrequest( query_param_t query_param,
+			sessionlist_param_t *sessionlist,
+			targetlist_param_t *targetlist,
+			msgqueue_param_t **msgqueue);
+
+
+#endif 	    /* !JPIP_PARSER_H_ */
diff --git a/applications/jpip/opj_server/opj_server.c b/applications/jpip/opj_server/opj_server.c
index a9778cd4..b39ad56e 100644
--- a/applications/jpip/opj_server/opj_server.c
+++ b/applications/jpip/opj_server/opj_server.c
@@ -51,10 +51,9 @@
 #include <math.h>
 
 #include "query_parser.h"
-#include "channel_manager.h"
+#include "jpip_parser.h"
 #include "session_manager.h"
 #include "target_manager.h"
-#include "imgreg_manager.h"
 #include "msgqueue_manager.h"
 
 #ifndef QUIT_SIGNAL
@@ -70,20 +69,6 @@
 #define logstream stderr
 #endif //SERVER
 
-/**
- * parse JPIP request
- *
- * @param[in]     query_param   structured query
- * @param[in]     sessionlist   session list pointer
- * @param[in]     targetlist    target list pointer
- * @param[in,out] msgqueue      address of the message queue pointer
- * @return                      if succeeded (true) or failed (false)
- */
-bool parse_JPIPrequest( query_param_t query_param,
-			sessionlist_param_t *sessionlist,
-			targetlist_param_t *targetlist,
-			msgqueue_param_t **msgqueue);
-
 int main(void)
 { 
   sessionlist_param_t *sessionlist;
@@ -144,481 +129,3 @@ int main(void)
 
   return 0;
 }
-
-/**
- * REQUEST: target identification by target or tid request
- *
- * @param[in]     query_param   structured query
- * @param[in]     targetlist    target list pointer
- * @param[out]    target        address of target pointer
- * @return                      if succeeded (true) or failed (false)
- */
-bool identify_target( query_param_t query_param, targetlist_param_t *targetlist, target_param_t **target);
-
-/**
- * REQUEST: channel association
- *          this must be processed before any process
- *
- * @param[in]     query_param   structured query
- * @param[in]     sessionlist   session list pointer
- * @param[out]    cursession    address of the associated session pointer
- * @param[out]    curchannel    address of the associated channel pointer
- * @return                      if succeeded (true) or failed (false)
- */
-bool associate_channel( query_param_t    query_param, 
-			sessionlist_param_t *sessionlist,
-			session_param_t **cursession, 
-			channel_param_t **curchannel);
-/**
- * REQUEST: new channel (cnew) assignment
- *
- * @param[in]     query_param   structured query
- * @param[in]     sessionlist   session list pointer
- * @param[in]     target        requested target pointer
- * @param[in,out] cursession    address of the associated/opened session pointer
- * @param[in,out] curchannel    address of the associated/opened channel pointer
- * @return                      if succeeded (true) or failed (false)
- */
-bool open_channel( query_param_t query_param, 
-		   sessionlist_param_t *sessionlist,
-		   target_param_t *target,
-		   session_param_t **cursession, 
-		   channel_param_t **curchannel);
-
-/**
- * REQUEST: channel close (cclose)
- *
- * @param[in]     query_param   structured query
- * @param[in]     sessionlist   session list pointer
- * @param[in,out] cursession    address of the session pointer of deleting channel
- * @param[in,out] curchannel    address of the deleting channel pointer
- * @return                      if succeeded (true) or failed (false)
- */
-bool close_channel( query_param_t query_param, 
-		    sessionlist_param_t *sessionlist,
-		    session_param_t **cursession, 
-		    channel_param_t **curchannel);
-
-/**
- * REQUEST: view-window (fsiz)
- *
- * @param[in]     query_param structured query
- * @param[in]     target      requested target pointer
- * @param[in,out] cursession  associated session pointer
- * @param[in,out] curchannel  associated channel pointer
- * @param[out]    msgqueue    address of the message queue pointer
- * @return                    if succeeded (true) or failed (false)
- */
-bool gene_JPIPstream( query_param_t query_param,
-		     target_param_t *target,
-		     session_param_t *cursession, 
-		     channel_param_t *curchannel,
-		     msgqueue_param_t **msgqueue);
-
-bool parse_JPIPrequest( query_param_t query_param,
-			sessionlist_param_t *sessionlist,
-			targetlist_param_t *targetlist,
-			msgqueue_param_t **msgqueue)
-{ 
-  target_param_t *target = NULL;
-  session_param_t *cursession = NULL;
-  channel_param_t *curchannel = NULL;
-
-  if( query_param.target[0] != '\0' || query_param.tid[0] != '\0'){
-    if( !identify_target( query_param, targetlist, &target))
-      return false;
-  }
-
-  if( query_param.cid[0] != '\0'){
-    if( !associate_channel( query_param, sessionlist, &cursession, &curchannel))
-      return false;
-  }
-
-  if( query_param.cnew){
-    if( !open_channel( query_param, sessionlist, target, &cursession, &curchannel))
-      return false;
-  }
-  if( query_param.cclose[0][0] != '\0')
-    if( !close_channel( query_param, sessionlist, &cursession, &curchannel))
-      return false;
-  
-  if( (query_param.fx > 0 && query_param.fy > 0) || query_param.box_type[0][0] != 0)
-    if( !gene_JPIPstream( query_param, target, cursession, curchannel, msgqueue))
-      return false;
-  
-  return true;
-}
-
-bool identify_target( query_param_t query_param, targetlist_param_t *targetlist, target_param_t **target)
-{
-  if( query_param.tid[0] !='\0' && strcmp( query_param.tid, "0") != 0 ){
-    if( query_param.cid[0] != '\0'){
-      fprintf( FCGI_stdout, "Reason: Target can not be specified both through tid and cid\r\n");
-      fprintf( FCGI_stdout, "Status: 400\r\n");
-      return false;
-    }
-    if( ( *target = search_targetBytid( query_param.tid, targetlist)))
-      return true;
-  }
-
-  if( query_param.target[0] !='\0')
-    if( !( *target = search_target( query_param.target, targetlist)))
-      if(!( *target = gene_target( targetlist, query_param.target)))
-	return false;
-
-  if( *target){
-    fprintf( FCGI_stdout, "JPIP-tid: %s\r\n", (*target)->tid);
-    return true;
-  }
-  else{
-    fprintf( FCGI_stdout, "Reason: target not found\r\n");
-    fprintf( FCGI_stdout, "Status: 400\r\n");
-    return false;
-  }
-}
-
-bool associate_channel( query_param_t    query_param, 
-			sessionlist_param_t *sessionlist,
-			session_param_t **cursession, 
-			channel_param_t **curchannel)
-{
-  if( search_session_and_channel( query_param.cid, sessionlist, cursession, curchannel)){
-    
-    if( !query_param.cnew)
-      set_channel_variable_param( query_param, *curchannel);
-  }
-  else{
-    fprintf( FCGI_stderr, "Error: process canceled\n");
-    return false;
-  }
-  return true;
-}
-
-bool open_channel( query_param_t query_param, 
-		   sessionlist_param_t *sessionlist,
-		   target_param_t *target,
-		   session_param_t **cursession, 
-		   channel_param_t **curchannel)
-{
-  cachemodel_param_t *cachemodel = NULL;
-
-  if( target){
-    if( !(*cursession))
-      *cursession = gene_session( sessionlist);
-    if( !( cachemodel = search_cachemodel( target, (*cursession)->cachemodellist)))
-      if( !(cachemodel = gene_cachemodel( (*cursession)->cachemodellist, target, query_param.return_type==JPPstream)))
-	return false;
-  }
-  else
-    if( *curchannel)
-      cachemodel = (*curchannel)->cachemodel;
-
-  *curchannel = gene_channel( query_param, cachemodel, (*cursession)->channellist);
-  if( *curchannel == NULL)
-    return false;
-
-  return true;
-}
-
-bool close_channel( query_param_t query_param, 
-		    sessionlist_param_t *sessionlist,
-		    session_param_t **cursession, 
-		    channel_param_t **curchannel)
-{
-  if( query_param.cclose[0][0] =='*'){
-#ifndef SERVER
-    fprintf( logstream, "local log: close all\n");
-#endif
-    // all channels associatd with the session will be closed
-    if( !delete_session( cursession, sessionlist))
-      return false;
-  }
-  else{
-    // check if all entry belonging to the same session
-    int i=0;
-    while( query_param.cclose[i][0] !='\0'){
-      
-      // In case of the first entry of close cid
-      if( *cursession == NULL){
-	if( !search_session_and_channel( query_param.cclose[i], sessionlist, cursession, curchannel))
-	  return false;
-      }
-      else // second or more entry of close cid
-	if( !(*curchannel=search_channel( query_param.cclose[i], (*cursession)->channellist))){
-	  fprintf( FCGI_stdout, "Reason: Cclose id %s is from another session\r\n", query_param.cclose[i]); 
-	  return false;
-	}
-      i++;
-    }
-    // delete channels
-    i=0;
-    while( query_param.cclose[i][0] !='\0'){
-      
-      *curchannel = search_channel( query_param.cclose[i], (*cursession)->channellist);
-      delete_channel( curchannel, (*cursession)->channellist);
-      i++;
-    }
-    
-    if( (*cursession)->channellist->first == NULL || (*cursession)->channellist->last == NULL)
-      // In case of empty session
-      delete_session( cursession, sessionlist);
-  }
-  return true;
-}
-
-
-/**
- * enqueue tiles or precincts into the message queue
- *
- * @param[in] query_param structured query
- * @param[in] msgqueue    message queue pointer  
- */
-void enqueue_imagedata( query_param_t query_param, msgqueue_param_t *msgqueue);
-
-/**
- * enqueue metadata bins into the message queue
- *
- * @param[in]     query_param  structured query
- * @param[in]     metadatalist pointer to metadata bin list
- * @param[in,out] msgqueue     message queue pointer  
- */
-void enqueue_metabins( query_param_t query_param, metadatalist_param_t *metadatalist, msgqueue_param_t *msgqueue);
-
-
-bool gene_JPIPstream( query_param_t query_param,
-		      target_param_t *target,
-		      session_param_t *cursession, 
-		      channel_param_t *curchannel,
-		      msgqueue_param_t **msgqueue)
-{
-  index_param_t *codeidx;
-  cachemodel_param_t *cachemodel;
-  
-  if( !cursession || !curchannel){ // stateless
-    if( !target)
-      return false;
-    if( !(cachemodel = gene_cachemodel( NULL, target, query_param.return_type==JPPstream)))
-      return false;
-    *msgqueue = gene_msgqueue( true, cachemodel);
-  }
-  else{ // session
-    cachemodel  = curchannel->cachemodel;
-    target = cachemodel->target;
-    *msgqueue = gene_msgqueue( false, cachemodel);
-  }
-  
-  if( cachemodel->jppstream)
-    fprintf( FCGI_stdout, "Content-type: image/jpp-stream\r\n");
-  else
-    fprintf( FCGI_stdout, "Content-type: image/jpt-stream\r\n");
-
-  codeidx = target->codeidx;
-
-  //meta
-  if( query_param.box_type[0][0] != 0)
-    enqueue_metabins( query_param, codeidx->metadatalist, *msgqueue); 
-
-  // image codestream
-  if( query_param.fx > 0 && query_param.fy > 0){
-    if( !cachemodel->mhead_model)
-      enqueue_mainheader( *msgqueue);
-    enqueue_imagedata( query_param, *msgqueue);
-  }
-  return true;
-}
-
-
-/**
- * enqueue precinct data-bins into the queue
- *
- * @param[in] xmin      min x coordinate in the tile at the decomposition level
- * @param[in] xmax      max x coordinate in the tile at the decomposition level
- * @param[in] ymin      min y coordinate in the tile at the decomposition level
- * @param[in] ymax      max y coordinate in the tile at the decomposition level
- * @param[in] tile_id   tile index
- * @param[in] level     decomposition level
- * @param[in] lastcomp  last component number
- * @param[in] comps     pointer to the array that stores the requested components
- * @param[in] msgqueue  message queue
- * @return
- */
-void enqueue_precincts( int xmin, int xmax, int ymin, int ymax, int tile_id, int level, int lastcomp, bool *comps, msgqueue_param_t *msgqueue);
-
-/**
- * enqueue all precincts inside a tile into the queue
- *
- * @param[in] tile_id   tile index
- * @param[in] level     decomposition level
- * @param[in] lastcomp  last component number
- * @param[in] comps     pointer to the array that stores the requested components
- * @param[in] msgqueue  message queue
- * @return
- */
-void enqueue_allprecincts( int tile_id, int level, int lastcomp, bool *comps, msgqueue_param_t *msgqueue);
-
-void enqueue_imagedata( query_param_t query_param, msgqueue_param_t *msgqueue)
-{
-  index_param_t *codeidx;
-  imgreg_param_t imgreg;
-  range_param_t tile_Xrange, tile_Yrange;
-  int u, v, tile_id;
-  int xmin, xmax, ymin, ymax;
-  int numOfreslev;
-
-  codeidx = msgqueue->cachemodel->target->codeidx;
-
-  if( !(msgqueue->cachemodel->jppstream)  &&  get_nmax( codeidx->tilepart) == 1) // normally not the case
-    numOfreslev = 1;
-  else
-    numOfreslev = codeidx->COD.numOfdecomp+1;
-
-  imgreg  = map_viewin2imgreg( query_param.fx, query_param.fy, 
-			       query_param.rx, query_param.ry, query_param.rw, query_param.rh,
-			       codeidx->SIZ.XOsiz, codeidx->SIZ.YOsiz, codeidx->SIZ.Xsiz, codeidx->SIZ.Ysiz, 
-			       numOfreslev );
-
-  for( u=0, tile_id=0; u<codeidx->SIZ.YTnum; u++){
-    tile_Yrange = get_tile_Yrange( codeidx->SIZ, tile_id, imgreg.level);
-    
-    for( v=0; v<codeidx->SIZ.XTnum; v++, tile_id++){
-      tile_Xrange = get_tile_Xrange( codeidx->SIZ, tile_id, imgreg.level);
-	
-      if( tile_Xrange.minvalue < tile_Xrange.maxvalue && tile_Yrange.minvalue < tile_Yrange.maxvalue){
-	if( tile_Xrange.maxvalue <= imgreg.xosiz + imgreg.ox || 
-	    tile_Xrange.minvalue >= imgreg.xosiz + imgreg.ox + imgreg.sx ||
-	    tile_Yrange.maxvalue <= imgreg.yosiz + imgreg.oy || 
-	    tile_Yrange.minvalue >= imgreg.yosiz + imgreg.oy + imgreg.sy) {
-	  //printf("Tile completely excluded from view-window %d\n", tile_id);
-	  // Tile completely excluded from view-window
-	}
-	else if( tile_Xrange.minvalue >= imgreg.xosiz + imgreg.ox && 
-		 tile_Xrange.maxvalue <= imgreg.xosiz + imgreg.ox + imgreg.sx && 
-		 tile_Yrange.minvalue >= imgreg.yosiz + imgreg.oy && 
-		 tile_Yrange.maxvalue <= imgreg.yosiz + imgreg.oy + imgreg.sy) {
-	  // Tile completely contained within view-window
-	  // high priority
-	  //printf("Tile completely contained within view-window %d\n", tile_id);
-	  if( msgqueue->cachemodel->jppstream){
-	    enqueue_tileheader( tile_id, msgqueue);
-	    enqueue_allprecincts( tile_id, imgreg.level, query_param.lastcomp, query_param.comps, msgqueue);
-	  }
-	  else
-	    enqueue_tile( tile_id, imgreg.level, msgqueue);
-	}
-	else{
-	  // Tile partially overlaps view-window
-	  // low priority
-	  //printf("Tile partially overlaps view-window %d\n", tile_id);
-	  if( msgqueue->cachemodel->jppstream){
-	    enqueue_tileheader( tile_id, msgqueue);
-
-	    xmin = tile_Xrange.minvalue >= imgreg.xosiz + imgreg.ox ? 0 : imgreg.xosiz + imgreg.ox - tile_Xrange.minvalue;
-	    xmax = tile_Xrange.maxvalue <= imgreg.xosiz + imgreg.ox + imgreg.sx ? tile_Xrange.maxvalue - tile_Xrange.minvalue -1 : imgreg.xosiz + imgreg.ox + imgreg.sx - tile_Xrange.minvalue -1;
-	    ymin = tile_Yrange.minvalue >= imgreg.yosiz + imgreg.oy ? 0 : imgreg.yosiz + imgreg.oy - tile_Yrange.minvalue;
-	    ymax = tile_Yrange.maxvalue <= imgreg.yosiz + imgreg.oy + imgreg.sy ? tile_Yrange.maxvalue - tile_Yrange.minvalue -1 : imgreg.yosiz + imgreg.oy + imgreg.sy - tile_Yrange.minvalue -1;
-	    enqueue_precincts( xmin, xmax, ymin, ymax, tile_id, imgreg.level, query_param.lastcomp, query_param.comps, msgqueue);
-	  }
-	  else
-	    enqueue_tile( tile_id, imgreg.level, msgqueue);
-	}
-      }
-    }
-  }
-}
-
-
-void enqueue_precincts( int xmin, int xmax, int ymin, int ymax, int tile_id, int level, int lastcomp, bool *comps, msgqueue_param_t *msgqueue)
-{
-  index_param_t *codeidx;
-  int c, u, v, res_lev, dec_lev;
-  int seq_id;
-  Byte4_t XTsiz, YTsiz;
-  Byte4_t XPsiz, YPsiz;
-  Byte4_t xminP, xmaxP, yminP, ymaxP;
-
-  codeidx  = msgqueue->cachemodel->target->codeidx;
-
-  for( c=0; c<codeidx->SIZ.Csiz; c++)
-    if( lastcomp == -1 /*all*/ || ( c<=lastcomp && comps[c])){
-      seq_id = 0;
-      for( res_lev=0, dec_lev=codeidx->COD.numOfdecomp; dec_lev>=level; res_lev++, dec_lev--){
-	
-	XTsiz = get_tile_XSiz( codeidx->SIZ, tile_id, dec_lev);
-	YTsiz = get_tile_YSiz( codeidx->SIZ, tile_id, dec_lev);
-	
-	XPsiz = ( codeidx->COD.Scod & 0x01) ? codeidx->COD.XPsiz[ res_lev] : XTsiz;
-	YPsiz = ( codeidx->COD.Scod & 0x01) ? codeidx->COD.YPsiz[ res_lev] : YTsiz;
-	  
-	for( u=0; u<ceil((double)YTsiz/(double)YPsiz); u++){
-	  yminP = u*YPsiz;
-	  ymaxP = (u+1)*YPsiz-1;
-	  if( YTsiz <= ymaxP)
-	    ymaxP = YTsiz-1;
-	  
-	  for( v=0; v<ceil((double)XTsiz/(double)XPsiz); v++, seq_id++){
-	    xminP = v*XPsiz;
-	    xmaxP = (v+1)*XPsiz-1;
-	    if( XTsiz <= xmaxP)
-	      xmaxP = XTsiz-1;
-	    
-	    if( xmaxP < xmin || xminP > xmax || ymaxP < ymin || yminP > ymax){
-	      // Precinct completely excluded from view-window
-	    }
-	    else if( xminP >= xmin && xmaxP <= xmax && yminP >= ymin && ymaxP <= ymax){
-	      // Precinct completely contained within view-window
-	      // high priority
-	      enqueue_precinct( seq_id, tile_id, c, msgqueue);
-	    }
-	    else{
-	      // Precinct partially overlaps view-window
-	      // low priority
-	      enqueue_precinct( seq_id, tile_id, c, msgqueue);
-	    }
-	  }
-	}
-      }
-    }
-}
-
-void enqueue_allprecincts( int tile_id, int level, int lastcomp, bool *comps, msgqueue_param_t *msgqueue)
-{
-  index_param_t *codeidx;
-  int c, i, res_lev, dec_lev;
-  int seq_id;
-  Byte4_t XTsiz, YTsiz;
-  Byte4_t XPsiz, YPsiz;
-
-  codeidx  = msgqueue->cachemodel->target->codeidx;
-
-  for( c=0; c<codeidx->SIZ.Csiz; c++)
-    if( lastcomp == -1 /*all*/ || ( c<=lastcomp && comps[c])){
-      seq_id = 0;
-      for( res_lev=0, dec_lev=codeidx->COD.numOfdecomp; dec_lev>=level; res_lev++, dec_lev--){
-	
-	XTsiz = get_tile_XSiz( codeidx->SIZ, tile_id, dec_lev);
-	YTsiz = get_tile_YSiz( codeidx->SIZ, tile_id, dec_lev);
-	
-	XPsiz = ( codeidx->COD.Scod & 0x01) ? codeidx->COD.XPsiz[ res_lev] : XTsiz;
-	YPsiz = ( codeidx->COD.Scod & 0x01) ? codeidx->COD.YPsiz[ res_lev] : YTsiz;
-	
-	for( i=0; i<ceil((double)YTsiz/(double)YPsiz)*ceil((double)XTsiz/(double)XPsiz); i++, seq_id++)
-	  enqueue_precinct( seq_id, tile_id, c, msgqueue);
-      }
-    }
-}
-
-void enqueue_metabins( query_param_t query_param, metadatalist_param_t *metadatalist, msgqueue_param_t *msgqueue)
-{
-  int i;
-  for( i=0; query_param.box_type[i][0]!=0 && i<MAX_NUMOFBOX; i++){
-    if( query_param.box_type[i][0] == '*'){
-      // not implemented
-    }
-    else{
-      int idx = search_metadataidx( query_param.box_type[i], metadatalist);
-
-      if( idx != -1)
-	enqueue_metadata( idx, msgqueue);
-    }
-  }
-}
diff --git a/applications/jpip/opj_server/query_parser.c b/applications/jpip/opj_server/query_parser.c
index 1195dcc5..a29c8f12 100644
--- a/applications/jpip/opj_server/query_parser.c
+++ b/applications/jpip/opj_server/query_parser.c
@@ -39,6 +39,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include "query_parser.h"
 
 #ifdef SERVER
@@ -116,6 +117,9 @@ void parse_query( char *query_string, query_param_t *query_param)
       else if( strcasecmp( fieldname, "rsiz") == 0)
 	sscanf( fieldval, "%d,%d", &query_param->rw, &query_param->rh);
       
+      else if( strcasecmp( fieldname, "layers") == 0)
+	sscanf( fieldval, "%d", &query_param->layers);
+      
       else if( strcasecmp( fieldname, "cid") == 0)
 	strcpy( query_param->cid, fieldval);
 
@@ -137,6 +141,9 @@ void parse_query( char *query_string, query_param_t *query_param)
 	else if( strncasecmp( fieldval, "jpt-stream", 10) == 0)
 	  query_param->return_type = JPTstream;
       }
+
+      else if( strcasecmp( fieldname, "len") == 0)
+	sscanf( fieldval, "%d", &query_param->len);
     }
   }
 }
@@ -145,18 +152,19 @@ void init_queryparam( query_param_t *query_param)
 {
   int i;
 
-  query_param->target[0]='\0';
-  query_param->tid[0]='\0';
-  query_param->fx=-1;
-  query_param->fy=-1;
-  query_param->rx=-1;
-  query_param->ry=-1;
-  query_param->rw=-1;
-  query_param->rh=-1;
+  query_param->target[0] = '\0';
+  query_param->tid[0] = '\0';
+  query_param->fx = -1;
+  query_param->fy = -1;
+  query_param->rx = -1;
+  query_param->ry = -1;
+  query_param->rw = -1;
+  query_param->rh = -1;
+  query_param->layers = -1;
   query_param->lastcomp = -1;
   query_param->comps = NULL;  
-  query_param->cid[0]='\0';
-  query_param->cnew=false;
+  query_param->cid[0] = '\0';
+  query_param->cnew = false;
   memset( query_param->cclose, 0, MAX_NUMOFCCLOSE*MAX_LENOFCID);
   memset( query_param->box_type, 0, MAX_NUMOFBOX*4);
   memset( query_param->limit, 0, MAX_NUMOFBOX*sizeof(int));
@@ -171,6 +179,7 @@ void init_queryparam( query_param_t *query_param)
   query_param->max_depth = -1;
   query_param->metadata_only = false;
   query_param->return_type = UNKNOWN;
+  query_param->len = -1;
 }
 
 
@@ -208,6 +217,7 @@ void print_queryparam( query_param_t query_param)
   fprintf( logstream, "\t tid: %s\n", query_param.tid);
   fprintf( logstream, "\t fx,fy: %d, %d\n", query_param.fx, query_param.fy);
   fprintf( logstream, "\t rx,ry: %d, %d \t rw,rh: %d, %d\n", query_param.rx, query_param.ry, query_param.rw, query_param.rh);
+  fprintf( logstream, "\t layers: %d\n", query_param.layers);
   fprintf( logstream, "\t components: ");
   if( query_param.lastcomp == -1)
     fprintf( logstream, "ALL\n");
@@ -234,6 +244,7 @@ void print_queryparam( query_param_t query_param)
   fprintf( logstream, "\t max-depth: %d\n", query_param.max_depth);
   fprintf( logstream, "\t metadata-only: %d\n", query_param.metadata_only);
   fprintf( logstream, "\t image return type: %d, [JPP-stream=0, JPT-stream=1, UNKNOWN=-1]\n", query_param.return_type);
+  fprintf( logstream, "\t len:  %d\n", query_param.len);
 }
 
 void str2cclose( char *src, char cclose[][MAX_LENOFCID])
diff --git a/applications/jpip/opj_server/query_parser.h b/applications/jpip/opj_server/query_parser.h
index 2df9609b..55be9dd1 100644
--- a/applications/jpip/opj_server/query_parser.h
+++ b/applications/jpip/opj_server/query_parser.h
@@ -58,6 +58,7 @@ typedef struct query_param{
   char tid[MAX_LENOFTID];                     //!< target identifier
   int fx, fy;                                 //!< frame size (fx,fy)
   int rx, ry, rw, rh;                         //!< roi region
+  int layers;                                 //!< quality layers
   int lastcomp;                               //!< last component number
   bool *comps;                                //!< components for jpp-stream, null means all components
   char cid[MAX_LENOFCID];                     //!< channel identifier
@@ -74,6 +75,7 @@ typedef struct query_param{
   int max_depth;                              //!< max-depth
   bool metadata_only;                         //!< metadata-only request
   image_return_t return_type;                 //!< image return type
+  int len;                                    //!< maximum response length
 } query_param_t;
 
 
diff --git a/applications/jpip/tools/jpip_to_j2k.c b/applications/jpip/tools/jpip_to_j2k.c
index dfceb69f..9a469e74 100644
--- a/applications/jpip/tools/jpip_to_j2k.c
+++ b/applications/jpip/tools/jpip_to_j2k.c
@@ -89,6 +89,7 @@ int main(int argc,char *argv[])
   
   //print_msgqueue( msgqueue);
   
+  // arguments fw, fh need to be set for LRCP, PCRL, CPRL
   j2kstream = recons_j2k( msgqueue, jpipstream, msgqueue->first->csn, 0, 0, &j2klen);
     
   delete_msgqueue( &msgqueue);