[trunk] clean jp2_read_ihdr_v2 interface

[openjpeg.git] / libopenjpeg / t2.h

diff --git a/libopenjpeg/t2.h b/libopenjpeg/t2.h
index 42c9804aaa9f718cb0318853eb5ac8170382304a..2273c44e8e759d628d4ab5bf945f057790b2c914 100644 (file)
--- a/libopenjpeg/t2.h
+++ b/libopenjpeg/t2.h
@@ -1,9 +1,10 @@
 /*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Herv� Drolon, FreeImage Team
- * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,6 +52,19 @@ typedef struct opj_t2 {
        opj_cp_t *cp;
 } opj_t2_t;
 
+/**
+Tier-2 coding
+*/
+typedef struct opj_t2_v2 {
+       /** codec context */
+       opj_common_ptr cinfo;
+
+       /** Encoding: pointer to the src image. Decoding: pointer to the dst image. */
+       opj_image_t *image;
+       /** pointer to the image coding parameters */
+       opj_cp_v2_t *cp;
+} opj_t2_v2_t;
+
 /** @name Exported functions */
 /*@{*/
 /* ----------------------------------------------------------------------- */
@@ -63,9 +77,51 @@ Encode the packets of a tile to a destination buffer
 @param maxlayers maximum number of layers
 @param dest the destination buffer
 @param len the length of the destination buffer
-@param image_info structure to create an index file
+@param cstr_info Codestream information structure 
+@param tpnum Tile part number of the current tile
+@param tppos The position of the tile part flag in the progression order
+@param pino 
+@param t2_mode If == 0 In Threshold calculation ,If == 1 Final pass
+@param cur_totnum_tp The total number of tile parts in the current tile
+*/
+int t2_encode_packets(opj_t2_t* t2,int tileno, opj_tcd_tile_t *tile, int maxlayers, unsigned char *dest, int len, opj_codestream_info_t *cstr_info,int tpnum, int tppos,int pino,J2K_T2_MODE t2_mode,int cur_totnum_tp);
+
+/**
+Encode the packets of a tile to a destination buffer
+@param t2 T2 handle
+@param tileno number of the tile encoded
+@param tile the tile for which to write the packets
+@param maxlayers maximum number of layers
+@param dest the destination buffer
+@param len the length of the destination buffer
+@param cstr_info Codestream information structure
+@param tpnum Tile part number of the current tile
+@param tppos The position of the tile part flag in the progression order
+@param t2_mode If == 0 In Threshold calculation ,If == 1 Final pass
 */
-int t2_encode_packets(opj_t2_t* t2, int tileno, opj_tcd_tile_t *tile, int maxlayers, unsigned char *dest, int len, opj_image_info_t *image_info);
+opj_bool t2_encode_packets_v2( opj_t2_v2_t* t2,
+                                                               OPJ_UINT32 tileno,
+                                                               struct opj_tcd_tile_v2 *tile,
+                                                               OPJ_UINT32 maxlayers,
+                                                               OPJ_BYTE *dest,
+                                                               OPJ_UINT32 * p_data_written,
+                                                               OPJ_UINT32 len,
+                                                               struct opj_codestream_info *cstr_info,
+                                                               OPJ_UINT32 tpnum,
+                                                               OPJ_INT32 tppos,
+                                                               OPJ_UINT32 pino,
+                                                               J2K_T2_MODE t2_mode);
+
+/**
+Decode the packets of a tile from a source buffer
+@param t2 T2 handle
+@param src the source buffer
+@param len length of the source buffer
+@param tileno number that identifies the tile for which to decode the packets
+@param tile tile for which to decode the packets
+@param cstr_info Codestream information structure
+ */
+int t2_decode_packets(opj_t2_t *t2, unsigned char *src, int len, int tileno, opj_tcd_tile_t *tile, opj_codestream_info_t *cstr_info);
 
 /**
 Decode the packets of a tile from a source buffer
@@ -75,7 +131,21 @@ Decode the packets of a tile from a source buffer
 @param tileno number that identifies the tile for which to decode the packets
 @param tile tile for which to decode the packets
  */
-int t2_decode_packets(opj_t2_t *t2, unsigned char *src, int len, int tileno, opj_tcd_tile_t *tile);
+opj_bool t2_decode_packets_v2( opj_t2_v2_t *t2,
+                                                               OPJ_UINT32 tileno,
+                                                               struct opj_tcd_tile_v2 *tile,
+                                                               OPJ_BYTE *src, OPJ_UINT32 * p_data_read,
+                                                               OPJ_UINT32 len,
+                                                               opj_codestream_index_t *cstr_info);
+
+/**
+ * Creates a Tier 2 handle
+ *
+ * @param      p_image         Source or destination image
+ * @param      p_cp            Image coding parameters.
+ * @return             a new T2 handle if successful, NULL otherwise.
+*/
+opj_t2_v2_t* t2_create_v2(opj_image_t *p_image, opj_cp_v2_t *p_cp);
 
 /**
 Create a T2 handle
@@ -91,6 +161,12 @@ Destroy a T2 handle
 */
 void t2_destroy(opj_t2_t *t2);
 
+/**
+Destroy a T2 handle
+@param t2 T2 handle to destroy
+*/
+void t2_destroy_v2(opj_t2_v2_t *t2);
+
 /* ----------------------------------------------------------------------- */
 /*@}*/