X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgdcmopenjpeg%2Flibopenjpeg%2Ft1.h;h=98ea2c018732bf140ab11eeaf47a1f959241704a;hb=fc4f7706c78baf3f60474c06d871b82db221f37b;hp=5e98bc093ad0a8b2ef51c9ce86e5e499b38986af;hpb=7452f3039ff4dd2574fcbf3343b530a2f20f9623;p=gdcm.git

diff --git a/src/gdcmopenjpeg/libopenjpeg/t1.h b/src/gdcmopenjpeg/libopenjpeg/t1.h
index 5e98bc09..98ea2c01 100644
--- a/src/gdcmopenjpeg/libopenjpeg/t1.h
+++ b/src/gdcmopenjpeg/libopenjpeg/t1.h
@@ -1,5 +1,9 @@
 /*
- * Copyright (c) 2001-2002, David Janssens
+ * 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
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,30 +27,124 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-
 #ifndef __T1_H
 #define __T1_H
+/**
+@file t1.h
+@brief Implementation of the tier-1 coding (coding of code-block coefficients) (T1)
 
-#include "tcd.h"
-#include "j2k.h"
+The functions in T1.C have for goal to realize the tier-1 coding operation. The functions
+in T1.C are used by some function in TCD.C.
+*/
 
-/*
- * Initialize the look-up tables of the Tier-1 coder/decoder
- */
-void t1_init_luts();
+/** @defgroup T1 T1 - Implementation of the tier-1 coding */
+/*@{*/
 
-/*
- * Encode the code-blocks of a tile
- * tile: the tile to encode
- * tcp: tile coding parameters
- */
-void t1_encode_cblks(tcd_tile_t * tile, j2k_tcp_t * tcp);
+/* ----------------------------------------------------------------------- */
+#define T1_NMSEDEC_BITS 7
 
-/*
- * Decode the code-blocks of a tile
- * tile: the tile to encode
- * tcp: tile coding parameters
- */
-void t1_decode_cblks(tcd_tile_t * tile, j2k_tcp_t * tcp);
+#define T1_MAXCBLKW 1024  /**< Maximum size of code-block (width) */
+#define T1_MAXCBLKH 1024  /**< Maximum size of code-block (heigth) */
+
+#define T1_SIG_NE 0x0001  /**< Context orientation : North-East direction */
+#define T1_SIG_SE 0x0002  /**< Context orientation : South-East direction */
+#define T1_SIG_SW 0x0004  /**< Context orientation : South-West direction */
+#define T1_SIG_NW 0x0008  /**< Context orientation : North-West direction */
+#define T1_SIG_N 0x0010    /**< Context orientation : North direction */
+#define T1_SIG_E 0x0020    /**< Context orientation : East direction */
+#define T1_SIG_S 0x0040    /**< Context orientation : South direction */
+#define T1_SIG_W 0x0080    /**< Context orientation : West direction */
+#define T1_SIG_OTH (T1_SIG_N|T1_SIG_NE|T1_SIG_E|T1_SIG_SE|T1_SIG_S|T1_SIG_SW|T1_SIG_W|T1_SIG_NW)
+#define T1_SIG_PRIM (T1_SIG_N|T1_SIG_E|T1_SIG_S|T1_SIG_W)
+
+#define T1_SGN_N 0x0100
+#define T1_SGN_E 0x0200
+#define T1_SGN_S 0x0400
+#define T1_SGN_W 0x0800
+#define T1_SGN (T1_SGN_N|T1_SGN_E|T1_SGN_S|T1_SGN_W)
+
+#define T1_SIG 0x1000
+#define T1_REFINE 0x2000
+#define T1_VISIT 0x4000
+
+#define T1_NUMCTXS_AGG 1
+#define T1_NUMCTXS_ZC 9
+#define T1_NUMCTXS_MAG 3
+#define T1_NUMCTXS_SC 5
+#define T1_NUMCTXS_UNI 1
+
+#define T1_CTXNO_AGG 0
+#define T1_CTXNO_ZC (T1_CTXNO_AGG+T1_NUMCTXS_AGG)
+#define T1_CTXNO_MAG (T1_CTXNO_ZC+T1_NUMCTXS_ZC)
+#define T1_CTXNO_SC (T1_CTXNO_MAG+T1_NUMCTXS_MAG)
+#define T1_CTXNO_UNI (T1_CTXNO_SC+T1_NUMCTXS_SC)
+#define T1_NUMCTXS (T1_CTXNO_UNI+T1_NUMCTXS_UNI)
+
+#define T1_NMSEDEC_FRACBITS (T1_NMSEDEC_BITS-1)
+
+#define T1_TYPE_MQ 0  /**< Normal coding using entropy coder */
+#define T1_TYPE_RAW 1  /**< No encoding the information is store under raw format in codestream (mode switch RAW)*/
+
+/* ----------------------------------------------------------------------- */
+
+/**
+Tier-1 coding (coding of code-block coefficients)
+*/
+typedef struct opj_t1 {
+  /** codec context */
+  opj_common_ptr cinfo;
+
+  /** MQC component */
+  opj_mqc_t *mqc;
+  /** RAW component */
+  opj_raw_t *raw;
+
+  int lut_ctxno_zc[1024];
+  int lut_ctxno_sc[256];
+  int lut_ctxno_mag[4096];
+  int lut_spb[256];
+  int lut_nmsedec_sig[1 << T1_NMSEDEC_BITS];
+  int lut_nmsedec_sig0[1 << T1_NMSEDEC_BITS];
+  int lut_nmsedec_ref[1 << T1_NMSEDEC_BITS];
+  int lut_nmsedec_ref0[1 << T1_NMSEDEC_BITS];
+
+  int data[T1_MAXCBLKH][T1_MAXCBLKW];
+  int flags[T1_MAXCBLKH + 2][T1_MAXCBLKH + 2];
+
+} opj_t1_t;
+
+/** @name Exported functions */
+/*@{*/
+/* ----------------------------------------------------------------------- */
+/**
+Create a new T1 handle 
+and initialize the look-up tables of the Tier-1 coder/decoder
+@return Returns a new T1 handle if successful, returns NULL otherwise
+@see t1_init_luts
+*/
+opj_t1_t* t1_create(opj_common_ptr cinfo);
+/**
+Destroy a previously created T1 handle
+@param t1 T1 handle to destroy
+*/
+void t1_destroy(opj_t1_t *t1);
+/**
+Encode the code-blocks of a tile
+@param t1 T1 handle
+@param tile The tile to encode
+@param tcp Tile coding parameters
+*/
+void t1_encode_cblks(opj_t1_t *t1, opj_tcd_tile_t *tile, opj_tcp_t *tcp);
+/**
+Decode the code-blocks of a tile
+@param t1 T1 handle
+@param tile The tile to decode
+@param tcp Tile coding parameters
+*/
+void t1_decode_cblks(opj_t1_t *t1, opj_tcd_tile_t *tile, opj_tcp_t *tcp);
+/* ----------------------------------------------------------------------- */
+/*@}*/
+
+/*@}*/
 
-#endif
+#endif /* __T1_H */