#include "opj_config.h"
#include "opj_includes.h"
+
+/**
+ * Decompression handler.
+ */
typedef struct opj_decompression
{
+ /** Main header reading function handler*/
opj_bool (* opj_read_header) ( struct opj_stream_private * cio,
void * p_codec,
- opj_file_info_t * file_info,
+ opj_image_header_t *p_img_header,
struct opj_event_mgr * p_manager);
-
+ /** FIXME DOC */
opj_image_t* (* opj_decode) ( void * p_codec,
struct opj_stream_private *p_cio,
struct opj_event_mgr * p_manager);
-
+ /** FIXME DOC */
opj_bool (*opj_read_tile_header)( void * p_codec,
OPJ_UINT32 * p_tile_index,
OPJ_UINT32* p_data_size,
opj_bool * p_should_go_on,
struct opj_stream_private *p_cio,
struct opj_event_mgr * p_manager);
-
+ /** FIXME DOC */
opj_bool (*opj_decode_tile_data)( void * p_codec,
OPJ_UINT32 p_tile_index,
OPJ_BYTE * p_data,
OPJ_UINT32 p_data_size,
struct opj_stream_private *p_cio,
struct opj_event_mgr * p_manager);
-
+ /** FIXME DOC */
opj_bool (* opj_end_decompress) ( void *p_codec,
struct opj_stream_private *cio,
struct opj_event_mgr * p_manager);
-
+ /** Codec destroy function handler*/
void (* opj_destroy) (void * p_codec);
-
+ /** Setup decoder function handler */
void (*opj_setup_decoder) (void * p_codec, opj_dparameters_t * p_param);
-
+ /** Set decode area function handler */
opj_bool (*opj_set_decode_area) ( void * p_codec,
OPJ_INT32 p_start_x, OPJ_INT32 p_end_x,
OPJ_INT32 p_start_y, OPJ_INT32 p_end_y,
struct opj_event_mgr * p_manager);
}opj_decompression_t;
+/**
+ * Compression handler. FIXME DOC
+ */
typedef struct opj_compression
{
opj_bool (* opj_start_compress) (void *p_codec,struct opj_stream_private *cio,struct opj_image * p_image, struct opj_event_mgr * p_manager);
}opj_compression_t;
+/**
+ * Main codec handler used for compression or decompression.
+ */
typedef struct opj_codec_private
{
- /* code-blocks informations */
+ /** FIXME DOC */
union {
opj_decompression_t m_decompression;
opj_compression_t m_compression;
} m_codec_data;
+ /** FIXME DOC*/
void * m_codec;
+ /** Event handler */
opj_event_mgr_t* m_event_mgr;
- unsigned is_decompressor : 1;
+ /** Flag to indicate if the codec is used to decode or encode*/
+ opj_bool is_decompressor;
+ opj_bool (*opj_dump_codec) (void * p_codec, OPJ_INT32 info_flag, FILE* output_stream);
+ opj_codestream_info_v2_t* (*opj_get_codec_info)(void* p_codec);
+ opj_codestream_index_t* (*opj_get_codec_index)(void* p_codec);
}
opj_codec_private_t;
-/**
- * Default callback function.
- * Do nothing.
- */
-void opj_default_callback (const char *msg, void *client_data)
-{
- //FIXME V2 -> V1 cf below
-}
-void set_default_event_handler(opj_event_mgr_t * p_manager)
-{
- //FIXME V2 -> V1
- //p_manager->m_error_data = 00;
- //p_manager->m_warning_data = 00;
- //p_manager->m_info_data = 00;
- p_manager->error_handler = opj_default_callback;
- p_manager->info_handler = opj_default_callback;
- p_manager->warning_handler = opj_default_callback;
-}
+
+/* ---------------------------------------------------------------------- */
+
OPJ_UINT32 opj_read_from_file (void * p_buffer, OPJ_UINT32 p_nb_bytes, FILE * p_file)
{
return PACKAGE_VERSION;
}
+
+
opj_dinfo_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT format) {
opj_dinfo_t *dinfo = (opj_dinfo_t*)opj_calloc(1, sizeof(opj_dinfo_t));
if(!dinfo) return NULL;
switch (p_format) {
case CODEC_J2K:
+ l_info->opj_dump_codec = (opj_bool (*) (void*, OPJ_INT32, FILE*)) j2k_dump;
+
+ l_info->opj_get_codec_info = (opj_codestream_info_v2_t* (*) (void*) ) j2k_get_cstr_info;
+
+ l_info->opj_get_codec_index = (opj_codestream_index_t* (*) (void*) ) j2k_get_cstr_index;
+
l_info->m_codec_data.m_decompression.opj_decode =
(opj_image_t* (*) (void *, struct opj_stream_private *, struct opj_event_mgr * ))j2k_decode; // TODO MSD
l_info->m_codec_data.m_decompression.opj_read_header =
(opj_bool (*) ( struct opj_stream_private *,
void *,
- opj_file_info_t *,
+ opj_image_header_t *,
struct opj_event_mgr * )) j2k_read_header;
l_info->m_codec_data.m_decompression.opj_destroy = (void (*) (void *))j2k_destroy;
l_info->m_codec_data.m_decompression.opj_read_header = (opj_bool (*) (
struct opj_stream_private *,
void *,
- opj_file_info_t *,
+ opj_image_header_t *,
struct opj_event_mgr * )) jp2_read_header;
l_info->m_codec_data.m_decompression.opj_read_tile_header = ( opj_bool (*) (
opj_bool OPJ_CALLCONV opj_setup_decoder_v2(opj_codec_t *p_info, opj_dparameters_t *parameters, opj_event_mgr_t* event_mgr)
{
- if (p_info && parameters) {
- opj_codec_private_t * l_info = (opj_codec_private_t *) p_info;
+ opj_codec_private_t * l_info = (opj_codec_private_t *) p_info;
- if (! l_info->is_decompressor) {
- return OPJ_FALSE;
- }
+ if ( !p_info || !parameters || !event_mgr ){
+ fprintf(stderr, "[ERROR] Input parameters of the setup_decoder function are incorrect.\n");
+ return OPJ_FALSE;
+ }
- l_info->m_codec_data.m_decompression.opj_setup_decoder(l_info->m_codec,parameters);
+ if ( !event_mgr->error_handler || !event_mgr->warning_handler || !event_mgr->error_handler){
+ fprintf(stderr, "[ERROR] Event handler provided to the setup_decoder function is not valid.\n");
+ return OPJ_FALSE;
+ }
- if (event_mgr == NULL)
- {
- l_info->m_event_mgr->error_handler = opj_default_callback ;
- l_info->m_event_mgr->warning_handler = opj_default_callback ;
- l_info->m_event_mgr->info_handler = opj_default_callback ;
- l_info->m_event_mgr->client_data = stderr;
- }
- else
- l_info->m_event_mgr = event_mgr;
- return OPJ_TRUE;
+ if (! l_info->is_decompressor) {
+ opj_event_msg_v2(event_mgr, EVT_ERROR, "Codec provided to the setup_decoder function is not a decompressor handler.\n");
+ return OPJ_FALSE;
}
- return OPJ_FALSE;
+
+ l_info->m_codec_data.m_decompression.opj_setup_decoder(l_info->m_codec, parameters);
+
+ l_info->m_event_mgr = event_mgr;
+
+ return OPJ_TRUE;
}
opj_image_t* OPJ_CALLCONV opj_decode(opj_dinfo_t *dinfo, opj_cio_t *cio) {
}
}
+void OPJ_CALLCONV opj_destroy_cstr_info_v2(opj_codestream_info_v2_t *cstr_info) {
+ if (cstr_info) {
+ int tileno, compno;
+
+ if (cstr_info->tile_info){
+ for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) {
+ for (compno = 0; compno < cstr_info->nbcomps; compno++){
+ opj_free(cstr_info->tile_info[tileno].tccp_info);
+ }
+ }
+ opj_free(cstr_info->tile_info);
+ }
+
+ if (cstr_info->m_default_tile_info.tccp_info){
+ opj_free(cstr_info->m_default_tile_info.tccp_info);
+ }
+
+ opj_free(cstr_info);
+ }
+}
+
#ifdef OLD_WAY_MS
opj_bool OPJ_CALLCONV opj_read_header ( opj_stream_t *p_cio,
opj_codec_t *p_codec,
- opj_file_info_t* p_file_info,
- OPJ_INT32 file_info_flag)
-
+ opj_image_header_t *p_img_header )
{
- /* Initialize the output structure */
- opj_initialise_file_info(p_file_info, file_info_flag, CODEC_J2K);
-
if (p_codec && p_cio) {
opj_codec_private_t* l_info = (opj_codec_private_t*) p_codec;
opj_stream_private_t* l_cio = (opj_stream_private_t*) p_cio;
if(! l_info->is_decompressor) {
+ opj_event_msg_v2(l_info->m_event_mgr, EVT_ERROR, "Codec provided to the read_header function is not a decompressor handler.\n");
return OPJ_FALSE;
}
return l_info->m_codec_data.m_decompression.opj_read_header(
l_cio,
l_info->m_codec,
- p_file_info,
+ p_img_header,
l_info->m_event_mgr);
}
+
+ fprintf(stderr, "[ERROR] Input parameters of the read_header function are incorrect.\n");
return OPJ_FALSE;
}
void OPJ_CALLCONV opj_destroy_codec(opj_codec_t *p_info)
{
- if
- (p_info)
- {
+ if (p_info) {
opj_codec_private_t * l_info = (opj_codec_private_t *) p_info;
- if
- (l_info->is_decompressor)
- {
+
+ if (l_info->is_decompressor) {
l_info->m_codec_data.m_decompression.opj_destroy(l_info->m_codec);
}
- else
- {
+ else {
l_info->m_codec_data.m_compression.opj_destroy(l_info->m_codec);
}
+
l_info->m_codec = 00;
opj_free(l_info);
}
}
return OPJ_FALSE;
}
+
+/**
+ * Reads a tile data. This function is compulsory and allows one to decode tile data. opj_read_tile_header should be called before.
+ * The user may need to refer to the image got by opj_read_header to understand the size being taken by the tile.
+ *
+ * @param p_codec the jpeg2000 codec.
+ * @param p_tile_index the index of the tile being decoded, this should be the value set by opj_read_tile_header.
+ * @param p_data pointer to a memory block that will hold the decoded data.
+ * @param p_data_size size of p_data. p_data_size should be bigger or equal to the value set by opj_read_tile_header.
+ * @param p_stream the stream to decode.
+ *
+ * @return true if the data could be decoded.
+ */
+opj_bool OPJ_CALLCONV opj_decode_tile_data(
+ opj_codec_t *p_codec,
+ OPJ_UINT32 p_tile_index,
+ OPJ_BYTE * p_data,
+ OPJ_UINT32 p_data_size,
+ opj_stream_t *p_stream
+ )
+{
+ if (p_codec && p_data && p_stream) {
+ opj_codec_private_t * l_info = (opj_codec_private_t *) p_codec;
+ opj_stream_private_t * l_cio = (opj_stream_private_t *) p_stream;
+
+ if (! l_info->is_decompressor) {
+ return OPJ_FALSE;
+ }
+
+ return l_info->m_codec_data.m_decompression.opj_decode_tile_data( l_info->m_codec,
+ p_tile_index,
+ p_data,
+ p_data_size,
+ l_cio,
+ l_info->m_event_mgr);
+ }
+ return OPJ_FALSE;
+}
+
+/*
+ *
+ *
+ */
+void OPJ_CALLCONV opj_dump_codec( opj_codec_t *p_codec,
+ OPJ_INT32 info_flag,
+ FILE* output_stream)
+{
+ if (p_codec) {
+ opj_codec_private_t* l_codec = (opj_codec_private_t*) p_codec;
+
+ l_codec->opj_dump_codec(l_codec->m_codec, info_flag, output_stream);
+ }
+
+ fprintf(stderr, "[ERROR] Input parameter of the dump_codec function are incorrect.\n");
+}
+
+/*
+ *
+ *
+ */
+opj_codestream_info_v2_t* OPJ_CALLCONV opj_get_cstr_info(opj_codec_t *p_codec)
+{
+ if (p_codec) {
+ opj_codec_private_t* l_codec = (opj_codec_private_t*) p_codec;
+
+ return l_codec->opj_get_codec_info(l_codec->m_codec);
+ }
+
+ return NULL;
+}
+
+/*
+ *
+ *
+ */
+opj_codestream_index_t * OPJ_CALLCONV opj_get_cstr_index(opj_codec_t *p_codec)
+{
+ if (p_codec) {
+ opj_codec_private_t* l_codec = (opj_codec_private_t*) p_codec;
+
+ return l_codec->opj_get_codec_index(l_codec->m_codec);
+ }
+
+ return NULL;
+}