[trunk] Update JPIP (FolderReorgProposal task)
[openjpeg.git] / src / lib / openjpip / ppix_manager.c
index 5afbbfd70e984e528778b2cc7fe90ec167616540..6eb70bcc0203164bd01d3434bdc49b8f23889158 100644 (file)
@@ -83,6 +83,63 @@ int write_ppix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int
   return len;
 }
 
+int write_ppix_v2( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager )
+{
+  OPJ_BYTE l_data_header [4];
+  int len, lenp, compno, i;
+  opj_jp2_box_t *box;
+
+  /*  printf("cstr_info.packno %d\n", cstr_info.packno); //NMAX? */
+
+  lenp = -1;
+  box = (opj_jp2_box_t *)opj_calloc( cstr_info.numcomps, sizeof(opj_jp2_box_t));
+  
+  for (i=0;i<2;i++){
+    if (i)
+#if 0
+      cio_seek( cio, lenp);
+#else
+      opj_stream_seek( cio, lenp, p_manager);
+#endif
+    
+#if 0
+    lenp = cio_tell( cio);
+    cio_skip( cio, 4);              /* L [at the end] */
+    cio_write( cio, JPIP_PPIX, 4);  /* PPIX           */
+#else
+    lenp = opj_stream_tell(cio);
+    opj_stream_skip( cio, 4, p_manager);       /* L [at the end] */
+    opj_write_bytes(l_data_header,JPIP_PPIX,4);/* PPIX           */
+    opj_stream_write_data(cio,l_data_header,4,p_manager);
+#endif
+
+    write_manf_v2( i, cstr_info.numcomps, box, cio);
+    
+    for (compno=0; compno<cstr_info.numcomps; compno++){
+      box[compno].length = write_ppixfaix_v2( coff, compno, cstr_info, EPHused, j2klen, cio);
+      box[compno].type = JPIP_FAIX;
+    }
+   
+#if 0
+    len = cio_tell( cio)-lenp;
+    cio_seek( cio, lenp);
+    cio_write( cio, len, 4);        /* L              */
+    cio_seek( cio, lenp+len);
+#else
+  len = opj_stream_tell(cio)-lenp;
+  opj_stream_seek(cio, lenp,p_manager);
+  opj_write_bytes(l_data_header,len,4);/* L              */
+  opj_stream_write_data(cio,l_data_header,4,p_manager);
+  opj_stream_seek(cio, lenp+len,p_manager);
+#endif
+  }
+  
+  opj_free(box);
+
+  return len;
+}
+
 int write_ppixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio)
 {
   int len, lenp, tileno, version, i, nmax, size_of_coding; /* 4 or 8*/
@@ -168,3 +225,128 @@ int write_ppixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_b
 
   return len;
 }
+
+int write_ppixfaix_v2( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager )
+{
+  OPJ_BYTE l_data_header [8];
+  int len, lenp, tileno, version, i, nmax, size_of_coding; /* 4 or 8*/
+  opj_tile_info_t *tile_Idx;
+  opj_packet_info_t packet;
+  int resno, precno, layno, num_packet;
+  int numOfres, numOfprec, numOflayers;
+  packet.end_pos = packet.end_ph_pos = packet.start_pos = -1;
+  (void)EPHused; /* unused ? */
+
+  if( j2klen > pow( 2, 32)){
+    size_of_coding =  8;
+    version = 1;
+  }
+  else{
+    size_of_coding = 4;
+    version = 0;
+  }
+  
+#if 0
+  lenp = cio_tell( cio);
+  cio_skip( cio, 4);              /* L [at the end]      */
+  cio_write( cio, JPIP_FAIX, 4);  /* FAIX                */ 
+  cio_write( cio, version, 1);     /* Version 0 = 4 bytes */
+#else
+  lenp = opj_stream_tell(cio);
+  opj_stream_skip(cio, 4, p_manager);         /* L [at the end]      */
+  opj_write_bytes(l_data_header,JPIP_FAIX,4); /* FAIX */
+  opj_write_bytes(l_data_header,version,1);
+  opj_stream_write_data(cio,l_data_header,1,p_manager);/* Version 0 = 4 bytes */
+#endif
+
+  nmax = 0;
+  for( i=0; i<=cstr_info.numdecompos[compno]; i++)
+    nmax += cstr_info.tile[0].ph[i] * cstr_info.tile[0].pw[i] * cstr_info.numlayers;
+  
+#if 0
+  cio_write( cio, nmax, size_of_coding); /* NMAX */
+  cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding);      /* M    */
+#else
+  opj_write_bytes(l_data_header,nmax,size_of_coding);         /* NMAX           */
+  opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+  opj_write_bytes(l_data_header,cstr_info.tw*cstr_info.th,size_of_coding);  /* M              */
+  opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+#endif
+
+  for( tileno=0; tileno<cstr_info.tw*cstr_info.th; tileno++){
+    tile_Idx = &cstr_info.tile[ tileno];
+    num_packet=0;
+    numOfres = cstr_info.numdecompos[compno] + 1;
+  
+    for( resno=0; resno<numOfres ; resno++){
+      numOfprec = tile_Idx->pw[resno]*tile_Idx->ph[resno];
+      for( precno=0; precno<numOfprec; precno++){
+       numOflayers = cstr_info.numlayers;
+       for( layno=0; layno<numOflayers; layno++){
+
+         switch ( cstr_info.prog){
+         case LRCP:
+           packet = tile_Idx->packet[ ((layno*numOfres+resno)*cstr_info.numcomps+compno)*numOfprec+precno];
+           break;
+         case RLCP:
+           packet = tile_Idx->packet[ ((resno*numOflayers+layno)*cstr_info.numcomps+compno)*numOfprec+precno];
+           break;
+         case RPCL:
+           packet = tile_Idx->packet[ ((resno*numOfprec+precno)*cstr_info.numcomps+compno)*numOflayers+layno];
+           break;
+         case PCRL:
+           packet = tile_Idx->packet[ ((precno*cstr_info.numcomps+compno)*numOfres+resno)*numOflayers + layno];
+           break;
+         case CPRL:
+           packet = tile_Idx->packet[ ((compno*numOfprec+precno)*numOfres+resno)*numOflayers + layno];
+           break;
+         default:
+           fprintf( stderr, "failed to ppix indexing\n");
+         }
+
+#if 0
+         cio_write( cio, packet.start_pos-coff, size_of_coding);             /* start position */
+         cio_write( cio, packet.end_pos-packet.start_pos+1, size_of_coding); /* length         */
+#else
+    opj_write_bytes(l_data_header,packet.start_pos-coff,size_of_coding);            /* start position */
+    opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+    opj_write_bytes(l_data_header,packet.end_pos-packet.start_pos+1,size_of_coding); /* length         */
+    opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+#endif
+         
+         num_packet++;
+       }
+      }
+    }
+  
+    while( num_packet < nmax){     /* PADDING */
+#if 0
+      cio_write( cio, 0, size_of_coding); /* start position            */
+      cio_write( cio, 0, size_of_coding); /* length                    */
+#else
+      opj_write_bytes(l_data_header,0,size_of_coding);/* start position            */
+      opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+      opj_write_bytes(l_data_header,0,size_of_coding);/* length                    */
+      opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+#endif
+      num_packet++;
+    }   
+  }
+
+#if 0
+  len = cio_tell( cio)-lenp;
+  cio_seek( cio, lenp);
+  cio_write( cio, len, 4);        /* L  */
+  cio_seek( cio, lenp+len);
+#else
+  len = opj_stream_tell(cio)-lenp;
+  opj_stream_seek(cio, lenp,p_manager);
+  opj_write_bytes(l_data_header,len,4);/* L  */
+  opj_stream_write_data(cio,l_data_header,4,p_manager);
+  opj_stream_seek(cio, lenp+len,p_manager);
+#endif
+
+  return len;
+}