[trunk] added some tests for Cinema2k 48fps and Cinema 4k 24 fps. Fixed

[openjpeg.git] / tests / test_tile_encoder.c

diff --git a/tests/test_tile_encoder.c b/tests/test_tile_encoder.c
index 54710369b00d7ab9a857db373fb8d02876e82a72..dbc3f037c1cd948f9ba686bb3fc0574dcc5522dd 100644 (file)
--- a/tests/test_tile_encoder.c
+++ b/tests/test_tile_encoder.c
@@ -80,7 +80,6 @@ int main (int argc, char *argv[])
        opj_codec_t * l_codec;
        opj_image_t * l_image;
        opj_image_cmptparm_t l_params [NUM_COMPS_MAX];
-       FILE * l_file;
        opj_stream_t * l_stream;
        OPJ_UINT32 l_nb_tiles;
        OPJ_UINT32 l_data_size;
@@ -278,20 +277,17 @@ int main (int argc, char *argv[])
                return 1;
        }
 
-       l_file = fopen(output_file,"wb");
-       if (! l_file) {
-               fprintf(stderr, "ERROR -> test_tile_encoder: failed to create the output file!\n");
+       l_stream = opj_stream_create_default_file_stream_v3(output_file, OPJ_FALSE);
+    if (! l_stream) {
+               fprintf(stderr, "ERROR -> test_tile_encoder: failed to create the stream from the output file %s !\n",output_file );
                opj_destroy_codec(l_codec);
                opj_image_destroy(l_image);
                return 1;
        }
 
-       l_stream = opj_stream_create_default_file_stream(l_file, OPJ_FALSE);
-
        if (! opj_start_compress(l_codec,l_image,l_stream)) {
                fprintf(stderr, "ERROR -> test_tile_encoder: failed to start compress!\n");
                opj_stream_destroy_v3(l_stream);
-               fclose(l_file);
                opj_destroy_codec(l_codec);
                opj_image_destroy(l_image);
                return 1;
@@ -301,7 +297,6 @@ int main (int argc, char *argv[])
                if (! opj_write_tile(l_codec,i,l_data,l_data_size,l_stream)) {
                        fprintf(stderr, "ERROR -> test_tile_encoder: failed to write the tile %d!\n",i);
                        opj_stream_destroy_v3(l_stream);
-                       fclose(l_file);
                        opj_destroy_codec(l_codec);
                        opj_image_destroy(l_image);
                        return 1;
@@ -311,14 +306,12 @@ int main (int argc, char *argv[])
        if (! opj_end_compress(l_codec,l_stream)) {
                fprintf(stderr, "ERROR -> test_tile_encoder: failed to end compress!\n");
                opj_stream_destroy_v3(l_stream);
-               fclose(l_file);
                opj_destroy_codec(l_codec);
                opj_image_destroy(l_image);
                return 1;
        }
 
        opj_stream_destroy_v3(l_stream);
-       fclose(l_file);
        opj_destroy_codec(l_codec);
        opj_image_destroy(l_image);