Commit 4fc9a572 authored by Julien Michel's avatar Julien Michel

MRG

parents cc8db4e7 a7ce531f
...@@ -330,10 +330,14 @@ ADD_TEST(utOssimRadarSatSupport ${UTILITIES_TESTS} ...@@ -330,10 +330,14 @@ ADD_TEST(utOssimRadarSatSupport ${UTILITIES_TESTS}
# Case for release 2.2.1 # Case for release 2.2.1
IF(OTB_COMPILE_JPEG2000) IF(OTB_COMPILE_JPEG2000)
ADD_TEST(utOpenJpegEncoder ${UTILITIES_TESTS} ADD_TEST(utOpenJpegEncoder ${UTILITIES_TESTS}
openJpegEncoder) openJpegEncoder
${TEMP}/testjpeg.j2k
)
ADD_TEST(utOpenJpegDecoder ${UTILITIES_TESTS} ADD_TEST(utOpenJpegDecoder ${UTILITIES_TESTS}
openJpegDecoder) openJpegDecoder
${TEMP}/testjpeg.j2k
)
ENDIF(OTB_COMPILE_JPEG2000) ENDIF(OTB_COMPILE_JPEG2000)
# ------- lib expat ------------------------------ # ------- lib expat ------------------------------
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#define DA_Y0 0 #define DA_Y0 0
#define DA_X1 1000 #define DA_X1 1000
#define DA_Y1 1000 #define DA_Y1 1000
#define INPUT_FILE "test.j2k"
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
...@@ -69,165 +69,166 @@ void _openJpegDecoder_info_callback(const char *msg, void *client_data) { ...@@ -69,165 +69,166 @@ void _openJpegDecoder_info_callback(const char *msg, void *client_data) {
int openJpegDecoder(int argc, char * argv[]) int openJpegDecoder(int argc, char * argv[])
{ {
opj_dparameters_t l_param; const char* inputFile = argv[1];
opj_codec_t * l_codec;
opj_image_t * l_image; opj_dparameters_t l_param;
FILE * l_file; opj_codec_t * l_codec;
opj_stream_t * l_stream; opj_image_t * l_image;
OPJ_UINT32 l_data_size; FILE * l_file;
OPJ_UINT32 l_max_data_size = 1000; opj_stream_t * l_stream;
OPJ_UINT32 l_tile_index; OPJ_UINT32 l_data_size;
OPJ_BYTE * l_data = (OPJ_BYTE *) malloc(1000); OPJ_UINT32 l_max_data_size = 1000;
//bool l_go_on = true; OPJ_UINT32 l_tile_index;
OPJ_BOOL l_go_on = true; OPJ_BYTE * l_data = (OPJ_BYTE *) malloc(1000);
OPJ_INT32 l_tile_x0,l_tile_y0; //bool l_go_on = true;
OPJ_UINT32 l_tile_width,l_tile_height,l_nb_tiles_x,l_nb_tiles_y,l_nb_comps; OPJ_BOOL l_go_on = true;
OPJ_INT32 l_current_tile_x0,l_current_tile_y0,l_current_tile_x1,l_current_tile_y1; OPJ_INT32 l_tile_x0,l_tile_y0;
OPJ_UINT32 l_tile_width,l_tile_height,l_nb_tiles_x,l_nb_tiles_y,l_nb_comps;
OPJ_INT32 l_current_tile_x0,l_current_tile_y0,l_current_tile_x1,l_current_tile_y1;
PROFINIT(); PROFINIT();
if if(! l_data)
(! l_data) {
{ return 1;
return 1; }
} opj_set_default_decoder_parameters(&l_param);
opj_set_default_decoder_parameters(&l_param);
/** you may here add custom decoding parameters */ /** you may here add custom decoding parameters */
/* do not use layer decoding limitations */ /* do not use layer decoding limitations */
l_param.cp_layer = 0; l_param.cp_layer = 0;
/* do not use resolutions reductions */ /* do not use resolutions reductions */
l_param.cp_reduce = 0; l_param.cp_reduce = 0;
/* to decode only a part of the image data */ /* to decode only a part of the image data */
//opj_restrict_decoding(&l_param,0,0,1000,1000); //opj_restrict_decoding(&l_param,0,0,1000,1000);
l_codec = opj_create_decompress(CODEC_J2K); l_codec = opj_create_decompress(CODEC_J2K);
if if
(! l_codec) (! l_codec)
{ {
free(l_data); free(l_data);
return 1; return 1;
} }
/* catch events using our callbacks and give a local context */ /* catch events using our callbacks and give a local context */
opj_set_info_handler(l_codec, _openJpegDecoder_info_callback,00); opj_set_info_handler(l_codec, _openJpegDecoder_info_callback,00);
opj_set_warning_handler(l_codec, _openJpegDecoder_warning_callback,00); opj_set_warning_handler(l_codec, _openJpegDecoder_warning_callback,00);
opj_set_error_handler(l_codec, _openJpegDecoder_error_callback,00); opj_set_error_handler(l_codec, _openJpegDecoder_error_callback,00);
if if
(! opj_setup_decoder(l_codec,&l_param)) (! opj_setup_decoder(l_codec,&l_param))
{ {
free(l_data); free(l_data);
opj_destroy_codec(l_codec); opj_destroy_codec(l_codec);
return 1; return 1;
} }
l_file = fopen(INPUT_FILE,"rb"); l_file = fopen(inputFile/*FileINPUT_FILE*/,"rb");
if if
(! l_file) (! l_file)
{
fprintf(stdout, "Error opening input file\n");
free(l_data);
opj_destroy_codec(l_codec);
return 1;
}
l_stream = opj_stream_create_default_file_stream(l_file,true);
if
(! opj_read_header(l_codec,
&l_image,
&l_tile_x0,
&l_tile_y0,
&l_tile_width,
&l_tile_height,
&l_nb_tiles_x,
&l_nb_tiles_y,
l_stream))
{
free(l_data);
opj_stream_destroy(l_stream);
fclose(l_file);
opj_destroy_codec(l_codec);
return 1;
}
printf("Setting decoding area to %d,%d,%d,%d\n", DA_X0, DA_Y0, DA_X1, DA_Y1);
opj_set_decode_area(l_codec, DA_X0, DA_Y0, DA_X1, DA_Y1);
while
(l_go_on)
{
if
(! opj_read_tile_header(l_codec,
&l_tile_index,
&l_data_size,
&l_current_tile_x0,
&l_current_tile_y0,
&l_current_tile_x1,
&l_current_tile_y1,
&l_nb_comps,
&l_go_on,
l_stream))
{ {
fprintf(stdout, "Error opening input file\n"); free(l_data);
free(l_data); opj_stream_destroy(l_stream);
opj_destroy_codec(l_codec); fclose(l_file);
return 1; opj_destroy_codec(l_codec);
opj_image_destroy(l_image);
return 1;
} }
if
l_stream = opj_stream_create_default_file_stream(l_file,true); (l_go_on)
if
(! opj_read_header(l_codec,
&l_image,
&l_tile_x0,
&l_tile_y0,
&l_tile_width,
&l_tile_height,
&l_nb_tiles_x,
&l_nb_tiles_y,
l_stream))
{ {
free(l_data); if
opj_stream_destroy(l_stream); (l_data_size > l_max_data_size)
fclose(l_file); {
opj_destroy_codec(l_codec); l_data = (OPJ_BYTE *) realloc(l_data,l_data_size);
return 1; if
} (! l_data)
printf("Setting decoding area to %d,%d,%d,%d\n", DA_X0, DA_Y0, DA_X1, DA_Y1);
opj_set_decode_area(l_codec, DA_X0, DA_Y0, DA_X1, DA_Y1);
while
(l_go_on)
{
if
(! opj_read_tile_header(l_codec,
&l_tile_index,
&l_data_size,
&l_current_tile_x0,
&l_current_tile_y0,
&l_current_tile_x1,
&l_current_tile_y1,
&l_nb_comps,
&l_go_on,
l_stream))
{
free(l_data);
opj_stream_destroy(l_stream);
fclose(l_file);
opj_destroy_codec(l_codec);
opj_image_destroy(l_image);
return 1;
}
if
(l_go_on)
{ {
if opj_stream_destroy(l_stream);
(l_data_size > l_max_data_size) fclose(l_file);
{ opj_destroy_codec(l_codec);
l_data = (OPJ_BYTE *) realloc(l_data,l_data_size); opj_image_destroy(l_image);
if return 1;
(! l_data)
{
opj_stream_destroy(l_stream);
fclose(l_file);
opj_destroy_codec(l_codec);
opj_image_destroy(l_image);
return 1;
}
l_max_data_size = l_data_size;
}
if
(! opj_decode_tile_data(l_codec,l_tile_index,l_data,l_data_size,l_stream))
{
free(l_data);
opj_stream_destroy(l_stream);
fclose(l_file);
opj_destroy_codec(l_codec);
opj_image_destroy(l_image);
return 1;
}
/** now should inspect image to know the reduction factor and then how to behave with data */
} }
l_max_data_size = l_data_size;
}
if
(! opj_decode_tile_data(l_codec,l_tile_index,l_data,l_data_size,l_stream))
{
free(l_data);
opj_stream_destroy(l_stream);
fclose(l_file);
opj_destroy_codec(l_codec);
opj_image_destroy(l_image);
return 1;
}
/** now should inspect image to know the reduction factor and then how to behave with data */
} }
if }
(! opj_end_decompress(l_codec,l_stream)) if
{ (! opj_end_decompress(l_codec,l_stream))
free(l_data); {
opj_stream_destroy(l_stream); free(l_data);
fclose(l_file); opj_stream_destroy(l_stream);
opj_destroy_codec(l_codec); fclose(l_file);
opj_image_destroy(l_image); opj_destroy_codec(l_codec);
return 1; opj_image_destroy(l_image);
} return 1;
free(l_data); }
opj_stream_destroy(l_stream); free(l_data);
fclose(l_file); opj_stream_destroy(l_stream);
opj_destroy_codec(l_codec); fclose(l_file);
opj_image_destroy(l_image); opj_destroy_codec(l_codec);
opj_image_destroy(l_image);
// Print profiling
PROFPRINT(); // Print profiling
PROFPRINT();
return 0;
return 0;
} }
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment