Compare commits
8 commits
| Author | SHA1 | Date | |
|---|---|---|---|
366827ca4a
|
|||
|
e970a0d892
|
|||
bbc538d5e8
|
|||
|
3242165d90
|
|||
|
1c41147b73
|
|||
|
0673dafb64
|
|||
|
ad3a1ad061
|
|||
|
008ccfa4a9
|
16 changed files with 696 additions and 1157 deletions
|
|
@ -92,7 +92,7 @@
|
||||||
\************************************************************************************************/
|
\************************************************************************************************/
|
||||||
uint64 bytes_used (bitstream const *const stream);
|
uint64 bytes_used (bitstream const *const stream);
|
||||||
//==========|==========================|======================|======|======|=====================
|
//==========|==========================|======================|======|======|=====================
|
||||||
bitstream* init_stream (uchar *const memory,
|
bitstream* init_bitstream (uchar *const memory,
|
||||||
uint32 const size,
|
uint32 const size,
|
||||||
char const instr);
|
char const instr);
|
||||||
//==========|==========================|======================|======|======|=====================
|
//==========|==========================|======================|======|======|=====================
|
||||||
|
|
@ -117,8 +117,10 @@
|
||||||
//==========|==========================|======================|======|======|=====================
|
//==========|==========================|======================|======|======|=====================
|
||||||
uchar get_bit (bitstream *const stream);
|
uchar get_bit (bitstream *const stream);
|
||||||
//==========|==========================|======================|======|======|=====================
|
//==========|==========================|======================|======|======|=====================
|
||||||
uchar terminate_stream (bitstream *stream,
|
uchar shrink_to_fit (bitstream *const stream);
|
||||||
bwc_stream *const packed_stream);
|
|
||||||
//==========|==========================|======================|======|======|=====================
|
//==========|==========================|======================|======|======|=====================
|
||||||
void release_packed_stream (bwc_stream *const stream);
|
uchar transfer_to_span (bitstream *const stream,
|
||||||
|
bwc_span *const span);
|
||||||
|
//==========|==========================|======================|======|======|=====================
|
||||||
|
void release_packed_stream (bwc_span *const stream);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -89,16 +89,18 @@
|
||||||
|| | |__| |__] |___ | |___ | |__| | \| |___ | | |__| | \| ___] ||
|
|| | |__| |__] |___ | |___ | |__| | \| |___ | | |__| | \| ___] ||
|
||||||
|| ||
|
|| ||
|
||||||
\************************************************************************************************/
|
\************************************************************************************************/
|
||||||
uchar assemble_main_header (bwc_field *const field);
|
uchar assemble_main_header (bwc_codec *const field);
|
||||||
//==========|==========================|======================|======|======|=====================
|
//==========|==========================|======================|======|======|=====================
|
||||||
uchar codestream_write_aux (bwc_stream *const header,
|
uchar codestream_write_aux (bwc_span *const header,
|
||||||
bwc_stream *const aux);
|
bwc_span *const aux);
|
||||||
//==========|==========================|======================|======|======|=====================
|
//==========|==========================|======================|======|======|=====================
|
||||||
uchar codestream_write_com (bwc_stream *const header,
|
uchar codestream_write_com (bwc_span *const header,
|
||||||
bwc_stream *const com);
|
bwc_span *const com);
|
||||||
//==========|==========================|======================|======|======|=====================
|
//==========|==========================|======================|======|======|=====================
|
||||||
bwc_stream* assemble_codestream (bwc_field *const field);
|
size_t assemble_codestream (bwc_codec *const codec,
|
||||||
|
bwc_stream *const stream);
|
||||||
//==========|==========================|======================|======|======|=====================
|
//==========|==========================|======================|======|======|=====================
|
||||||
bwc_field* parse_codestream (bwc_data *const data,
|
bwc_codec* parse_codestream (bwc_codec *const codec,
|
||||||
|
bwc_stream *const stream,
|
||||||
uint8 const layer);
|
uint8 const layer);
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -114,8 +114,14 @@
|
||||||
\*----------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------*/
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
bwc_type_half,
|
bwc_precision_half = 2,
|
||||||
bwc_type_single,
|
bwc_precision_single = 4,
|
||||||
bwc_type_double,
|
bwc_precision_double = 8,
|
||||||
} bwc_type;
|
} bwc_precision;
|
||||||
|
|
||||||
|
typedef enum
|
||||||
|
{
|
||||||
|
comp,
|
||||||
|
decomp,
|
||||||
|
} bwc_mode;
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -157,13 +157,13 @@
|
||||||
\************************************************************************************************/
|
\************************************************************************************************/
|
||||||
uchar initialize_gain_lut ();
|
uchar initialize_gain_lut ();
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
bwc_float get_dwt_energy_gain (bwc_field *const field,
|
bwc_float get_dwt_energy_gain (bwc_codec *const field,
|
||||||
uchar const highband_flag,
|
uchar const highband_flag,
|
||||||
uint16 const level);
|
uint16 const level);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
uchar forward_wavelet_transform (bwc_field *const field,
|
uchar forward_wavelet_transform (bwc_codec *const field,
|
||||||
bwc_parameter *const parameter);
|
bwc_parameter *const parameter);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
uchar inverse_wavelet_transform (bwc_field *const field,
|
uchar inverse_wavelet_transform (bwc_codec *const field,
|
||||||
bwc_parameter *const parameter);
|
bwc_parameter *const parameter);
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -64,92 +64,98 @@
|
||||||
|| ||
|
|| ||
|
||||||
\************************************************************************************************/
|
\************************************************************************************************/
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
bwc_data* bwc_initialize_data (double *const field,
|
bwc_stream* bwc_init_stream (void *const inpbuf,
|
||||||
uint64 const nX,
|
void *const outbuf,
|
||||||
uint64 const nY,
|
bwc_mode const mode);
|
||||||
uint64 const nZ,
|
|
||||||
uint16 const nTS,
|
|
||||||
uint8 const nPar,
|
|
||||||
char *const file_extension);
|
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
uchar bwc_set_com (bwc_data *const data,
|
uchar bwc_set_com (bwc_stream *const stream,
|
||||||
char const *const com,
|
char const *const com,
|
||||||
uint16 const size);
|
uint16 const size);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
uchar bwc_set_aux (bwc_data *const data,
|
uchar bwc_set_aux (bwc_stream *const stream,
|
||||||
char const *const aux,
|
char const *const aux,
|
||||||
uint32 const size);
|
uint32 const size);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
void bwc_add_param (bwc_data *const data,
|
// TODO: remove
|
||||||
char *const name,
|
void bwc_free_data (bwc_stream *const data);
|
||||||
uint8 const precision);
|
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
void bwc_get_data (bwc_data *const data,
|
uchar create_field (bwc_codec *const codec);
|
||||||
uchar *const buffer,
|
|
||||||
uint64 const size);
|
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
void bwc_free_data (bwc_data *const data);
|
bwc_codec* configure_codec (bwc_codec *const codec,
|
||||||
|
uint64 const nX,
|
||||||
|
uint64 const nY,
|
||||||
|
uint64 const nZ,
|
||||||
|
uint64 const nTS,
|
||||||
|
uint8 const nPar,
|
||||||
|
bwc_precision const prec);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
uchar create_field (bwc_field *const field);
|
bwc_codec* bwc_alloc_coder (uint64 const nX,
|
||||||
|
uint64 const nY,
|
||||||
|
uint64 const nZ,
|
||||||
|
uint64 const nTS,
|
||||||
|
uint8 const nPar,
|
||||||
|
bwc_precision const prec);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
void bwc_kill_compression (bwc_field *const field);
|
bwc_codec* bwc_alloc_decoder ();
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
bwc_field* bwc_initialize_field (bwc_data *const data);
|
void bwc_free_codec (bwc_codec *const codec);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
void bwc_set_error_resilience (bwc_field *const field);
|
void bwc_set_error_resilience (bwc_codec *const field);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
void set_quant_style (bwc_field *const field,
|
void set_quant_style (bwc_codec *const field,
|
||||||
bwc_quant_st const quantization_style);
|
bwc_quant_st const quantization_style);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
void set_quant_step_size (bwc_field *const field,
|
void set_quant_step_size (bwc_codec *const field,
|
||||||
double const delta);
|
double const delta);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
void set_progression (bwc_field *const field,
|
void set_progression (bwc_codec *const field,
|
||||||
bwc_prog_ord const progression);
|
bwc_prog_ord const progression);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
void set_kernels (bwc_field *const field,
|
void set_kernels (bwc_codec *const field,
|
||||||
bwc_dwt_filter const KernelX,
|
bwc_dwt_filter const KernelX,
|
||||||
bwc_dwt_filter const KernelY,
|
bwc_dwt_filter const KernelY,
|
||||||
bwc_dwt_filter const KernelZ,
|
bwc_dwt_filter const KernelZ,
|
||||||
bwc_dwt_filter const KernelTS);
|
bwc_dwt_filter const KernelTS);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
void bwc_set_decomp (bwc_field *const field,
|
void bwc_set_decomp (bwc_codec *const field,
|
||||||
uint8 const decompX,
|
uint8 const decompX,
|
||||||
uint8 const decompY,
|
uint8 const decompY,
|
||||||
uint8 const decompZ,
|
uint8 const decompZ,
|
||||||
uint8 const decompTS);
|
uint8 const decompTS);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
void bwc_set_precincts (bwc_field *const field,
|
void bwc_set_precincts (bwc_codec *const field,
|
||||||
uint8 const pX,
|
uint8 const pX,
|
||||||
uint8 const pY,
|
uint8 const pY,
|
||||||
uint8 const pZ,
|
uint8 const pZ,
|
||||||
uint8 const pTS);
|
uint8 const pTS);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
void bwc_set_codeblocks (bwc_field *const field,
|
void bwc_set_codeblocks (bwc_codec *const field,
|
||||||
uint8 const cbX,
|
uint8 const cbX,
|
||||||
uint8 const cbY,
|
uint8 const cbY,
|
||||||
uint8 const cbZ,
|
uint8 const cbZ,
|
||||||
uint8 const cbTS);
|
uint8 const cbTS);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
void bwc_set_qm (bwc_field *const field,
|
void bwc_set_qm (bwc_codec *const field,
|
||||||
uint8 const Qm);
|
uint8 const Qm);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
void bwc_set_tiles (bwc_field *const field,
|
void bwc_set_tiles (bwc_codec *const field,
|
||||||
uint64 const tilesX,
|
uint64 const tilesX,
|
||||||
uint64 const tilesY,
|
uint64 const tilesY,
|
||||||
uint64 const tilesZ,
|
uint64 const tilesZ,
|
||||||
uint64 const tilesTS,
|
uint64 const tilesTS,
|
||||||
bwc_tile_instr const instr);
|
bwc_tile_instr const instr);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
uchar bwc_create_compression (bwc_field *const field,
|
uchar bwc_create_compression (bwc_codec *const codec,
|
||||||
|
bwc_stream *const data,
|
||||||
char *const rate_control);
|
char *const rate_control);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
uchar bwc_compress (bwc_field *const field,
|
size_t bwc_compress (bwc_codec *const field,
|
||||||
bwc_data *const data);
|
bwc_stream *const data);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
bwc_field* bwc_create_decompression (bwc_data *const data,
|
uchar bwc_create_decompression (bwc_codec *const codec,
|
||||||
|
bwc_stream *const stream,
|
||||||
uint8 const layer);
|
uint8 const layer);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
uchar bwc_decompress (bwc_field *const field,
|
uchar bwc_decompress (bwc_codec *const codec,
|
||||||
bwc_data *const data);
|
bwc_stream *const stream);
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
|| ------------ ||
|
|| ------------ ||
|
||||||
|| ||
|
|| ||
|
||||||
|| This file describes a set of functions that can be used to de-/encode bwc ||
|
|| This file describes a set of functions that can be used to de-/encode bwc ||
|
||||||
|| codeblocks described by the bwc_field structure according to the embedded block ||
|
|| codeblocks described by the bwc_codec structure according to the embedded block ||
|
||||||
|| coding paradigm described by the JPEG 2000 standard. For more information please ||
|
|| coding paradigm described by the JPEG 2000 standard. For more information please ||
|
||||||
|| refere to JPEG2000 by D. S. Taubman and M. W. Marcellin. ||
|
|| refere to JPEG2000 by D. S. Taubman and M. W. Marcellin. ||
|
||||||
|| ||
|
|| ||
|
||||||
|
|
@ -156,11 +156,11 @@
|
||||||
|| | |__| |__] |___ | |___ | |__| | \| |___ | | |__| | \| ___] ||
|
|| | |__| |__] |___ | |___ | |__| | \| |___ | | |__| | \| ___] ||
|
||||||
|| ||
|
|| ||
|
||||||
\************************************************************************************************/
|
\************************************************************************************************/
|
||||||
uchar t1_encode (bwc_field *const field,
|
uchar t1_encode (bwc_codec *const field,
|
||||||
bwc_tile *const tile,
|
bwc_tile *const tile,
|
||||||
bwc_parameter *const parameter);
|
bwc_parameter *const parameter);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
uchar t1_decode (bwc_field *const field,
|
uchar t1_decode (bwc_codec *const field,
|
||||||
bwc_tile *const tile,
|
bwc_tile *const tile,
|
||||||
bwc_parameter *const parameter);
|
bwc_parameter *const parameter);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
|| ------------ ||
|
|| ------------ ||
|
||||||
|| ||
|
|| ||
|
||||||
|| This file describes a set of functions that can be used to de-/encode bwc ||
|
|| This file describes a set of functions that can be used to de-/encode bwc ||
|
||||||
|| codeblocks described by the bwc_field structure according to the embedded block ||
|
|| codeblocks described by the bwc_codec structure according to the embedded block ||
|
||||||
|| coding paradigm described by the JPEG 2000 standard. For more information please ||
|
|| coding paradigm described by the JPEG 2000 standard. For more information please ||
|
||||||
|| refere to JPEG2000 by D. S. Taubman and M. W. Marcellin. ||
|
|| refere to JPEG2000 by D. S. Taubman and M. W. Marcellin. ||
|
||||||
|| ||
|
|| ||
|
||||||
|
|
@ -76,10 +76,10 @@
|
||||||
|| | |__| |__] |___ | |___ | |__| | \| |___ | | |__| | \| ___] ||
|
|| | |__| |__] |___ | |___ | |__| | \| |___ | | |__| | \| ___] ||
|
||||||
|| ||
|
|| ||
|
||||||
\************************************************************************************************/
|
\************************************************************************************************/
|
||||||
uchar t2_encode (bwc_field *const field,
|
uchar t2_encode (bwc_codec *const field,
|
||||||
bwc_tile *const tile);
|
bwc_tile *const tile);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
uchar parse_packet (bwc_field *const field,
|
uchar parse_packet (bwc_codec *const field,
|
||||||
bwc_tile *const tile,
|
bwc_tile *const tile,
|
||||||
bwc_packet *const packet,
|
bwc_packet *const packet,
|
||||||
uint64 const body_size);
|
uint64 const body_size);
|
||||||
|
|
|
||||||
|
|
@ -99,7 +99,7 @@
|
||||||
|
|
||||||
uchar *access; // Pointer used to parse packed stream.
|
uchar *access; // Pointer used to parse packed stream.
|
||||||
uchar *memory; // Memory handle for the packed stream.
|
uchar *memory; // Memory handle for the packed stream.
|
||||||
} bwc_stream;
|
} bwc_span;
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------*\
|
||||||
! !
|
! !
|
||||||
|
|
@ -138,29 +138,6 @@
|
||||||
bwc_tagtree_node *nodes; // Pointer to the tagtree nodes.
|
bwc_tagtree_node *nodes; // Pointer to the tagtree nodes.
|
||||||
} bwc_tagtree;
|
} bwc_tagtree;
|
||||||
|
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------*\
|
|
||||||
! !
|
|
||||||
! DESCRIPTION: !
|
|
||||||
! ------------ !
|
|
||||||
! !
|
|
||||||
! This structure defines a linked list which stores the size, index, and bit pre- !
|
|
||||||
! cision The string name is used to store the parameter name supplied by the !
|
|
||||||
! function caller. !
|
|
||||||
! !
|
|
||||||
\*----------------------------------------------------------------------------------------------*/
|
|
||||||
typedef struct opt
|
|
||||||
{
|
|
||||||
char name[24]; // Parameter name.
|
|
||||||
uint8 id; // Parameter index.
|
|
||||||
|
|
||||||
uint64 size; // Parameter size after sub-sampling.
|
|
||||||
uint8 precision; // Parameter precision.
|
|
||||||
|
|
||||||
struct opt *next; // Next element in linked-list.
|
|
||||||
struct opt *root; // Linked-list root.
|
|
||||||
} bwc_cmd_opts_ll;
|
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------*\
|
||||||
! !
|
! !
|
||||||
! DESCRIPTION: !
|
! DESCRIPTION: !
|
||||||
|
|
@ -178,12 +155,8 @@
|
||||||
|
|
||||||
uint8 nPar; // Number of parameters.
|
uint8 nPar; // Number of parameters.
|
||||||
|
|
||||||
uint8 precision; // Flag defining codec precision.
|
bwc_precision data_prec; // Data type of uncompressed field data.
|
||||||
|
bwc_precision codec_prec; // Encoder/decoder bit precision.
|
||||||
uint8 codec_prec; // Encoder/decoder bit precision.
|
|
||||||
char f_ext[20]; // Uncompressed data set file extension.
|
|
||||||
|
|
||||||
bwc_cmd_opts_ll *parameter; // Command options linked-list.
|
|
||||||
} bwc_gl_inf;
|
} bwc_gl_inf;
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------*\
|
||||||
|
|
@ -197,22 +170,17 @@
|
||||||
\*----------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------*/
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
bwc_gl_inf info; // Gloabal info structure.
|
|
||||||
FILE *fp; // File point to (un)compr. data-set.
|
|
||||||
|
|
||||||
struct codestream
|
struct codestream
|
||||||
{
|
{
|
||||||
bwc_stream *data; // Data codestream block.
|
bwc_span *aux; // Auxiliary info. codestream block.
|
||||||
bwc_stream *aux; // Auxiliary info. codestream block.
|
bwc_span *com; // Comment codestream block.
|
||||||
bwc_stream *com; // Comment codestream block.
|
|
||||||
}codestream;
|
}codestream;
|
||||||
|
|
||||||
struct field
|
void *inp; // User managed buffer for input
|
||||||
{
|
void *out; // User managed buffer for output
|
||||||
double *d; // Double precision numerical data-set.
|
|
||||||
float *f; // Single precision numerical data-set.
|
bwc_mode mode; // Flag to signal (de-)compression
|
||||||
}field;
|
} bwc_stream;
|
||||||
} bwc_data;
|
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------*\
|
||||||
! !
|
! !
|
||||||
|
|
@ -420,8 +388,8 @@
|
||||||
\*----------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------*/
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
bwc_stream header; // Packed stream header.
|
bwc_span header; // Packed stream header.
|
||||||
bwc_stream body; // Packed stream body.
|
bwc_span body; // Packed stream body.
|
||||||
uint8 e; // Indicator for packet cb. contributions.
|
uint8 e; // Indicator for packet cb. contributions.
|
||||||
|
|
||||||
uint32 size; // Codestream packet size.
|
uint32 size; // Codestream packet size.
|
||||||
|
|
@ -528,14 +496,9 @@
|
||||||
\*----------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------*/
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
uint64 size; // Parameter size.
|
|
||||||
char *name; // Parameter name.
|
|
||||||
|
|
||||||
uint64 X0, Y0, Z0, TS0; // Tile parameter starting point.
|
uint64 X0, Y0, Z0, TS0; // Tile parameter starting point.
|
||||||
uint64 X1, Y1, Z1, TS1; // Tile parameter end point.
|
uint64 X1, Y1, Z1, TS1; // Tile parameter end point.
|
||||||
|
|
||||||
uint8 precision; // Tile parameter precision.
|
|
||||||
|
|
||||||
bwc_float parameter_min; // Min. value of tile parameter.
|
bwc_float parameter_min; // Min. value of tile parameter.
|
||||||
bwc_float parameter_max; // Max. value of tile parameter.
|
bwc_float parameter_max; // Max. value of tile parameter.
|
||||||
} bwc_param_inf;
|
} bwc_param_inf;
|
||||||
|
|
@ -710,12 +673,11 @@
|
||||||
\*----------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------*/
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
bwc_gl_inf *info; // Gloabal info structure
|
bwc_gl_inf info; // Global info structure
|
||||||
bwc_gl_ctrl control; // Global control structure
|
bwc_gl_ctrl control; // Global control structure
|
||||||
|
|
||||||
bwc_tile *tile; // Structure defining bwc tile.
|
bwc_tile *tile; // Structure defining bwc tile.
|
||||||
|
|
||||||
bwc_stream *aux; // Auxiliary info. codestream block.
|
bwc_mode mode; // Flag to signal (de-)compression
|
||||||
bwc_stream *com; // Comment codestream block.
|
} bwc_codec;
|
||||||
} bwc_field;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -107,42 +107,6 @@ module bwc
|
||||||
CHARACTER(KIND=C_CHAR) :: file_extension(*)
|
CHARACTER(KIND=C_CHAR) :: file_extension(*)
|
||||||
end function initialize_data_f
|
end function initialize_data_f
|
||||||
!*============================================================================================*!
|
!*============================================================================================*!
|
||||||
subroutine add_param_f(data, name, sample, dim, precision) &
|
|
||||||
BIND(C, NAME="bwc_add_param")
|
|
||||||
IMPORT
|
|
||||||
!*-----------------------*!
|
|
||||||
! DEFINE POINTERS: !
|
|
||||||
!*-----------------------*!
|
|
||||||
TYPE(C_PTR), VALUE :: data
|
|
||||||
|
|
||||||
!*-----------------------*!
|
|
||||||
! DEFINE INT VARIABLES: !
|
|
||||||
!*-----------------------*!
|
|
||||||
INTEGER(KIND=C_INT16_T), VALUE :: sample
|
|
||||||
INTEGER(KIND=C_INT8_T), VALUE :: precision
|
|
||||||
INTEGER(KIND=C_SIGNED_CHAR), VALUE :: dim
|
|
||||||
|
|
||||||
!*-----------------------*!
|
|
||||||
! DEFINE CHAR VARIABLES: !
|
|
||||||
!*-----------------------*!
|
|
||||||
CHARACTER(KIND=C_CHAR) :: name(*)
|
|
||||||
end subroutine add_param_f
|
|
||||||
!*============================================================================================*!
|
|
||||||
subroutine get_data_f(data, buffer, size) &
|
|
||||||
BIND(C, NAME="bwc_get_data")
|
|
||||||
IMPORT
|
|
||||||
!*-----------------------*!
|
|
||||||
! DEFINE POINTERS: !
|
|
||||||
!*-----------------------*!
|
|
||||||
TYPE(C_PTR), VALUE :: data
|
|
||||||
TYPE(C_PTR), VALUE :: buffer
|
|
||||||
|
|
||||||
!*-----------------------*!
|
|
||||||
! DEFINE INT VARIABLES: !
|
|
||||||
!*-----------------------*!
|
|
||||||
INTEGER(KIND=C_INT64_T), Value :: size
|
|
||||||
end subroutine get_data_f
|
|
||||||
!*============================================================================================*!
|
|
||||||
subroutine free_data_f(data) &
|
subroutine free_data_f(data) &
|
||||||
BIND(C, NAME="bwc_free_data")
|
BIND(C, NAME="bwc_free_data")
|
||||||
IMPORT
|
IMPORT
|
||||||
|
|
@ -396,11 +360,9 @@ module bwc
|
||||||
bwc_tile_numbof
|
bwc_tile_numbof
|
||||||
|
|
||||||
public :: bwc_initialize_data, &
|
public :: bwc_initialize_data, &
|
||||||
bwc_get_data, &
|
|
||||||
bwc_free_data
|
bwc_free_data
|
||||||
|
|
||||||
public :: bwc_initialize_field, &
|
public :: bwc_initialize_field, &
|
||||||
bwc_add_param, &
|
|
||||||
bwc_kill_compression
|
bwc_kill_compression
|
||||||
|
|
||||||
public :: bwc_set_error_resilience, &
|
public :: bwc_set_error_resilience, &
|
||||||
|
|
|
||||||
|
|
@ -97,29 +97,11 @@ def initialize_data(data, nX, nY, nZ, nTS, nPar, file_extension):
|
||||||
ctypes.c_uint64,
|
ctypes.c_uint64,
|
||||||
ctypes.c_uint64,
|
ctypes.c_uint64,
|
||||||
ctypes.c_uint64,
|
ctypes.c_uint64,
|
||||||
ctypes.c_uint16,
|
ctypes.c_uint64,
|
||||||
ctypes.c_uint8,
|
ctypes.c_uint8,
|
||||||
ctypes.c_char_p]
|
ctypes.c_char_p]
|
||||||
return ctypes.c_void_p(fun(data, nX, nY, nZ, nTS, nPar, file_extension.encode('utf-8')))
|
return ctypes.c_void_p(fun(data, nX, nY, nZ, nTS, nPar, file_extension.encode('utf-8')))
|
||||||
#==================================================================================================#
|
#==================================================================================================#
|
||||||
def get_data(data, buffer, size):
|
|
||||||
fun = libbwc.bwc_get_data
|
|
||||||
fun.restype = None
|
|
||||||
fun.argtypes = [ctypes.c_void_p,
|
|
||||||
ndpointer(ctypes.c_double, flags="C_CONTIGUOUS"),
|
|
||||||
ctypes.c_uint64]
|
|
||||||
fun(data, buffer, size)
|
|
||||||
#==================================================================================================#
|
|
||||||
def add_param(data, name, sample, dim, precision):
|
|
||||||
fun = libbwc.bwc_add_param
|
|
||||||
fun.restype = None
|
|
||||||
fun.argtypes = [ctypes.c_void_p,
|
|
||||||
ctypes.c_char_p,
|
|
||||||
ctypes.c_uint16,
|
|
||||||
ctypes.c_uint8,
|
|
||||||
ctypes.c_uint8]
|
|
||||||
fun(data, name.encode('utf-8'), sample, dim, precision)
|
|
||||||
#==================================================================================================#
|
|
||||||
def kill_compression(field):
|
def kill_compression(field):
|
||||||
fun = libbwc.bwc_kill_compression
|
fun = libbwc.bwc_kill_compression
|
||||||
fun.restype = None
|
fun.restype = None
|
||||||
|
|
|
||||||
|
|
@ -107,8 +107,6 @@ bytes_used(bitstream const *const stream)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
! FUNCTION NAME: bitstream* bwc_init_stream(uchar* memory, uint32 size, char instr) !
|
|
||||||
! -------------- !
|
|
||||||
! !
|
! !
|
||||||
! DESCRIPTION: !
|
! DESCRIPTION: !
|
||||||
! ------------ !
|
! ------------ !
|
||||||
|
|
@ -145,7 +143,7 @@ bytes_used(bitstream const *const stream)
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
bitstream*
|
bitstream*
|
||||||
init_stream(uchar* memory, uint32 size, char instr)
|
init_bitstream(uchar* memory, uint32 size, char instr)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE STRUCTS: !
|
! DEFINE STRUCTS: !
|
||||||
|
|
@ -155,6 +153,7 @@ init_stream(uchar* memory, uint32 size, char instr)
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE ASSERTIONS: !
|
! DEFINE ASSERTIONS: !
|
||||||
\*-----------------------*/
|
\*-----------------------*/
|
||||||
|
assert(memory);
|
||||||
assert(instr == 'c' || instr == 'd');
|
assert(instr == 'c' || instr == 'd');
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
|
|
@ -168,37 +167,11 @@ init_stream(uchar* memory, uint32 size, char instr)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
|
||||||
! Evaluate if a valid memory handle has been passed by the !
|
|
||||||
! function caller. !
|
|
||||||
\*--------------------------------------------------------*/
|
|
||||||
if(!memory)
|
|
||||||
{
|
|
||||||
/*--------------------------------------------------------*\
|
|
||||||
! If no valid memory handle has been passed, allocate a !
|
|
||||||
! memory block with the specifiec stream size. !
|
|
||||||
\*--------------------------------------------------------*/
|
|
||||||
stream->memory = calloc(size, sizeof(uchar));
|
|
||||||
if(!stream->memory)
|
|
||||||
{
|
|
||||||
// memory allocation error
|
|
||||||
fprintf(stderr, MEMERROR);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
/*--------------------------------------------------------*\
|
|
||||||
! If a valid memory handle has been passed for decoding, !
|
|
||||||
! save the memory handle in the bwc stream structure. !
|
|
||||||
\*--------------------------------------------------------*/
|
|
||||||
stream->memory = memory;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! Initialize the byte buffer counter, stream size and size !
|
! Initialize the byte buffer counter, stream size and size !
|
||||||
! increment for the current stream. !
|
! increment for the current stream. !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
|
stream->memory = memory;
|
||||||
stream->t = (instr == 'c') ? 8 : 0;
|
stream->t = (instr == 'c') ? 8 : 0;
|
||||||
stream->Lmax = size;
|
stream->Lmax = size;
|
||||||
stream->size_incr = (uint64)(size / 2);
|
stream->size_incr = (uint64)(size / 2);
|
||||||
|
|
@ -247,11 +220,6 @@ init_stream(uchar* memory, uint32 size, char instr)
|
||||||
void
|
void
|
||||||
emit_chunck(bitstream *const stream, const uchar* chunck, const uint64 size)
|
emit_chunck(bitstream *const stream, const uchar* chunck, const uint64 size)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
|
||||||
! DEFINE INT VARIABLES: !
|
|
||||||
\*-----------------------*/
|
|
||||||
uint64 Lreq;
|
|
||||||
|
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE ASSERTIONS: !
|
! DEFINE ASSERTIONS: !
|
||||||
\*-----------------------*/
|
\*-----------------------*/
|
||||||
|
|
@ -259,54 +227,30 @@ emit_chunck(bitstream *const stream, const uchar* chunck, const uint64 size)
|
||||||
assert(chunck);
|
assert(chunck);
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! Evaluate the memory block size if the current chunck of !
|
! Check if an error was encountered in a previous writing !
|
||||||
! data is written to the stream. !
|
! operation !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
Lreq = (bytes_used(stream) + size);
|
if(!stream->error)
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
|
||||||
! Check if the enough memory has been allocated for the !
|
|
||||||
! stream to store the additional data chunck. !
|
|
||||||
\*--------------------------------------------------------*/
|
|
||||||
if(Lreq > stream->Lmax)
|
|
||||||
{
|
{
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! If the stream is not large enough, check if this is due !
|
! Check if the enough memory has been allocated for the !
|
||||||
! to an error encountered in a previous writing operation !
|
! stream to store the additional symbol. !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
if(!stream->error)
|
if((bytes_used(stream) + size) > stream->Lmax)
|
||||||
{
|
{
|
||||||
/*--------------------------------------------------------*\
|
// memory allocation error
|
||||||
! If the error flag is not set, increase the stream size !
|
stream->error |= 1;
|
||||||
! until it is large enough to store the additional data !
|
stream->Lmax = 0;
|
||||||
! chunck. !
|
|
||||||
\*--------------------------------------------------------*/
|
|
||||||
while(Lreq > stream->Lmax)
|
|
||||||
{
|
|
||||||
stream->Lmax += stream->size_incr + size;
|
|
||||||
stream->size_incr = (uint64)(stream->Lmax / 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
|
||||||
! Reallocate the stream data block. !
|
|
||||||
\*--------------------------------------------------------*/
|
|
||||||
stream->memory = realloc(stream->memory, stream->Lmax);
|
|
||||||
if(!stream->memory)
|
|
||||||
{
|
|
||||||
// memory allocation error
|
|
||||||
stream->error |= 1;
|
|
||||||
stream->Lmax = 0;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
/*--------------------------------------------------------*\
|
|
||||||
! Exit to function caller if error flag has been set. !
|
|
||||||
\*--------------------------------------------------------*/
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/*--------------------------------------------------------*\
|
||||||
|
! Exit to function caller if error flag has been set. !
|
||||||
|
\*--------------------------------------------------------*/
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! Copy the additional data to the stream memory block. !
|
! Copy the additional data to the stream memory block. !
|
||||||
|
|
@ -370,44 +314,30 @@ emit_symbol(bitstream *const stream, const uint64 symbol, const uint8 size)
|
||||||
assert(stream);
|
assert(stream);
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! Check if the enough memory has been allocated for the !
|
! Check if an error was encountered in a previous writing !
|
||||||
! stream to store the additional symbol. !
|
! operation !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
if((bytes_used(stream) + size) > stream->Lmax)
|
if(!stream->error)
|
||||||
{
|
{
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! If the stream is not large enough, check if this is due !
|
! Check if the enough memory has been allocated for the !
|
||||||
! to an error encountered in a previous writing operation !
|
! stream to store the additional symbol. !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
if(!stream->error)
|
if((bytes_used(stream) + size) > stream->Lmax)
|
||||||
{
|
{
|
||||||
/*--------------------------------------------------------*\
|
// memory allocation error
|
||||||
! If the error flag is not set, increment the stream size !
|
stream->error |= 1;
|
||||||
! to store the additional symbol. !
|
stream->Lmax = 0;
|
||||||
\*--------------------------------------------------------*/
|
|
||||||
stream->Lmax += stream->size_incr;
|
|
||||||
stream->size_incr = (uint64)(stream->Lmax / 2);
|
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
|
||||||
! Reallocate the stream data block. !
|
|
||||||
\*--------------------------------------------------------*/
|
|
||||||
stream->memory = realloc(stream->memory, stream->Lmax);
|
|
||||||
if(!stream->memory)
|
|
||||||
{
|
|
||||||
// memory allocation error
|
|
||||||
stream->error |= 1;
|
|
||||||
stream->Lmax = 0;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
/*--------------------------------------------------------*\
|
|
||||||
! Exit to function caller if error flag has been set. !
|
|
||||||
\*--------------------------------------------------------*/
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/*--------------------------------------------------------*\
|
||||||
|
! Exit to function caller if error flag has been set. !
|
||||||
|
\*--------------------------------------------------------*/
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! Copy the additional symbol to the stream memory block !
|
! Copy the additional symbol to the stream memory block !
|
||||||
|
|
@ -868,76 +798,79 @@ flush_stream(bitstream *const stream)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
! FUNCTION NAME: void *test(void) !
|
|
||||||
! -------------- !
|
|
||||||
! !
|
|
||||||
! DESCRIPTION: !
|
! DESCRIPTION: !
|
||||||
! ------------ !
|
! ------------ !
|
||||||
! DESCRIPTION NEEDED !
|
! Shrinks the bitstream memory to the actually filled range. !
|
||||||
! !
|
|
||||||
! PARAMETERS: !
|
|
||||||
! ----------- !
|
|
||||||
! Variable Type Description !
|
|
||||||
! -------- ---- ----------- !
|
|
||||||
! - - - !
|
|
||||||
! !
|
! !
|
||||||
! RETURN VALUE: !
|
! RETURN VALUE: !
|
||||||
! ------------- !
|
! ------------- !
|
||||||
! Type Description !
|
! Returns 0 if successfull and 1 if memory could not be resized. !
|
||||||
! ---- ----------- !
|
|
||||||
! - - !
|
|
||||||
! !
|
|
||||||
! DEVELOPMENT HISTORY: !
|
|
||||||
! -------------------- !
|
|
||||||
! !
|
|
||||||
! Date Author Change Id Release Description Of Change !
|
|
||||||
! ---- ------ --------- ------- --------------------- !
|
|
||||||
! - Patrick Vogler B87D120 V 0.1.0 function created !
|
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
uchar
|
uchar
|
||||||
terminate_stream(bitstream *stream, bwc_stream *const packed_stream)
|
shrink_to_fit(bitstream *const stream)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE ASSERTIONS: !
|
! DEFINE ASSERTIONS: !
|
||||||
\*-----------------------*/
|
\*-----------------------*/
|
||||||
assert(stream);
|
assert(stream);
|
||||||
|
|
||||||
if(packed_stream)
|
if(stream->error)
|
||||||
{
|
{
|
||||||
if(stream->error)
|
return 1;
|
||||||
|
}
|
||||||
|
else if(stream->L > stream->Lmax)
|
||||||
|
{
|
||||||
|
stream->Lmax = stream->L;
|
||||||
|
stream->memory = realloc(stream->memory, stream->Lmax);
|
||||||
|
if(!stream->memory)
|
||||||
{
|
{
|
||||||
|
// memory allocation error
|
||||||
|
fprintf(stderr, MEMERROR);
|
||||||
|
stream->Lmax = 0;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
else if(stream->L != stream->Lmax)
|
|
||||||
{
|
|
||||||
stream->Lmax = stream->L;
|
|
||||||
stream->memory = realloc(stream->memory, stream->Lmax);
|
|
||||||
if(!stream->memory)
|
|
||||||
{
|
|
||||||
// memory allocation error
|
|
||||||
fprintf(stderr, MEMERROR);
|
|
||||||
stream->Lmax = 0;
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
packed_stream->memory = stream->memory;
|
|
||||||
packed_stream->access = stream->memory;
|
|
||||||
packed_stream->size = stream->L;
|
|
||||||
packed_stream->position = 0;
|
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
free(stream->memory);
|
|
||||||
}
|
|
||||||
|
|
||||||
free(stream);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
! FUNCTION NAME: void release_packed_stream(bwc_stream *stream) !
|
! DESCRIPTION: !
|
||||||
|
! ------------ !
|
||||||
|
! Swap memory pointer and size to span. Invalidates stream pointers. !
|
||||||
|
! !
|
||||||
|
! RETURN VALUE: !
|
||||||
|
! ------------- !
|
||||||
|
! Returns 0 if successfull and 1 if stream had previous memory error. !
|
||||||
|
! !
|
||||||
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
|
uchar
|
||||||
|
transfer_to_span(bitstream *const stream, bwc_span *const span)
|
||||||
|
{
|
||||||
|
/*-----------------------*\
|
||||||
|
! DEFINE ASSERTIONS: !
|
||||||
|
\*-----------------------*/
|
||||||
|
assert(stream);
|
||||||
|
assert(span);
|
||||||
|
|
||||||
|
if(stream->error)
|
||||||
|
{
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
span->memory = stream->memory;
|
||||||
|
span->access = stream->memory;
|
||||||
|
span->size = stream->L;
|
||||||
|
span->position = 0;
|
||||||
|
|
||||||
|
stream->memory = NULL;
|
||||||
|
stream->L = 0;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
|
! FUNCTION NAME: void release_packed_stream(bwc_span *stream) !
|
||||||
! -------------- !
|
! -------------- !
|
||||||
! !
|
! !
|
||||||
! DESCRIPTION: !
|
! DESCRIPTION: !
|
||||||
|
|
@ -949,7 +882,7 @@ terminate_stream(bitstream *stream, bwc_stream *const packed_stream)
|
||||||
! ----------- !
|
! ----------- !
|
||||||
! Variable Type Description !
|
! Variable Type Description !
|
||||||
! -------- ---- ----------- !
|
! -------- ---- ----------- !
|
||||||
! stream bwc_stream - Packed bitstream used to store parts of !
|
! stream bwc_span - Packed bitstream used to store parts of !
|
||||||
! the bwc codestream. !
|
! the bwc codestream. !
|
||||||
! !
|
! !
|
||||||
! RETURN VALUE: !
|
! RETURN VALUE: !
|
||||||
|
|
@ -967,7 +900,7 @@ terminate_stream(bitstream *stream, bwc_stream *const packed_stream)
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
void
|
void
|
||||||
release_packed_stream(bwc_stream *stream)
|
release_packed_stream(bwc_span *stream)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE ASSERTIONS: !
|
! DEFINE ASSERTIONS: !
|
||||||
|
|
|
||||||
|
|
@ -104,7 +104,7 @@ can_read(bitstream *const stream, const uint64 length)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
! FUNCTION NAME: void codestream_write_header(bitstream *const stream, bwc_field *const field) !
|
! FUNCTION NAME: void codestream_write_header(bitstream *const stream, bwc_codec *const field) !
|
||||||
! -------------- !
|
! -------------- !
|
||||||
! !
|
! !
|
||||||
! DESCRIPTION: !
|
! DESCRIPTION: !
|
||||||
|
|
@ -116,7 +116,7 @@ can_read(bitstream *const stream, const uint64 length)
|
||||||
! ----------- !
|
! ----------- !
|
||||||
! Variable Type Description !
|
! Variable Type Description !
|
||||||
! -------- ---- ----------- !
|
! -------- ---- ----------- !
|
||||||
! field bwc_field* - Structure defining the compression/ !
|
! field bwc_codec* - Structure defining the compression/ !
|
||||||
! decompression stage. !
|
! decompression stage. !
|
||||||
! !
|
! !
|
||||||
! stream bitstream* - Structure used to assemble a bwc bit- !
|
! stream bitstream* - Structure used to assemble a bwc bit- !
|
||||||
|
|
@ -138,7 +138,8 @@ can_read(bitstream *const stream, const uint64 length)
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
static void
|
static void
|
||||||
codestream_write_header(bitstream *const stream,
|
codestream_write_header(bitstream *const stream,
|
||||||
bwc_field *const field)
|
bwc_codec *const field,
|
||||||
|
bwc_stream *const data)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE INT VARIABLES: !
|
! DEFINE INT VARIABLES: !
|
||||||
|
|
@ -155,10 +156,8 @@ codestream_write_header(bitstream *const stream,
|
||||||
\*-----------------------*/
|
\*-----------------------*/
|
||||||
bwc_gl_ctrl *control;
|
bwc_gl_ctrl *control;
|
||||||
bwc_gl_inf *info;
|
bwc_gl_inf *info;
|
||||||
bwc_tile *tile;
|
bwc_span *aux;
|
||||||
bwc_parameter *parameter;
|
bwc_span *com;
|
||||||
bwc_stream *aux;
|
|
||||||
bwc_stream *com;
|
|
||||||
|
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE ASSERTIONS: !
|
! DEFINE ASSERTIONS: !
|
||||||
|
|
@ -171,17 +170,13 @@ codestream_write_header(bitstream *const stream,
|
||||||
! structure to temporary variables to make the code more !
|
! structure to temporary variables to make the code more !
|
||||||
! readable. !
|
! readable. !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
info = field->info;
|
info = &field->info;
|
||||||
control = &field->control;
|
control = &field->control;
|
||||||
|
|
||||||
tile = &field->tile[0];
|
aux = data->codestream.aux;
|
||||||
|
com = data->codestream.com;
|
||||||
|
|
||||||
parameter = &tile->parameter[0];
|
Linf = 31;
|
||||||
|
|
||||||
aux = field->aux;
|
|
||||||
com = field->com;
|
|
||||||
|
|
||||||
Linf = 40 + info->nPar * 25;
|
|
||||||
Lctr = 50 + control->nLayers * 4;
|
Lctr = 50 + control->nLayers * 4;
|
||||||
Leoh = info->nPar * control->nTiles * 2 * PREC_BYTE;
|
Leoh = info->nPar * control->nTiles * 2 * PREC_BYTE;
|
||||||
Lcss = control->codestreamSize;
|
Lcss = control->codestreamSize;
|
||||||
|
|
@ -193,16 +188,10 @@ codestream_write_header(bitstream *const stream,
|
||||||
emit_symbol(stream, info->nX, 8);
|
emit_symbol(stream, info->nX, 8);
|
||||||
emit_symbol(stream, info->nY, 8);
|
emit_symbol(stream, info->nY, 8);
|
||||||
emit_symbol(stream, info->nZ, 8);
|
emit_symbol(stream, info->nZ, 8);
|
||||||
emit_symbol(stream, info->nTS, 2);
|
emit_symbol(stream, info->nTS, 8);
|
||||||
emit_symbol(stream, info->nPar, 1);
|
emit_symbol(stream, info->nPar, 1);
|
||||||
emit_symbol(stream, info->precision, 1);
|
emit_symbol(stream, (uint8)info->data_prec, 1);
|
||||||
emit_chunck(stream, (uchar*)info->f_ext, 10);
|
emit_symbol(stream, (uint8)info->codec_prec, 1);
|
||||||
|
|
||||||
for(p = 0; p < info->nPar; ++p)
|
|
||||||
{
|
|
||||||
emit_chunck(stream, (uchar*)parameter[p].info.name, 24);
|
|
||||||
emit_symbol(stream, parameter[p].info.precision, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
emit_symbol(stream, SGC, 2);
|
emit_symbol(stream, SGC, 2);
|
||||||
emit_symbol(stream, Lctr, 2);
|
emit_symbol(stream, Lctr, 2);
|
||||||
|
|
@ -239,7 +228,7 @@ codestream_write_header(bitstream *const stream,
|
||||||
emit_symbol(stream, control->tileSizeX, 8);
|
emit_symbol(stream, control->tileSizeX, 8);
|
||||||
emit_symbol(stream, control->tileSizeY, 8);
|
emit_symbol(stream, control->tileSizeY, 8);
|
||||||
emit_symbol(stream, control->tileSizeZ, 8);
|
emit_symbol(stream, control->tileSizeZ, 8);
|
||||||
emit_symbol(stream, control->tileSizeTS, 2);
|
emit_symbol(stream, control->tileSizeTS, 8);
|
||||||
|
|
||||||
emit_symbol(stream, control->nLayers, 1);
|
emit_symbol(stream, control->nLayers, 1);
|
||||||
|
|
||||||
|
|
@ -288,7 +277,7 @@ codestream_write_header(bitstream *const stream,
|
||||||
}
|
}
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
! FUNCTION NAME: uchar sequence_packets(bwc_field *const field, bwc_field *const field) !
|
! FUNCTION NAME: uchar sequence_packets(bwc_codec *const field, bwc_codec *const field) !
|
||||||
! -------------- !
|
! -------------- !
|
||||||
! !
|
! !
|
||||||
! DESCRIPTION: !
|
! DESCRIPTION: !
|
||||||
|
|
@ -299,7 +288,7 @@ codestream_write_header(bitstream *const stream,
|
||||||
! ----------- !
|
! ----------- !
|
||||||
! Variable Type Description !
|
! Variable Type Description !
|
||||||
! -------- ---- ----------- !
|
! -------- ---- ----------- !
|
||||||
! field bwc_field* - Structure defining the compression/ !
|
! field bwc_codec* - Structure defining the compression/ !
|
||||||
! decompression stage. !
|
! decompression stage. !
|
||||||
! !
|
! !
|
||||||
! tile bwc_tile* - Structure defining a bwc tile. !
|
! tile bwc_tile* - Structure defining a bwc tile. !
|
||||||
|
|
@ -319,7 +308,7 @@ codestream_write_header(bitstream *const stream,
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
static uchar
|
static uchar
|
||||||
sequence_packets(bwc_field *const field, bwc_tile *const tile)
|
sequence_packets(bwc_codec *const field, bwc_tile *const tile)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE INT VARIABLES: !
|
! DEFINE INT VARIABLES: !
|
||||||
|
|
@ -348,7 +337,7 @@ sequence_packets(bwc_field *const field, bwc_tile *const tile)
|
||||||
! code more readable. !
|
! code more readable. !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
control = &field->control;
|
control = &field->control;
|
||||||
info = field->info;
|
info = &field->info;
|
||||||
|
|
||||||
packet_sequence = tile->packet_sequence;
|
packet_sequence = tile->packet_sequence;
|
||||||
|
|
||||||
|
|
@ -490,7 +479,7 @@ sequence_packets(bwc_field *const field, bwc_tile *const tile)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
! FUNCTION NAME: uchar sequence_packets(bwc_field *const field, bwc_field *const field) !
|
! FUNCTION NAME: uchar sequence_packets(bwc_codec *const field, bwc_codec *const field) !
|
||||||
! -------------- !
|
! -------------- !
|
||||||
! !
|
! !
|
||||||
! DESCRIPTION: !
|
! DESCRIPTION: !
|
||||||
|
|
@ -501,7 +490,7 @@ sequence_packets(bwc_field *const field, bwc_tile *const tile)
|
||||||
! ----------- !
|
! ----------- !
|
||||||
! Variable Type Description !
|
! Variable Type Description !
|
||||||
! -------- ---- ----------- !
|
! -------- ---- ----------- !
|
||||||
! field bwc_field* - Structure defining the compression/ !
|
! field bwc_codec* - Structure defining the compression/ !
|
||||||
! decompression stage. !
|
! decompression stage. !
|
||||||
! !
|
! !
|
||||||
! tile bwc_tile* - Structure defining a bwc tile. !
|
! tile bwc_tile* - Structure defining a bwc tile. !
|
||||||
|
|
@ -521,7 +510,7 @@ sequence_packets(bwc_field *const field, bwc_tile *const tile)
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
static void
|
static void
|
||||||
assemble_tile(bwc_field *const field, bwc_tile *const tile, bitstream *const stream)
|
assemble_tile(bwc_codec *const field, bwc_tile *const tile, bitstream *const stream)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE INT VARIABLES: !
|
! DEFINE INT VARIABLES: !
|
||||||
|
|
@ -613,14 +602,14 @@ assemble_tile(bwc_field *const field, bwc_tile *const tile, bitstream *const str
|
||||||
! - Patrick Vogler B87D120 V 0.1.0 function created !
|
! - Patrick Vogler B87D120 V 0.1.0 function created !
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
bwc_field*
|
bwc_codec*
|
||||||
parse_main_header(bwc_data *const data,bitstream *const stream)
|
parse_main_header(bwc_codec *const codec, bwc_stream *const data, bitstream *const stream)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE INT VARIABLES: !
|
! DEFINE INT VARIABLES: !
|
||||||
\*-----------------------*/
|
\*-----------------------*/
|
||||||
uint64 buff_long, buffX, buffY, buffZ, buffTS;
|
uint64 buff_long, buffX, buffY, buffZ, buffTS;
|
||||||
uint64 nX, nY, nZ;
|
uint64 nX, nY, nZ, nTS;
|
||||||
uint32 buff;
|
uint32 buff;
|
||||||
uint32 bitrate;
|
uint32 bitrate;
|
||||||
uint32 Lsax;
|
uint32 Lsax;
|
||||||
|
|
@ -629,35 +618,34 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
uint16 CSsgc;
|
uint16 CSsgc;
|
||||||
uint16 Linf, Lctr, Lcom, Leoh, Lunk;
|
uint16 Linf, Lctr, Lcom, Leoh, Lunk;
|
||||||
uint16 marker;
|
uint16 marker;
|
||||||
uint16 nTS;
|
|
||||||
uint8 index, l;
|
uint8 index, l;
|
||||||
uint8 nPar, p;
|
uint8 nPar, p;
|
||||||
uint8 codec_prec, precision;
|
bwc_precision data_prec, codec_prec;
|
||||||
|
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE CHAR VARIABLES: !
|
! DEFINE CHAR VARIABLES: !
|
||||||
\*-----------------------*/
|
\*-----------------------*/
|
||||||
char* buffer_char;
|
|
||||||
char status;
|
char status;
|
||||||
|
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE STRUCTS: !
|
! DEFINE STRUCTS: !
|
||||||
\*-----------------------*/
|
\*-----------------------*/
|
||||||
bwc_field *field;
|
|
||||||
bwc_gl_ctrl *control;
|
bwc_gl_ctrl *control;
|
||||||
bwc_gl_inf *info;
|
bwc_gl_inf *info;
|
||||||
|
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE ASSERTIONS: !
|
! DEFINE ASSERTIONS: !
|
||||||
\*-----------------------*/
|
\*-----------------------*/
|
||||||
|
assert(codec);
|
||||||
assert(data);
|
assert(data);
|
||||||
assert(stream);
|
assert(stream);
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! Save the data info structure to a temporary variable to !
|
! Save the global control and info structure to temporary !
|
||||||
! make the code more readable. !
|
! variables to make the code more readable. !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
info = &data->info;
|
info = &codec->info;
|
||||||
|
control = &codec->control;
|
||||||
|
|
||||||
status = CODESTREAM_OK;
|
status = CODESTREAM_OK;
|
||||||
index = 0;
|
index = 0;
|
||||||
|
|
@ -708,41 +696,23 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
info->nX = nX = get_symbol(stream, 8);
|
nX = get_symbol(stream, 8);
|
||||||
info->nY = nY = get_symbol(stream, 8);
|
nY = get_symbol(stream, 8);
|
||||||
info->nZ = nZ = get_symbol(stream, 8);
|
nZ = get_symbol(stream, 8);
|
||||||
info->nTS = nTS = (uint16)get_symbol(stream, 2);
|
nTS = get_symbol(stream, 8);
|
||||||
info->nPar = nPar = (uint8)get_symbol(stream, 1);
|
nPar = (uint8)get_symbol(stream, 1);
|
||||||
info->precision = codec_prec = (uint8)get_symbol(stream, 1);
|
data_prec = (bwc_precision)get_symbol(stream, 1);
|
||||||
|
codec_prec = (bwc_precision)get_symbol(stream, 1);
|
||||||
|
|
||||||
buffer_char = (char*)get_chunck(stream, 10);
|
info->codec_prec = codec_prec;
|
||||||
strncpy(info->f_ext, buffer_char, sizeof(buffer_char)/sizeof(*buffer_char));
|
|
||||||
free(buffer_char);
|
|
||||||
|
|
||||||
for(p = 0; p < nPar; ++p)
|
configure_codec(codec, nX, nY, nZ, nTS, nPar, data_prec);
|
||||||
{
|
if(!codec)
|
||||||
buffer_char = (char*)get_chunck(stream, 24);
|
|
||||||
precision = (uint8)get_symbol(stream, 1);
|
|
||||||
|
|
||||||
bwc_add_param(data, buffer_char, precision);
|
|
||||||
|
|
||||||
free(buffer_char);
|
|
||||||
}
|
|
||||||
|
|
||||||
field = bwc_initialize_field(data);
|
|
||||||
if(!field)
|
|
||||||
{
|
{
|
||||||
status |= CODESTREAM_ERROR;
|
status |= CODESTREAM_ERROR;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
|
||||||
! Save the global control and info structure to temporary !
|
|
||||||
! variables to make the code more readable. !
|
|
||||||
\*--------------------------------------------------------*/
|
|
||||||
info = field->info = &data->info;
|
|
||||||
control = &field->control;
|
|
||||||
|
|
||||||
control->codestreamSize = stream->Lmax;
|
control->codestreamSize = stream->Lmax;
|
||||||
|
|
||||||
status |= CODESTREAM_SGI_READ;
|
status |= CODESTREAM_SGI_READ;
|
||||||
|
|
@ -755,7 +725,7 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
{
|
{
|
||||||
// Invalid Codestream
|
// Invalid Codestream
|
||||||
fprintf(stderr, CSERROR);
|
fprintf(stderr, CSERROR);
|
||||||
bwc_kill_compression(field);
|
bwc_free_codec(codec);
|
||||||
status |= CODESTREAM_ERROR;
|
status |= CODESTREAM_ERROR;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -766,7 +736,7 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
{
|
{
|
||||||
// Invalid Codestream
|
// Invalid Codestream
|
||||||
fprintf(stderr, CSERROR);
|
fprintf(stderr, CSERROR);
|
||||||
bwc_kill_compression(field);
|
bwc_free_codec(codec);
|
||||||
status |= CODESTREAM_ERROR;
|
status |= CODESTREAM_ERROR;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -777,14 +747,14 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
buff_long = get_symbol(stream, 1);
|
buff_long = get_symbol(stream, 1);
|
||||||
if(CSsgc & (0x01 << 0))
|
if(CSsgc & (0x01 << 0))
|
||||||
{
|
{
|
||||||
bwc_set_error_resilience(field);
|
bwc_set_error_resilience(codec);
|
||||||
}
|
}
|
||||||
|
|
||||||
buff_long = get_symbol(stream, 1);
|
buff_long = get_symbol(stream, 1);
|
||||||
|
|
||||||
if(CSsgc & (0x01 << 1))
|
if(CSsgc & (0x01 << 1))
|
||||||
{
|
{
|
||||||
set_quant_style(field, (bwc_quant_st)buff_long);
|
set_quant_style(codec, (bwc_quant_st)buff_long);
|
||||||
}
|
}
|
||||||
|
|
||||||
buff_long = get_symbol(stream, 1);
|
buff_long = get_symbol(stream, 1);
|
||||||
|
|
@ -800,50 +770,50 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
buff_long = get_symbol(stream, 1);
|
buff_long = get_symbol(stream, 1);
|
||||||
if(CSsgc & (0x01 << 3))
|
if(CSsgc & (0x01 << 3))
|
||||||
{
|
{
|
||||||
set_progression(field, (uint8)buff_long);
|
set_progression(codec, (uint8)buff_long);
|
||||||
}
|
}
|
||||||
|
|
||||||
buff_long = get_symbol(stream, 1);
|
buff_long = get_symbol(stream, 1);
|
||||||
if(CSsgc & (0x01 << 4))
|
if(CSsgc & (0x01 << 4))
|
||||||
{
|
{
|
||||||
set_kernels(field, (uint8)(0x03 & (buff_long >> 6)), (uint8)(0x03 & (buff_long >> 4)),
|
set_kernels(codec, (uint8)(0x03 & (buff_long >> 6)), (uint8)(0x03 & (buff_long >> 4)),
|
||||||
(uint8)(0x03 & (buff_long >> 2)), (uint8)(0x03 & buff_long));
|
(uint8)(0x03 & (buff_long >> 2)), (uint8)(0x03 & buff_long));
|
||||||
}
|
}
|
||||||
|
|
||||||
buff_long = get_symbol(stream, 4);
|
buff_long = get_symbol(stream, 4);
|
||||||
if(CSsgc & (0x01 << 5))
|
if(CSsgc & (0x01 << 5))
|
||||||
{
|
{
|
||||||
bwc_set_decomp(field, (uint8)(0xFF & (buff_long >> 24)), (uint8)(0xFF & (buff_long >> 16)),
|
bwc_set_decomp(codec, (uint8)(0xFF & (buff_long >> 24)), (uint8)(0xFF & (buff_long >> 16)),
|
||||||
(uint8)(0xFF & (buff_long >> 8)), (uint8)(0xFF & buff_long));
|
(uint8)(0xFF & (buff_long >> 8)), (uint8)(0xFF & buff_long));
|
||||||
}
|
}
|
||||||
|
|
||||||
buff_long = get_symbol(stream, 2);
|
buff_long = get_symbol(stream, 2);
|
||||||
if(CSsgc & (0x01 << 6))
|
if(CSsgc & (0x01 << 6))
|
||||||
{
|
{
|
||||||
bwc_set_precincts(field, (uint8)(0x0F & (buff_long >> 8)), (uint8)(0x0F & (buff_long >> 12)),
|
bwc_set_precincts(codec, (uint8)(0x0F & (buff_long >> 8)), (uint8)(0x0F & (buff_long >> 12)),
|
||||||
(uint8)(0x0F & buff_long), (uint8)(0x0F & (buff_long >> 4)));
|
(uint8)(0x0F & buff_long), (uint8)(0x0F & (buff_long >> 4)));
|
||||||
}
|
}
|
||||||
|
|
||||||
buff_long = get_symbol(stream, 4);
|
buff_long = get_symbol(stream, 4);
|
||||||
if(CSsgc & (0x01 << 7))
|
if(CSsgc & (0x01 << 7))
|
||||||
{
|
{
|
||||||
bwc_set_codeblocks(field, (uint8)(0xFF & (buff_long >> 24)), (uint8)(0xFF & (buff_long >> 16)),
|
bwc_set_codeblocks(codec, (uint8)(0xFF & (buff_long >> 24)), (uint8)(0xFF & (buff_long >> 16)),
|
||||||
(uint8)(0xFF & (buff_long >> 8)), (uint8)(0xFF & buff_long));
|
(uint8)(0xFF & (buff_long >> 8)), (uint8)(0xFF & buff_long));
|
||||||
}
|
}
|
||||||
|
|
||||||
buff_long = get_symbol(stream, 1);
|
buff_long = get_symbol(stream, 1);
|
||||||
if(CSsgc & (0x01 << 8))
|
if(CSsgc & (0x01 << 8))
|
||||||
{
|
{
|
||||||
bwc_set_qm(field, (uint8)buff_long);
|
bwc_set_qm(codec, (uint8)buff_long);
|
||||||
}
|
}
|
||||||
|
|
||||||
buffX = get_symbol(stream, 8);
|
buffX = get_symbol(stream, 8);
|
||||||
buffY = get_symbol(stream, 8);
|
buffY = get_symbol(stream, 8);
|
||||||
buffZ = get_symbol(stream, 8);
|
buffZ = get_symbol(stream, 8);
|
||||||
buffTS = get_symbol(stream, 2);
|
buffTS = get_symbol(stream, 8);
|
||||||
if(CSsgc & (0x01 << 9))
|
if(CSsgc & (0x01 << 9))
|
||||||
{
|
{
|
||||||
bwc_set_tiles(field, buffX, buffY, buffZ, (uint16)buffTS, bwc_tile_sizeof);
|
bwc_set_tiles(codec, buffX, buffY, buffZ, buffTS, bwc_tile_sizeof);
|
||||||
}
|
}
|
||||||
|
|
||||||
control->nLayers = get_symbol(stream, 1);
|
control->nLayers = get_symbol(stream, 1);
|
||||||
|
|
@ -852,7 +822,7 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
{
|
{
|
||||||
// memory allocation error
|
// memory allocation error
|
||||||
fprintf(stderr, MEMERROR);
|
fprintf(stderr, MEMERROR);
|
||||||
bwc_kill_compression(field);
|
bwc_free_codec(codec);
|
||||||
status|= CODESTREAM_ERROR;
|
status|= CODESTREAM_ERROR;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -863,10 +833,10 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
control->bitrate[l] = *(float *)&bitrate;
|
control->bitrate[l] = *(float *)&bitrate;
|
||||||
}
|
}
|
||||||
|
|
||||||
create_field(field);
|
create_field(codec);
|
||||||
if(!field)
|
if(!codec)
|
||||||
{
|
{
|
||||||
bwc_kill_compression(field);
|
bwc_free_codec(codec);
|
||||||
status |= CODESTREAM_ERROR;
|
status |= CODESTREAM_ERROR;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -881,7 +851,7 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
{
|
{
|
||||||
// Invalid Codestream
|
// Invalid Codestream
|
||||||
fprintf(stderr, CSERROR);
|
fprintf(stderr, CSERROR);
|
||||||
bwc_kill_compression(field);
|
bwc_free_codec(codec);
|
||||||
status |= CODESTREAM_ERROR;
|
status |= CODESTREAM_ERROR;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -891,17 +861,17 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
{
|
{
|
||||||
// Invalid Codestream
|
// Invalid Codestream
|
||||||
fprintf(stderr, CSERROR);
|
fprintf(stderr, CSERROR);
|
||||||
bwc_kill_compression(field);
|
bwc_free_codec(codec);
|
||||||
status |= CODESTREAM_ERROR;
|
status |= CODESTREAM_ERROR;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
data->codestream.aux = calloc(1, sizeof(bwc_stream));
|
data->codestream.aux = calloc(1, sizeof(bwc_span));
|
||||||
if(!data->codestream.aux)
|
if(!data->codestream.aux)
|
||||||
{
|
{
|
||||||
// memory allocation error
|
// memory allocation error
|
||||||
fprintf(stderr, MEMERROR);
|
fprintf(stderr, MEMERROR);
|
||||||
bwc_kill_compression(field);
|
bwc_free_codec(codec);
|
||||||
status |= CODESTREAM_ERROR;
|
status |= CODESTREAM_ERROR;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -919,7 +889,7 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
{
|
{
|
||||||
// Invalid Codestream
|
// Invalid Codestream
|
||||||
fprintf(stderr, CSERROR);
|
fprintf(stderr, CSERROR);
|
||||||
bwc_kill_compression(field);
|
bwc_free_codec(codec);
|
||||||
status |= CODESTREAM_ERROR;
|
status |= CODESTREAM_ERROR;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -929,17 +899,17 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
{
|
{
|
||||||
// Invalid Codestream
|
// Invalid Codestream
|
||||||
fprintf(stderr, CSERROR);
|
fprintf(stderr, CSERROR);
|
||||||
bwc_kill_compression(field);
|
bwc_free_codec(codec);
|
||||||
status |= CODESTREAM_ERROR;
|
status |= CODESTREAM_ERROR;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
data->codestream.com = calloc(1, sizeof(bwc_stream));
|
data->codestream.com = calloc(1, sizeof(bwc_span));
|
||||||
if(!data->codestream.com)
|
if(!data->codestream.com)
|
||||||
{
|
{
|
||||||
// memory allocation error
|
// memory allocation error
|
||||||
fprintf(stderr, MEMERROR);
|
fprintf(stderr, MEMERROR);
|
||||||
bwc_kill_compression(field);
|
bwc_free_codec(codec);
|
||||||
status |= CODESTREAM_ERROR;
|
status |= CODESTREAM_ERROR;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -959,7 +929,7 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
{
|
{
|
||||||
// Invalid Codestream
|
// Invalid Codestream
|
||||||
fprintf(stderr, CSERROR);
|
fprintf(stderr, CSERROR);
|
||||||
bwc_kill_compression(field);
|
bwc_free_codec(codec);
|
||||||
status |= CODESTREAM_ERROR;
|
status |= CODESTREAM_ERROR;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -969,12 +939,12 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
{
|
{
|
||||||
// Invalid Codestream
|
// Invalid Codestream
|
||||||
fprintf(stderr, CSERROR);
|
fprintf(stderr, CSERROR);
|
||||||
bwc_kill_compression(field);
|
bwc_free_codec(codec);
|
||||||
status |= CODESTREAM_ERROR;
|
status |= CODESTREAM_ERROR;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(codec_prec == 8)
|
if(codec_prec == bwc_precision_double)
|
||||||
{
|
{
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! Loop through all tile parameters and... !
|
! Loop through all tile parameters and... !
|
||||||
|
|
@ -988,14 +958,14 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
! header stream. !
|
! header stream. !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
buff_long = get_symbol(stream, sizeof(double));
|
buff_long = get_symbol(stream, sizeof(double));
|
||||||
field->tile[t].parameter[p].info.parameter_min = (bwc_float)*(double*)&buff_long;
|
codec->tile[t].parameter[p].info.parameter_min = (bwc_float)*(double*)&buff_long;
|
||||||
|
|
||||||
buff_long = get_symbol(stream, sizeof(double));
|
buff_long = get_symbol(stream, sizeof(double));
|
||||||
field->tile[t].parameter[p].info.parameter_max = (bwc_float)*(double*)&buff_long;
|
codec->tile[t].parameter[p].info.parameter_max = (bwc_float)*(double*)&buff_long;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(codec_prec == 4)
|
else if(codec_prec == bwc_precision_single)
|
||||||
{
|
{
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! Loop through all tile parameters and... !
|
! Loop through all tile parameters and... !
|
||||||
|
|
@ -1009,20 +979,20 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
! header stream. !
|
! header stream. !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
buff = get_symbol(stream, sizeof(float));
|
buff = get_symbol(stream, sizeof(float));
|
||||||
field->tile[t].parameter[p].info.parameter_min = (bwc_float)*(float*)&buff;
|
codec->tile[t].parameter[p].info.parameter_min = (bwc_float)*(float*)&buff;
|
||||||
|
|
||||||
buff = get_symbol(stream, sizeof(float));
|
buff = get_symbol(stream, sizeof(float));
|
||||||
field->tile[t].parameter[p].info.parameter_max = (bwc_float)*(float*)&buff;
|
codec->tile[t].parameter[p].info.parameter_max = (bwc_float)*(float*)&buff;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return field;
|
return codec;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Invalid Codestream
|
// Invalid Codestream
|
||||||
fprintf(stderr, CSERROR);
|
fprintf(stderr, CSERROR);
|
||||||
bwc_kill_compression(field);
|
bwc_free_codec(codec);
|
||||||
status |= CODESTREAM_ERROR;
|
status |= CODESTREAM_ERROR;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
@ -1034,7 +1004,7 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
{
|
{
|
||||||
// Invalid Codestream
|
// Invalid Codestream
|
||||||
fprintf(stderr, CSERROR);
|
fprintf(stderr, CSERROR);
|
||||||
bwc_kill_compression(field);
|
bwc_free_codec(codec);
|
||||||
status |= CODESTREAM_ERROR;
|
status |= CODESTREAM_ERROR;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -1044,7 +1014,7 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
{
|
{
|
||||||
// Invalid Codestream
|
// Invalid Codestream
|
||||||
fprintf(stderr, CSERROR);
|
fprintf(stderr, CSERROR);
|
||||||
bwc_kill_compression(field);
|
bwc_free_codec(codec);
|
||||||
status |= CODESTREAM_ERROR;
|
status |= CODESTREAM_ERROR;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -1059,7 +1029,7 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
! FUNCTION NAME: uchar sequence_packets(bwc_field *const field, bwc_field *const field) !
|
! FUNCTION NAME: uchar sequence_packets(bwc_codec *const field, bwc_codec *const field) !
|
||||||
! -------------- !
|
! -------------- !
|
||||||
! !
|
! !
|
||||||
! DESCRIPTION: !
|
! DESCRIPTION: !
|
||||||
|
|
@ -1070,7 +1040,7 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
! ----------- !
|
! ----------- !
|
||||||
! Variable Type Description !
|
! Variable Type Description !
|
||||||
! -------- ---- ----------- !
|
! -------- ---- ----------- !
|
||||||
! field bwc_field* - Structure defining the compression/ !
|
! field bwc_codec* - Structure defining the compression/ !
|
||||||
! decompression stage. !
|
! decompression stage. !
|
||||||
! !
|
! !
|
||||||
! tile bwc_tile* - Structure defining a bwc tile. !
|
! tile bwc_tile* - Structure defining a bwc tile. !
|
||||||
|
|
@ -1090,7 +1060,7 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
static uchar
|
static uchar
|
||||||
parse_tile(bwc_field *const field, bitstream *const stream)
|
parse_tile(bwc_codec *const field, bitstream *const stream)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE INT VARIABLES: !
|
! DEFINE INT VARIABLES: !
|
||||||
|
|
@ -1240,7 +1210,7 @@ parse_tile(bwc_field *const field, bitstream *const stream)
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
static uchar
|
static uchar
|
||||||
parse_body(bwc_field *const field, bitstream *const stream)
|
parse_body(bwc_codec *const field, bitstream *const stream)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE INT VARIABLES: !
|
! DEFINE INT VARIABLES: !
|
||||||
|
|
@ -1307,7 +1277,7 @@ parse_body(bwc_field *const field, bitstream *const stream)
|
||||||
{
|
{
|
||||||
// Invalid Codestream
|
// Invalid Codestream
|
||||||
fprintf(stderr, CSERROR);
|
fprintf(stderr, CSERROR);
|
||||||
bwc_kill_compression(field);
|
bwc_free_codec(field);
|
||||||
status |= CODESTREAM_ERROR;
|
status |= CODESTREAM_ERROR;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -1317,7 +1287,7 @@ parse_body(bwc_field *const field, bitstream *const stream)
|
||||||
{
|
{
|
||||||
// Invalid Codestream
|
// Invalid Codestream
|
||||||
fprintf(stderr, CSERROR);
|
fprintf(stderr, CSERROR);
|
||||||
bwc_kill_compression(field);
|
bwc_free_codec(field);
|
||||||
status |= CODESTREAM_ERROR;
|
status |= CODESTREAM_ERROR;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -1336,7 +1306,7 @@ parse_body(bwc_field *const field, bitstream *const stream)
|
||||||
|| ||
|
|| ||
|
||||||
\************************************************************************************************************/
|
\************************************************************************************************************/
|
||||||
/*----------------------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
! FUNCTION NAME: bwc_stream* assemble_codestream(bwc_field *const field) !
|
! FUNCTION NAME: bwc_span* assemble_codestream(bwc_codec *const field) !
|
||||||
! -------------- !
|
! -------------- !
|
||||||
! !
|
! !
|
||||||
! DESCRIPTION: !
|
! DESCRIPTION: !
|
||||||
|
|
@ -1347,14 +1317,14 @@ parse_body(bwc_field *const field, bitstream *const stream)
|
||||||
! ----------- !
|
! ----------- !
|
||||||
! Variable Type Description !
|
! Variable Type Description !
|
||||||
! -------- ---- ----------- !
|
! -------- ---- ----------- !
|
||||||
! field bwc_field* - Structure defining the compression/ !
|
! field bwc_codec* - Structure defining the compression/ !
|
||||||
! decompression stage. !
|
! decompression stage. !
|
||||||
! !
|
! !
|
||||||
! RETURN VALUE: !
|
! RETURN VALUE: !
|
||||||
! ------------- !
|
! ------------- !
|
||||||
! Type Description !
|
! Type Description !
|
||||||
! ---- ----------- !
|
! ---- ----------- !
|
||||||
! bwc_stream* - Packed stream containing the compressed data set. !
|
! bwc_span* - Packed stream containing the compressed data set. !
|
||||||
! !
|
! !
|
||||||
! DEVELOPMENT HISTORY: !
|
! DEVELOPMENT HISTORY: !
|
||||||
! -------------------- !
|
! -------------------- !
|
||||||
|
|
@ -1364,12 +1334,13 @@ parse_body(bwc_field *const field, bitstream *const stream)
|
||||||
! 13.06.2019 Patrick Vogler B87D120 V 0.1.0 function created !
|
! 13.06.2019 Patrick Vogler B87D120 V 0.1.0 function created !
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
bwc_stream*
|
size_t
|
||||||
assemble_codestream(bwc_field *const field)
|
assemble_codestream(bwc_codec *const field, bwc_stream *const data)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE INT VARIABLES: !
|
! DEFINE INT VARIABLES: !
|
||||||
\*-----------------------*/
|
\*-----------------------*/
|
||||||
|
size_t compressed_size;
|
||||||
uint64 i;
|
uint64 i;
|
||||||
|
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
|
|
@ -1378,12 +1349,12 @@ assemble_codestream(bwc_field *const field)
|
||||||
bwc_gl_ctrl *control;
|
bwc_gl_ctrl *control;
|
||||||
bwc_tile *tile;
|
bwc_tile *tile;
|
||||||
bitstream *stream;
|
bitstream *stream;
|
||||||
bwc_stream *packed_stream;
|
|
||||||
|
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE ASSERTIONS: !
|
! DEFINE ASSERTIONS: !
|
||||||
\*-----------------------*/
|
\*-----------------------*/
|
||||||
assert(field);
|
assert(field);
|
||||||
|
assert(data);
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! Save the global control and info structure to temporary !
|
! Save the global control and info structure to temporary !
|
||||||
|
|
@ -1413,7 +1384,7 @@ assemble_codestream(bwc_field *const field)
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
if(sequence_packets(field, tile))
|
if(sequence_packets(field, tile))
|
||||||
{
|
{
|
||||||
return NULL;
|
return 0;
|
||||||
}
|
}
|
||||||
control->codestreamSize += tile->control.header_size +
|
control->codestreamSize += tile->control.header_size +
|
||||||
tile->control.body_size;
|
tile->control.body_size;
|
||||||
|
|
@ -1423,8 +1394,8 @@ assemble_codestream(bwc_field *const field)
|
||||||
! Initialize the final codestream and emit the header !
|
! Initialize the final codestream and emit the header !
|
||||||
! bytes. !
|
! bytes. !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
stream = init_stream(NULL, control->codestreamSize, 'c');
|
stream = init_bitstream(data->out, control->codestreamSize, 'c');
|
||||||
codestream_write_header(stream, field);
|
codestream_write_header(stream, field, data);
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! Walk through the tile structure and assemble the packed !
|
! Walk through the tile structure and assemble the packed !
|
||||||
|
|
@ -1444,26 +1415,14 @@ assemble_codestream(bwc_field *const field)
|
||||||
|
|
||||||
emit_symbol(stream, EOC, 2);
|
emit_symbol(stream, EOC, 2);
|
||||||
|
|
||||||
packed_stream = calloc(1, sizeof(bwc_stream));
|
compressed_size = stream->L;
|
||||||
if(!packed_stream)
|
free(stream);
|
||||||
{
|
|
||||||
// memory allocation error
|
|
||||||
fprintf(stderr, MEMERROR);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(terminate_stream(stream, packed_stream))
|
return compressed_size;
|
||||||
{
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return packed_stream;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
! FUNCTION NAME: uchar parse_codestream(bwc_field *const field, bitstream *const stream) !
|
! FUNCTION NAME: uchar parse_codestream(bwc_codec *const field, bitstream *const stream) !
|
||||||
! -------------- !
|
! -------------- !
|
||||||
! !
|
! !
|
||||||
! DESCRIPTION: !
|
! DESCRIPTION: !
|
||||||
|
|
@ -1474,7 +1433,7 @@ assemble_codestream(bwc_field *const field)
|
||||||
! ----------- !
|
! ----------- !
|
||||||
! Variable Type Description !
|
! Variable Type Description !
|
||||||
! -------- ---- ----------- !
|
! -------- ---- ----------- !
|
||||||
! field bwc_field* - Structure defining the compression/ !
|
! field bwc_codec* - Structure defining the compression/ !
|
||||||
! decompression stage. !
|
! decompression stage. !
|
||||||
! !
|
! !
|
||||||
! stream bitstream* - Structure used to assemble a bwc bit- !
|
! stream bitstream* - Structure used to assemble a bwc bit- !
|
||||||
|
|
@ -1494,32 +1453,32 @@ assemble_codestream(bwc_field *const field)
|
||||||
! 05.08.2019 Patrick Vogler B87D120 V 0.1.0 function created !
|
! 05.08.2019 Patrick Vogler B87D120 V 0.1.0 function created !
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
bwc_field*
|
bwc_codec*
|
||||||
parse_codestream(bwc_data *const data, uint8 const layer)
|
parse_codestream(bwc_codec *const codec, bwc_stream *const data, uint8 const layer)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE STRUCTS: !
|
! DEFINE STRUCTS: !
|
||||||
\*-----------------------*/
|
\*-----------------------*/
|
||||||
bwc_field *field;
|
|
||||||
bitstream *stream;
|
bitstream *stream;
|
||||||
|
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE ASSERTIONS: !
|
! DEFINE ASSERTIONS: !
|
||||||
\*-----------------------*/
|
\*-----------------------*/
|
||||||
assert(data);
|
assert(data);
|
||||||
|
assert(codec);
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! Initialize a bitstream used to parse the packed code- !
|
! Initialize a bitstream used to parse the packed code- !
|
||||||
! stream. !
|
! stream. !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
stream = init_stream(data->codestream.data->memory, 10, 'd');
|
stream = init_bitstream(data->inp, 10, 'd');
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! Parse the main header and set up the field structure for !
|
! Parse the main header and set up the codec structure for !
|
||||||
! the current decompression run. !
|
! the current decompression run. !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
field = parse_main_header(data, stream);
|
parse_main_header(codec, data, stream);
|
||||||
if(!field)
|
if(!codec)
|
||||||
{
|
{
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
@ -1528,36 +1487,36 @@ parse_codestream(bwc_data *const data, uint8 const layer)
|
||||||
! Initialize the useLayer option to decompress the entire !
|
! Initialize the useLayer option to decompress the entire !
|
||||||
! codestream. !
|
! codestream. !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
field->control.useLayer = field->control.nLayers - 1;
|
codec->control.useLayer = codec->control.nLayers - 1;
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! Check if the layer index supplied by the function caller !
|
! Check if the layer index supplied by the function caller !
|
||||||
! is valid. !
|
! is valid. !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
if(layer < field->control.nLayers && layer > 0)
|
if(layer < codec->control.nLayers && layer > 0)
|
||||||
{
|
{
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! Amend the use layer variable in the global control struc-!
|
! Amend the use layer variable in the global control struc-!
|
||||||
! ture. !
|
! ture. !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
field->control.useLayer = layer;
|
codec->control.useLayer = layer;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! Parse the rest of the compressed codestream and load the !
|
! Parse the rest of the compressed codestream and load the !
|
||||||
! body into the field structure. !
|
! body into the codec structure. !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
if(parse_body(field, stream))
|
if(parse_body(codec, stream))
|
||||||
{
|
{
|
||||||
bwc_kill_compression(field);
|
bwc_free_codec(codec);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! Free the bitstream used to parse the codestream and re- !
|
! Free the bitstream used to parse the codestream and re- !
|
||||||
! turn the field structure to the function caller. !
|
! turn the codec structure to the function caller. !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
free(stream);
|
free(stream);
|
||||||
|
|
||||||
return field;
|
return codec;
|
||||||
}
|
}
|
||||||
|
|
@ -1421,7 +1421,7 @@ initialize_gain_lut()
|
||||||
}
|
}
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
! FUNCTION NAME: bwc_float get_dwt_energy_gain(bwc_field *const field, uchar highband_flag, uint16 level) !
|
! FUNCTION NAME: bwc_float get_dwt_energy_gain(bwc_codec *const field, uchar highband_flag, uint16 level) !
|
||||||
! -------------- !
|
! -------------- !
|
||||||
! !
|
! !
|
||||||
! DESCRIPTION: !
|
! DESCRIPTION: !
|
||||||
|
|
@ -1434,7 +1434,7 @@ initialize_gain_lut()
|
||||||
! ----------- !
|
! ----------- !
|
||||||
! Variable Type Description !
|
! Variable Type Description !
|
||||||
! -------- ---- ----------- !
|
! -------- ---- ----------- !
|
||||||
! field bwc_field* - Structure defining the compression/ !
|
! field bwc_codec* - Structure defining the compression/ !
|
||||||
! decompression stage. !
|
! decompression stage. !
|
||||||
! !
|
! !
|
||||||
! highband_flag uchar - Defines the subband for which Gb is !
|
! highband_flag uchar - Defines the subband for which Gb is !
|
||||||
|
|
@ -1459,7 +1459,7 @@ initialize_gain_lut()
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
bwc_float
|
bwc_float
|
||||||
get_dwt_energy_gain(bwc_field *const field, uchar highband_flag, uint16 level)
|
get_dwt_energy_gain(bwc_codec *const field, uchar highband_flag, uint16 level)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE INT VARIABLES: !
|
! DEFINE INT VARIABLES: !
|
||||||
|
|
@ -1576,7 +1576,7 @@ get_dwt_energy_gain(bwc_field *const field, uchar highband_flag, uint16 level)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
! FUNCTION NAME: uchar forward_discrete_wavelet_transform(bwc_field *const field, !
|
! FUNCTION NAME: uchar forward_discrete_wavelet_transform(bwc_codec *const field, !
|
||||||
! -------------- bwc_parameter *const parameter) !
|
! -------------- bwc_parameter *const parameter) !
|
||||||
! !
|
! !
|
||||||
! DESCRIPTION: !
|
! DESCRIPTION: !
|
||||||
|
|
@ -1594,7 +1594,7 @@ get_dwt_energy_gain(bwc_field *const field, uchar highband_flag, uint16 level)
|
||||||
! ----------- !
|
! ----------- !
|
||||||
! Variable Type Description !
|
! Variable Type Description !
|
||||||
! -------- ---- ----------- !
|
! -------- ---- ----------- !
|
||||||
! field bwc_field* - Structure defining the compression/ !
|
! field bwc_codec* - Structure defining the compression/ !
|
||||||
! decompression stage. !
|
! decompression stage. !
|
||||||
! !
|
! !
|
||||||
! parameter bwc_parameter* - Structure defining a bwc parameter. !
|
! parameter bwc_parameter* - Structure defining a bwc parameter. !
|
||||||
|
|
@ -1614,28 +1614,22 @@ get_dwt_energy_gain(bwc_field *const field, uchar highband_flag, uint16 level)
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
uchar
|
uchar
|
||||||
forward_wavelet_transform(bwc_field *const field, bwc_parameter *const parameter)
|
forward_wavelet_transform(bwc_codec *const field, bwc_parameter *const parameter)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE INT VARIABLES: !
|
! DEFINE INT VARIABLES: !
|
||||||
\*-----------------------*/
|
\*-----------------------*/
|
||||||
uint64 incr_X, incr_Y, incr_Z;
|
uint64 incr_X, incr_Y, incr_Z, incr_TS;
|
||||||
uint64 rX0, rY0, rZ0;
|
uint64 rX0, rY0, rZ0, rTS0;
|
||||||
uint64 rX1, rY1, rZ1;
|
uint64 rX1, rY1, rZ1, rTS1;
|
||||||
uint64 width, height, depth;
|
uint64 width, height, depth, dt;
|
||||||
uint64 x, y, z;
|
uint64 x, y, z, t;
|
||||||
|
|
||||||
int64 nThreads;
|
int64 nThreads;
|
||||||
int16 i;
|
int16 i;
|
||||||
|
|
||||||
uint32 buff_size;
|
uint32 buff_size;
|
||||||
|
|
||||||
uint16 incr_TS;
|
|
||||||
uint16 rTS0;
|
|
||||||
uint16 rTS1;
|
|
||||||
uint16 dt;
|
|
||||||
uint16 t;
|
|
||||||
|
|
||||||
uint8 id;
|
uint8 id;
|
||||||
uint8 filter_tapsX, filter_tapsY, filter_tapsZ;
|
uint8 filter_tapsX, filter_tapsY, filter_tapsZ;
|
||||||
uint8 filter_tapsTS;
|
uint8 filter_tapsTS;
|
||||||
|
|
@ -1777,8 +1771,8 @@ forward_wavelet_transform(bwc_field *const field, bwc_parameter *const parameter
|
||||||
rY1 = (uint64)parameter->resolution[control->nDecomp - level].info.Y1;
|
rY1 = (uint64)parameter->resolution[control->nDecomp - level].info.Y1;
|
||||||
rZ0 = (uint64)parameter->resolution[control->nDecomp - level].info.Z0;
|
rZ0 = (uint64)parameter->resolution[control->nDecomp - level].info.Z0;
|
||||||
rZ1 = (uint64)parameter->resolution[control->nDecomp - level].info.Z1;
|
rZ1 = (uint64)parameter->resolution[control->nDecomp - level].info.Z1;
|
||||||
rTS0 = (uint16)parameter->resolution[control->nDecomp - level].info.TS0;
|
rTS0 = (uint64)parameter->resolution[control->nDecomp - level].info.TS0;
|
||||||
rTS1 = (uint16)parameter->resolution[control->nDecomp - level].info.TS1;
|
rTS1 = (uint64)parameter->resolution[control->nDecomp - level].info.TS1;
|
||||||
|
|
||||||
if(level < control->decompX && (rX1 - rX0) > 1)
|
if(level < control->decompX && (rX1 - rX0) > 1)
|
||||||
{
|
{
|
||||||
|
|
@ -2117,7 +2111,7 @@ forward_wavelet_transform(bwc_field *const field, bwc_parameter *const parameter
|
||||||
}
|
}
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
! FUNCTION NAME: uchar inverse_discrete_wavelet_transform(bwc_field *const field, !
|
! FUNCTION NAME: uchar inverse_discrete_wavelet_transform(bwc_codec *const field, !
|
||||||
! -------------- bwc_parameter *const parameter) !
|
! -------------- bwc_parameter *const parameter) !
|
||||||
! !
|
! !
|
||||||
! DESCRIPTION: !
|
! DESCRIPTION: !
|
||||||
|
|
@ -2135,7 +2129,7 @@ forward_wavelet_transform(bwc_field *const field, bwc_parameter *const parameter
|
||||||
! ----------- !
|
! ----------- !
|
||||||
! Variable Type Description !
|
! Variable Type Description !
|
||||||
! -------- ---- ----------- !
|
! -------- ---- ----------- !
|
||||||
! field bwc_field* - Structure defining the compression/ !
|
! field bwc_codec* - Structure defining the compression/ !
|
||||||
! decompression stage. !
|
! decompression stage. !
|
||||||
! !
|
! !
|
||||||
! parameter bwc_parameter* - Structure defining a bwc parameter. !
|
! parameter bwc_parameter* - Structure defining a bwc parameter. !
|
||||||
|
|
@ -2155,28 +2149,22 @@ forward_wavelet_transform(bwc_field *const field, bwc_parameter *const parameter
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
uchar
|
uchar
|
||||||
inverse_wavelet_transform(bwc_field *const field, bwc_parameter *const parameter)
|
inverse_wavelet_transform(bwc_codec *const field, bwc_parameter *const parameter)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE INT VARIABLES: !
|
! DEFINE INT VARIABLES: !
|
||||||
\*-----------------------*/
|
\*-----------------------*/
|
||||||
uint64 incr_X, incr_Y, incr_Z;
|
uint64 incr_X, incr_Y, incr_Z, incr_TS;
|
||||||
uint64 rX0, rY0, rZ0;
|
uint64 rX0, rY0, rZ0, rTS0;
|
||||||
uint64 rX1, rY1, rZ1;
|
uint64 rX1, rY1, rZ1, rTS1;
|
||||||
uint64 width, height, depth;
|
uint64 width, height, depth, dt;
|
||||||
uint64 x, y, z;
|
uint64 x, y, z, t;
|
||||||
|
|
||||||
int64 nThreads;
|
int64 nThreads;
|
||||||
int64 i;
|
int64 i;
|
||||||
|
|
||||||
uint32 buff_size;
|
uint32 buff_size;
|
||||||
|
|
||||||
uint16 incr_TS;
|
|
||||||
uint16 rTS0;
|
|
||||||
uint16 rTS1;
|
|
||||||
uint16 dt;
|
|
||||||
uint16 t;
|
|
||||||
|
|
||||||
uint8 id;
|
uint8 id;
|
||||||
uint8 filter_tapsX, filter_tapsY, filter_tapsZ;
|
uint8 filter_tapsX, filter_tapsY, filter_tapsZ;
|
||||||
uint8 filter_tapsTS;
|
uint8 filter_tapsTS;
|
||||||
|
|
@ -2318,8 +2306,8 @@ inverse_wavelet_transform(bwc_field *const field, bwc_parameter *const parameter
|
||||||
rY1 = (uint64)parameter->resolution[control->nDecomp - level].info.Y1;
|
rY1 = (uint64)parameter->resolution[control->nDecomp - level].info.Y1;
|
||||||
rZ0 = (uint64)parameter->resolution[control->nDecomp - level].info.Z0;
|
rZ0 = (uint64)parameter->resolution[control->nDecomp - level].info.Z0;
|
||||||
rZ1 = (uint64)parameter->resolution[control->nDecomp - level].info.Z1;
|
rZ1 = (uint64)parameter->resolution[control->nDecomp - level].info.Z1;
|
||||||
rTS0 = (uint16)parameter->resolution[control->nDecomp - level].info.TS0;
|
rTS0 = (uint64)parameter->resolution[control->nDecomp - level].info.TS0;
|
||||||
rTS1 = (uint16)parameter->resolution[control->nDecomp - level].info.TS1;
|
rTS1 = (uint64)parameter->resolution[control->nDecomp - level].info.TS1;
|
||||||
|
|
||||||
if(level < control->decompTS && (rTS1 - rTS0) > 1)
|
if(level < control->decompTS && (rTS1 - rTS0) > 1)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -16,7 +16,7 @@
|
||||||
|| ------------ ||
|
|| ------------ ||
|
||||||
|| ||
|
|| ||
|
||||||
|| This file describes a set of functions that can be used to de-/encode bwc ||
|
|| This file describes a set of functions that can be used to de-/encode bwc ||
|
||||||
|| codeblocks described by the bwc_field structure according to the embedded block ||
|
|| codeblocks described by the bwc_codec structure according to the embedded block ||
|
||||||
|| coding paradigm described by the JPEG 2000 standard. For more information please ||
|
|| coding paradigm described by the JPEG 2000 standard. For more information please ||
|
||||||
|| refere to JPEG2000 by D. S. Taubman and M. W. Marcellin. ||
|
|| refere to JPEG2000 by D. S. Taubman and M. W. Marcellin. ||
|
||||||
|| ||
|
|| ||
|
||||||
|
|
@ -398,9 +398,8 @@ cblkreset_inv(bwc_coder_stripe *const cblk, const uint64 width, const uint64 hei
|
||||||
uint64 i;
|
uint64 i;
|
||||||
uint64 limit;
|
uint64 limit;
|
||||||
uint64 cblk_stripe;
|
uint64 cblk_stripe;
|
||||||
uint64 x, y, z;
|
uint64 x, y, z, t;
|
||||||
int64 idx_u, idx_r, idx_d, idx_l;
|
int64 idx_u, idx_r, idx_d, idx_l;
|
||||||
uint16 t;
|
|
||||||
uint8 s;
|
uint8 s;
|
||||||
|
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
|
|
@ -533,15 +532,12 @@ cblkcopy_forward(bwc_coder_stripe *const destination, bwc_sample *const source,
|
||||||
\*-----------------------*/
|
\*-----------------------*/
|
||||||
bwc_raw buff, sign_mask;
|
bwc_raw buff, sign_mask;
|
||||||
uint64 bit_mask, limit;
|
uint64 bit_mask, limit;
|
||||||
uint64 cblk_width, cblk_height, cblk_depth, cblk_stripe;
|
uint64 cblk_width, cblk_height, cblk_depth, cblk_dt, cblk_stripe;
|
||||||
uint64 incrX, incrY, incrZ;
|
uint64 incrX, incrY, incrZ;
|
||||||
uint64 i, x, y, z;
|
uint64 i, x, y, z, t;
|
||||||
uint64 X0, Y0, Z0;
|
uint64 X0, Y0, Z0, TS0;
|
||||||
uint64 X1, Y1, Z1;
|
uint64 X1, Y1, Z1, TS1;
|
||||||
int64 idx_u, idx_r, idx_d, idx_l;
|
int64 idx_u, idx_r, idx_d, idx_l;
|
||||||
uint16 TS0, TS1;
|
|
||||||
uint16 cblk_dt;
|
|
||||||
uint16 t;
|
|
||||||
uint8 b, Kmax, s;
|
uint8 b, Kmax, s;
|
||||||
|
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
|
|
@ -775,15 +771,12 @@ cblkcopy_inverse(bwc_coder_stripe *const source, bwc_sample *const destinat
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE INT VARIABLES: !
|
! DEFINE INT VARIABLES: !
|
||||||
\*-----------------------*/
|
\*-----------------------*/
|
||||||
uint64 cblk_width, cblk_height, cblk_depth, cblk_stripe;
|
uint64 cblk_width, cblk_height, cblk_depth, cblk_dt, cblk_stripe;
|
||||||
uint64 bit_shift, buff, limit;
|
uint64 bit_shift, buff, limit;
|
||||||
uint64 incrX, incrY, incrZ;
|
uint64 incrX, incrY, incrZ;
|
||||||
uint64 i, x, y, z;
|
uint64 i, x, y, z, t;
|
||||||
uint64 X0, Y0, Z0;
|
uint64 X0, Y0, Z0, TS0;
|
||||||
uint64 X1, Y1, Z1;
|
uint64 X1, Y1, Z1, TS1;
|
||||||
uint16 TS0, TS1;
|
|
||||||
uint16 cblk_dt;
|
|
||||||
uint16 t;
|
|
||||||
uint8 bitplane;
|
uint8 bitplane;
|
||||||
uint8 codingpass;
|
uint8 codingpass;
|
||||||
uint8 s;
|
uint8 s;
|
||||||
|
|
@ -2274,12 +2267,12 @@ compute_convex_hull(bwc_encoded_cblk *const encoded_codeblock, double *const mse
|
||||||
}
|
}
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
! FUNCTION NAME: bwc_encoded_cblk* encode_codeblock(bwc_field *const field, bwc_cblk_access *const access, !
|
! FUNCTION NAME: bwc_encoded_cblk* encode_codeblock(bwc_codec *const field, bwc_cblk_access *const access, !
|
||||||
! -------------- bwc_coder_stripe *const codeblock, !
|
! -------------- bwc_coder_stripe *const codeblock, !
|
||||||
! const uint64 width, !
|
! const uint64 width, !
|
||||||
! const uint64 height, !
|
! const uint64 height, !
|
||||||
! const uint64 depth, !
|
! const uint64 depth, !
|
||||||
! const uint16 dt) !
|
! const uint64 dt) !
|
||||||
! !
|
! !
|
||||||
! !
|
! !
|
||||||
! DESCRIPTION: !
|
! DESCRIPTION: !
|
||||||
|
|
@ -2307,12 +2300,12 @@ compute_convex_hull(bwc_encoded_cblk *const encoded_codeblock, double *const mse
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
static void
|
static void
|
||||||
encode_codeblock(bwc_field *const field, bwc_cblk_access *const access,
|
encode_codeblock(bwc_codec *const field, bwc_cblk_access *const access,
|
||||||
bwc_coder_stripe *const codeblock,
|
bwc_coder_stripe *const codeblock,
|
||||||
const uint64 width,
|
const uint64 width,
|
||||||
const uint64 height,
|
const uint64 height,
|
||||||
const uint64 depth,
|
const uint64 depth,
|
||||||
const uint16 dt)
|
const uint64 dt)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE INT VARIABLES: !
|
! DEFINE INT VARIABLES: !
|
||||||
|
|
@ -2595,12 +2588,12 @@ encode_codeblock(bwc_field *const field, bwc_cblk_access *const access,
|
||||||
}
|
}
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
! FUNCTION NAME: bwc_encoded_cblk* encode_codeblock(bwc_field *const field, bwc_cblk_access *const access, !
|
! FUNCTION NAME: bwc_encoded_cblk* encode_codeblock(bwc_codec *const field, bwc_cblk_access *const access, !
|
||||||
! bwc_coder_stripe *const codeblock, !
|
! bwc_coder_stripe *const codeblock, !
|
||||||
! const uint64 width, !
|
! const uint64 width, !
|
||||||
! const uint64 height, !
|
! const uint64 height, !
|
||||||
! const uint64 depth, !
|
! const uint64 depth, !
|
||||||
! const uint16 dt) !
|
! const uint64 dt) !
|
||||||
! -------------- !
|
! -------------- !
|
||||||
! !
|
! !
|
||||||
! DESCRIPTION: !
|
! DESCRIPTION: !
|
||||||
|
|
@ -2628,12 +2621,12 @@ encode_codeblock(bwc_field *const field, bwc_cblk_access *const access,
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
static void
|
static void
|
||||||
decode_codeblock(bwc_field *const field, bwc_cblk_access *const access,
|
decode_codeblock(bwc_codec *const field, bwc_cblk_access *const access,
|
||||||
bwc_coder_stripe *const codeblock,
|
bwc_coder_stripe *const codeblock,
|
||||||
const uint64 width,
|
const uint64 width,
|
||||||
const uint64 height,
|
const uint64 height,
|
||||||
const uint64 depth,
|
const uint64 depth,
|
||||||
const uint16 dt)
|
const uint64 dt)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE INT VARIABLES: !
|
! DEFINE INT VARIABLES: !
|
||||||
|
|
@ -2828,20 +2821,19 @@ decode_codeblock(bwc_field *const field, bwc_cblk_access *const access,
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
uchar
|
uchar
|
||||||
t1_encode(bwc_field *const field, bwc_tile *const tile, bwc_parameter *const parameter)
|
t1_encode(bwc_codec *const field, bwc_tile *const tile, bwc_parameter *const parameter)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE INT VARIABLES: !
|
! DEFINE INT VARIABLES: !
|
||||||
\*-----------------------*/
|
\*-----------------------*/
|
||||||
uint64 c;
|
uint64 c;
|
||||||
uint64 cbSizeX, cbSizeY, cbSizeZ;
|
uint64 cbSizeX, cbSizeY, cbSizeZ, cbSizeTS;
|
||||||
uint64 width, height, depth;
|
uint64 width, height, depth;
|
||||||
|
|
||||||
int64 buff_size;
|
int64 buff_size;
|
||||||
int64 i, j;
|
int64 i, j;
|
||||||
int64 nThreads;
|
int64 nThreads;
|
||||||
|
|
||||||
uint16 cbSizeTS;
|
|
||||||
uint16 slope_max, slope_min;
|
uint16 slope_max, slope_min;
|
||||||
int16 z;
|
int16 z;
|
||||||
|
|
||||||
|
|
@ -3131,21 +3123,19 @@ t1_encode(bwc_field *const field, bwc_tile *const tile, bwc_parameter *const par
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
uchar
|
uchar
|
||||||
t1_decode(bwc_field *const field, bwc_tile *const tile, bwc_parameter *const parameter)
|
t1_decode(bwc_codec *const field, bwc_tile *const tile, bwc_parameter *const parameter)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE INT VARIABLES: !
|
! DEFINE INT VARIABLES: !
|
||||||
\*-----------------------*/
|
\*-----------------------*/
|
||||||
uint64 c;
|
uint64 c;
|
||||||
uint64 cbSizeX, cbSizeY, cbSizeZ;
|
uint64 cbSizeX, cbSizeY, cbSizeZ, cbSizeTS;
|
||||||
uint64 width, height, depth;
|
uint64 width, height, depth;
|
||||||
|
|
||||||
int64 buff_size;
|
int64 buff_size;
|
||||||
int64 i, j;
|
int64 i, j;
|
||||||
int64 nThreads;
|
int64 nThreads;
|
||||||
|
|
||||||
uint16 cbSizeTS;
|
|
||||||
|
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE STRUCTS: !
|
! DEFINE STRUCTS: !
|
||||||
\*-----------------------*/
|
\*-----------------------*/
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
|| ------------ ||
|
|| ------------ ||
|
||||||
|| ||
|
|| ||
|
||||||
|| This file describes a set of functions that can be used to de-/encode bwc ||
|
|| This file describes a set of functions that can be used to de-/encode bwc ||
|
||||||
|| codeblocks described by the bwc_field structure according to the embedded block ||
|
|| codeblocks described by the bwc_codec structure according to the embedded block ||
|
||||||
|| coding paradigm described by the JPEG 2000 standard. For more information please ||
|
|| coding paradigm described by the JPEG 2000 standard. For more information please ||
|
||||||
|| refere to JPEG2000 by D. S. Taubman and M. W. Marcellin. ||
|
|| refere to JPEG2000 by D. S. Taubman and M. W. Marcellin. ||
|
||||||
|| ||
|
|| ||
|
||||||
|
|
@ -312,7 +312,7 @@ encode_length(bitstream *const header, bwc_codeblock *const codeblock,
|
||||||
}
|
}
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
! FUNCTION NAME: void create_quality_layers(bwc_field *const field, bwc_tile *const tile) !
|
! FUNCTION NAME: void create_quality_layers(bwc_codec *const field, bwc_tile *const tile) !
|
||||||
! -------------- !
|
! -------------- !
|
||||||
! !
|
! !
|
||||||
! !
|
! !
|
||||||
|
|
@ -385,7 +385,7 @@ decode_length(bitstream *const header, bwc_codeblock *const codeblock, int8 cons
|
||||||
}
|
}
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
! FUNCTION NAME: int64 create_packet(bwc_field *const field, bwc_tile *const tile, !
|
! FUNCTION NAME: int64 create_packet(bwc_codec *const field, bwc_tile *const tile, !
|
||||||
! -------------- bwc_resolution *const resolution, !
|
! -------------- bwc_resolution *const resolution, !
|
||||||
! uint32 const prec_idx, !
|
! uint32 const prec_idx, !
|
||||||
! int8 const q_layer, !
|
! int8 const q_layer, !
|
||||||
|
|
@ -403,7 +403,7 @@ decode_length(bitstream *const header, bwc_codeblock *const codeblock, int8 cons
|
||||||
! ----------- !
|
! ----------- !
|
||||||
! Variable Type Description !
|
! Variable Type Description !
|
||||||
! -------- ---- ----------- !
|
! -------- ---- ----------- !
|
||||||
! field bwc_field* - Structure defining the compression/ !
|
! field bwc_codec* - Structure defining the compression/ !
|
||||||
! decompression stage. !
|
! decompression stage. !
|
||||||
! !
|
! !
|
||||||
! tile bwc_tile* - Structure defining a bwc tile. !
|
! tile bwc_tile* - Structure defining a bwc tile. !
|
||||||
|
|
@ -435,7 +435,7 @@ decode_length(bitstream *const header, bwc_codeblock *const codeblock, int8 cons
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
static int32
|
static int32
|
||||||
create_packet(bwc_field *const field, bwc_tile *const tile,
|
create_packet(bwc_codec *const field, bwc_tile *const tile,
|
||||||
bwc_resolution *const resolution,
|
bwc_resolution *const resolution,
|
||||||
uint32 const prec_idx,
|
uint32 const prec_idx,
|
||||||
int16 const q_layer,
|
int16 const q_layer,
|
||||||
|
|
@ -450,6 +450,7 @@ create_packet(bwc_field *const field, bwc_tile *const tile,
|
||||||
int16 *cp_contr;
|
int16 *cp_contr;
|
||||||
int16 delta_z;
|
int16 delta_z;
|
||||||
int8 m;
|
int8 m;
|
||||||
|
uchar *memory;
|
||||||
|
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE STRUCTS: !
|
! DEFINE STRUCTS: !
|
||||||
|
|
@ -482,7 +483,14 @@ create_packet(bwc_field *const field, bwc_tile *const tile,
|
||||||
! Initialize the stream that is used to assemble the pack- !
|
! Initialize the stream that is used to assemble the pack- !
|
||||||
! et header. !
|
! et header. !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
header = init_stream(NULL, PACKET_HEADER_SIZE, 'c');
|
memory = calloc(PACKET_HEADER_SIZE, sizeof(uchar));
|
||||||
|
if(!memory)
|
||||||
|
{
|
||||||
|
// memory allocation error
|
||||||
|
fprintf(stderr, MEMERROR);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
header = init_bitstream(memory, PACKET_HEADER_SIZE, 'c');
|
||||||
if(!header)
|
if(!header)
|
||||||
{
|
{
|
||||||
// memory allocation error
|
// memory allocation error
|
||||||
|
|
@ -498,7 +506,7 @@ create_packet(bwc_field *const field, bwc_tile *const tile,
|
||||||
if(!est)
|
if(!est)
|
||||||
{
|
{
|
||||||
packet->body.access =
|
packet->body.access =
|
||||||
packet->body.memory = calloc(packet->body.size, sizeof(bwc_stream));
|
packet->body.memory = calloc(packet->body.size, sizeof(bwc_span));
|
||||||
if(!packet->body.memory)
|
if(!packet->body.memory)
|
||||||
{
|
{
|
||||||
// memory allocation error
|
// memory allocation error
|
||||||
|
|
@ -644,7 +652,8 @@ create_packet(bwc_field *const field, bwc_tile *const tile,
|
||||||
}
|
}
|
||||||
|
|
||||||
k = header->L;
|
k = header->L;
|
||||||
terminate_stream(header, NULL);
|
free(header->memory);
|
||||||
|
free(header);
|
||||||
return k;
|
return k;
|
||||||
}
|
}
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
|
|
@ -655,11 +664,13 @@ create_packet(bwc_field *const field, bwc_tile *const tile,
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if(terminate_stream(header, &packet->header))
|
if(shrink_to_fit(header))
|
||||||
{
|
{
|
||||||
// memory allocation error
|
// memory allocation error
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
transfer_to_span(header, &packet->header);
|
||||||
|
free(header);
|
||||||
|
|
||||||
packet->size = packet->body.size + packet->header.size;
|
packet->size = packet->body.size + packet->header.size;
|
||||||
|
|
||||||
|
|
@ -706,7 +717,7 @@ create_packet(bwc_field *const field, bwc_tile *const tile,
|
||||||
}
|
}
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
! FUNCTION NAME: uchar create_packets(bwc_field *const field, bwc_tile *const tile) !
|
! FUNCTION NAME: uchar create_packets(bwc_codec *const field, bwc_tile *const tile) !
|
||||||
! -------------- !
|
! -------------- !
|
||||||
! !
|
! !
|
||||||
! DESCRIPTION: !
|
! DESCRIPTION: !
|
||||||
|
|
@ -723,7 +734,7 @@ create_packet(bwc_field *const field, bwc_tile *const tile,
|
||||||
! ----------- !
|
! ----------- !
|
||||||
! Variable Type Description !
|
! Variable Type Description !
|
||||||
! -------- ---- ----------- !
|
! -------- ---- ----------- !
|
||||||
! field bwc_field* - Structure defining the compression/ !
|
! field bwc_codec* - Structure defining the compression/ !
|
||||||
! decompression stage. !
|
! decompression stage. !
|
||||||
! !
|
! !
|
||||||
! tile bwc_tile* - Structure defining a bwc tile. !
|
! tile bwc_tile* - Structure defining a bwc tile. !
|
||||||
|
|
@ -743,7 +754,7 @@ create_packet(bwc_field *const field, bwc_tile *const tile,
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
static uchar
|
static uchar
|
||||||
create_packets(bwc_field *const field, bwc_tile *const tile)
|
create_packets(bwc_codec *const field, bwc_tile *const tile)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE INT VARIABLES: !
|
! DEFINE INT VARIABLES: !
|
||||||
|
|
@ -772,7 +783,7 @@ create_packets(bwc_field *const field, bwc_tile *const tile)
|
||||||
! variables to make the code more readable. !
|
! variables to make the code more readable. !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
control = &field->control;
|
control = &field->control;
|
||||||
info = field->info;
|
info = &field->info;
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! Iterate overall quality layers for every precinct in all !
|
! Iterate overall quality layers for every precinct in all !
|
||||||
|
|
@ -845,7 +856,7 @@ create_packets(bwc_field *const field, bwc_tile *const tile)
|
||||||
|
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
! FUNCTION NAME: int64 create_quality_layer(bwc_field *const field, bwc_tile *const tile, !
|
! FUNCTION NAME: int64 create_quality_layer(bwc_codec *const field, bwc_tile *const tile, !
|
||||||
! -------------- uint16 const threshold, !
|
! -------------- uint16 const threshold, !
|
||||||
! int16 const q_layer, !
|
! int16 const q_layer, !
|
||||||
! uchar const est) !
|
! uchar const est) !
|
||||||
|
|
@ -860,7 +871,7 @@ create_packets(bwc_field *const field, bwc_tile *const tile)
|
||||||
! ----------- !
|
! ----------- !
|
||||||
! Variable Type Description !
|
! Variable Type Description !
|
||||||
! -------- ---- ----------- !
|
! -------- ---- ----------- !
|
||||||
! field bwc_field* - Structure defining the compression/ !
|
! field bwc_codec* - Structure defining the compression/ !
|
||||||
! decompression stage. !
|
! decompression stage. !
|
||||||
! !
|
! !
|
||||||
! tile bwc_tile* - Structure defining a bwc tile. !
|
! tile bwc_tile* - Structure defining a bwc tile. !
|
||||||
|
|
@ -888,7 +899,7 @@ create_packets(bwc_field *const field, bwc_tile *const tile)
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
static int64
|
static int64
|
||||||
create_quality_layer(bwc_field *const field, bwc_tile *const tile,
|
create_quality_layer(bwc_codec *const field, bwc_tile *const tile,
|
||||||
uint16 const threshold,
|
uint16 const threshold,
|
||||||
int16 const q_layer,
|
int16 const q_layer,
|
||||||
uchar const est)
|
uchar const est)
|
||||||
|
|
@ -924,7 +935,7 @@ create_quality_layer(bwc_field *const field, bwc_tile *const tile,
|
||||||
! variables to make the code more readable. !
|
! variables to make the code more readable. !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
control = &field->control;
|
control = &field->control;
|
||||||
info = field->info;
|
info = &field->info;
|
||||||
|
|
||||||
for(j = 0, estimated_ql_size = 0; j < info->nPar; ++j)
|
for(j = 0, estimated_ql_size = 0; j < info->nPar; ++j)
|
||||||
{
|
{
|
||||||
|
|
@ -1075,7 +1086,7 @@ create_quality_layer(bwc_field *const field, bwc_tile *const tile,
|
||||||
|
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
! FUNCTION NAME: void create_quality_layers(bwc_field *const field, bwc_tile *const tile) !
|
! FUNCTION NAME: void create_quality_layers(bwc_codec *const field, bwc_tile *const tile) !
|
||||||
! -------------- !
|
! -------------- !
|
||||||
! !
|
! !
|
||||||
! !
|
! !
|
||||||
|
|
@ -1087,7 +1098,7 @@ create_quality_layer(bwc_field *const field, bwc_tile *const tile,
|
||||||
! ----------- !
|
! ----------- !
|
||||||
! Variable Type Description !
|
! Variable Type Description !
|
||||||
! -------- ---- ----------- !
|
! -------- ---- ----------- !
|
||||||
! field bwc_field* - Structure defining the compression/ !
|
! field bwc_codec* - Structure defining the compression/ !
|
||||||
! decompression stage. !
|
! decompression stage. !
|
||||||
! !
|
! !
|
||||||
! tile bwc_tile* - Structure defining a bwc tile. !
|
! tile bwc_tile* - Structure defining a bwc tile. !
|
||||||
|
|
@ -1107,7 +1118,7 @@ create_quality_layer(bwc_field *const field, bwc_tile *const tile,
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
static uchar
|
static uchar
|
||||||
create_quality_layers(bwc_field *const field, bwc_tile *const tile)
|
create_quality_layers(bwc_codec *const field, bwc_tile *const tile)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE INT VARIABLES: !
|
! DEFINE INT VARIABLES: !
|
||||||
|
|
@ -1139,7 +1150,7 @@ create_quality_layers(bwc_field *const field, bwc_tile *const tile)
|
||||||
! temporary variables to make the code more readable. !
|
! temporary variables to make the code more readable. !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
control = &field->control;
|
control = &field->control;
|
||||||
info = field->info;
|
info = &field->info;
|
||||||
|
|
||||||
tile_control = &tile->control;
|
tile_control = &tile->control;
|
||||||
tile_info = &tile->info;
|
tile_info = &tile->info;
|
||||||
|
|
@ -1255,7 +1266,7 @@ create_quality_layers(bwc_field *const field, bwc_tile *const tile)
|
||||||
|| ||
|
|| ||
|
||||||
\************************************************************************************************************/
|
\************************************************************************************************************/
|
||||||
/*----------------------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
! FUNCTION NAME: uchar t2_encode(bwc_field *const field, bwc_tile *const tile) !
|
! FUNCTION NAME: uchar t2_encode(bwc_codec *const field, bwc_tile *const tile) !
|
||||||
! -------------- !
|
! -------------- !
|
||||||
! !
|
! !
|
||||||
! DESCRIPTION: !
|
! DESCRIPTION: !
|
||||||
|
|
@ -1269,7 +1280,7 @@ create_quality_layers(bwc_field *const field, bwc_tile *const tile)
|
||||||
! ----------- !
|
! ----------- !
|
||||||
! Variable Type Description !
|
! Variable Type Description !
|
||||||
! -------- ---- ----------- !
|
! -------- ---- ----------- !
|
||||||
! field bwc_field* - Structure defining the compression/ !
|
! field bwc_codec* - Structure defining the compression/ !
|
||||||
! decompression stage. !
|
! decompression stage. !
|
||||||
! !
|
! !
|
||||||
! tile bwc_tile* - Structure defining a bwc tile. !
|
! tile bwc_tile* - Structure defining a bwc tile. !
|
||||||
|
|
@ -1289,7 +1300,7 @@ create_quality_layers(bwc_field *const field, bwc_tile *const tile)
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
uchar
|
uchar
|
||||||
t2_encode(bwc_field *const field, bwc_tile *const tile)
|
t2_encode(bwc_codec *const field, bwc_tile *const tile)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE ASSERTIONS: !
|
! DEFINE ASSERTIONS: !
|
||||||
|
|
@ -1319,7 +1330,7 @@ t2_encode(bwc_field *const field, bwc_tile *const tile)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*----------------------------------------------------------------------------------------------------------*\
|
/*----------------------------------------------------------------------------------------------------------*\
|
||||||
! FUNCTION NAME: uchar parse_packet(bwc_field *const field, bwc_tile *const tile, !
|
! FUNCTION NAME: uchar parse_packet(bwc_codec *const field, bwc_tile *const tile, !
|
||||||
! -------------- bwc_packet *const packet, !
|
! -------------- bwc_packet *const packet, !
|
||||||
! uint64 const body_size) !
|
! uint64 const body_size) !
|
||||||
! !
|
! !
|
||||||
|
|
@ -1332,7 +1343,7 @@ t2_encode(bwc_field *const field, bwc_tile *const tile)
|
||||||
! ----------- !
|
! ----------- !
|
||||||
! Variable Type Description !
|
! Variable Type Description !
|
||||||
! -------- ---- ----------- !
|
! -------- ---- ----------- !
|
||||||
! field bwc_field* - Structure defining the compression/ !
|
! field bwc_codec* - Structure defining the compression/ !
|
||||||
! decompression stage. !
|
! decompression stage. !
|
||||||
! !
|
! !
|
||||||
! tile bwc_tile* - Structure defining a bwc tile. !
|
! tile bwc_tile* - Structure defining a bwc tile. !
|
||||||
|
|
@ -1356,7 +1367,7 @@ t2_encode(bwc_field *const field, bwc_tile *const tile)
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
uchar
|
uchar
|
||||||
parse_packet(bwc_field *const field, bwc_tile *const tile,
|
parse_packet(bwc_codec *const field, bwc_tile *const tile,
|
||||||
bwc_packet *const packet,
|
bwc_packet *const packet,
|
||||||
uint64 const body_size)
|
uint64 const body_size)
|
||||||
{
|
{
|
||||||
|
|
@ -1392,7 +1403,7 @@ parse_packet(bwc_field *const field, bwc_tile *const tile,
|
||||||
! Initialize the stream that is used to parse the packet !
|
! Initialize the stream that is used to parse the packet !
|
||||||
! codestream. !
|
! codestream. !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
header = init_stream(packet->header.memory, body_size, 'd');
|
header = init_bitstream(packet->header.memory, body_size, 'd');
|
||||||
if(!header)
|
if(!header)
|
||||||
{
|
{
|
||||||
// memory allocation error
|
// memory allocation error
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue