Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/extern/libopenjpeg/tpix_manager.c
diff options
context:
space:
mode:
Diffstat (limited to 'extern/libopenjpeg/tpix_manager.c')
-rw-r--r--extern/libopenjpeg/tpix_manager.c164
1 files changed, 66 insertions, 98 deletions
diff --git a/extern/libopenjpeg/tpix_manager.c b/extern/libopenjpeg/tpix_manager.c
index 74c02ba7c29..9ba9e7fdabc 100644
--- a/extern/libopenjpeg/tpix_manager.c
+++ b/extern/libopenjpeg/tpix_manager.c
@@ -1,8 +1,8 @@
/*
* $Id: tpix_manager.c 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $
*
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
* Copyright (c) 2003-2004, Yannick Verschueren
* Copyright (c) 2010-2011, Kaori Hagihara
* All rights reserved.
@@ -33,18 +33,11 @@
* \brief Modification of jpip.c from 2KAN indexer
*/
+#include <math.h>
#include "opj_includes.h"
#define MAX(a,b) ((a)>(b)?(a):(b))
-/*
- * Get number of maximum tile parts per tile
- *
- * @param[in] cstr_info codestream information
- * @return number of maximum tile parts per tile
- */
-int get_num_max_tile_parts( opj_codestream_info_t cstr_info);
-
/*
* Write faix box of tpix
@@ -56,51 +49,46 @@ int get_num_max_tile_parts( opj_codestream_info_t cstr_info);
* @param[in] cio file output handle
* @return length of faix box
*/
+int write_tpixfaix( int coff, int compno, opj_codestream_info_t cstr_info, int j2klen, opj_cio_t *cio);
-int opj_write_tpix( int coff,
- opj_codestream_info_t cstr_info,
- int j2klen, opj_stream_private_t *cio,
- opj_event_mgr_t * p_manager )
+
+int write_tpix( int coff, opj_codestream_info_t cstr_info, int j2klen, opj_cio_t *cio)
{
- OPJ_BYTE l_data_header [4];
- OPJ_UINT32 len;
- OPJ_OFF_T lenp;
-
- lenp = opj_stream_tell(cio);
- opj_stream_skip(cio, 4, p_manager);
- opj_write_bytes(l_data_header,JPIP_TPIX,4); /* TPIX */
- opj_stream_write_data(cio,l_data_header,4,p_manager);
+ int len, lenp;
+ lenp = cio_tell( cio);
+ cio_skip( cio, 4); /* L [at the end] */
+ cio_write( cio, JPIP_TPIX, 4); /* TPIX */
- opj_write_tpixfaix( coff, 0, cstr_info, j2klen, cio,p_manager);
+ write_tpixfaix( coff, 0, cstr_info, j2klen, cio);
- len = (OPJ_UINT32)(opj_stream_tell(cio)-lenp);
-
- opj_stream_skip(cio, lenp, p_manager);
- opj_write_bytes(l_data_header,len,4);/* L */
- opj_stream_write_data(cio,l_data_header,4,p_manager);
- opj_stream_seek(cio, lenp+len,p_manager);
+ len = cio_tell( cio)-lenp;
+ cio_seek( cio, lenp);
+ cio_write( cio, len, 4); /* L */
+ cio_seek( cio, lenp+len);
- return (int)len;
+ return len;
}
-int opj_write_tpixfaix( int coff,
- int compno,
- opj_codestream_info_t cstr_info,
- int j2klen,
- opj_stream_private_t *cio,
- opj_event_mgr_t * p_manager )
+
+/*
+ * Get number of maximum tile parts per tile
+ *
+ * @param[in] cstr_info codestream information
+ * @return number of maximum tile parts per tile
+ */
+int get_num_max_tile_parts( opj_codestream_info_t cstr_info);
+
+int write_tpixfaix( int coff, int compno, opj_codestream_info_t cstr_info, int j2klen, opj_cio_t *cio)
{
- OPJ_UINT32 len;
- OPJ_OFF_T lenp;
- OPJ_UINT32 i, j;
- OPJ_UINT32 Aux;
- OPJ_UINT32 num_max_tile_parts;
- OPJ_UINT32 size_of_coding; /* 4 or 8 */
+ int len, lenp;
+ int i, j;
+ int Aux;
+ int num_max_tile_parts;
+ int size_of_coding; /* 4 or 8 */
opj_tp_info_t tp;
- OPJ_BYTE l_data_header [8];
- OPJ_UINT32 version;
+ int version;
- num_max_tile_parts = (OPJ_UINT32)get_num_max_tile_parts( cstr_info);
+ num_max_tile_parts = get_num_max_tile_parts( cstr_info);
if( j2klen > pow( 2, 32)){
size_of_coding = 8;
@@ -111,67 +99,47 @@ int opj_write_tpixfaix( int coff,
version = num_max_tile_parts == 1 ? 0:2;
}
- lenp = opj_stream_tell(cio);
- opj_stream_skip(cio, 4, p_manager); /* L [at the end] */
- opj_write_bytes(l_data_header,JPIP_FAIX,4); /* FAIX */
- opj_stream_write_data(cio,l_data_header,4,p_manager);
- opj_write_bytes(l_data_header,version,1); /* Version 0 = 4 bytes */
- opj_stream_write_data(cio,l_data_header,1,p_manager);
-
- opj_write_bytes(l_data_header,num_max_tile_parts,size_of_coding); /* NMAX */
- opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
- opj_write_bytes(l_data_header,(OPJ_UINT32)(cstr_info.tw*cstr_info.th),size_of_coding); /* M */
- opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
-
- for (i = 0; i < (OPJ_UINT32)(cstr_info.tw*cstr_info.th); i++)
- {
- for (j = 0; j < (OPJ_UINT32)cstr_info.tile[i].num_tps; j++)
- {
- tp = cstr_info.tile[i].tp[j];
-
- opj_write_bytes(l_data_header,(OPJ_UINT32)(tp.tp_start_pos-coff),size_of_coding); /* start position */
- opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
- opj_write_bytes(l_data_header,(OPJ_UINT32)(tp.tp_end_pos-tp.tp_start_pos+1),size_of_coding); /* length */
- opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+ lenp = cio_tell( cio);
+ cio_skip( cio, 4); /* L [at the end] */
+ cio_write( cio, JPIP_FAIX, 4); /* FAIX */
+ cio_write( cio, version, 1); /* Version 0 = 4 bytes */
- if (version & 0x02)
- {
- if( cstr_info.tile[i].num_tps == 1 && cstr_info.numdecompos[compno] > 1)
- Aux = (OPJ_UINT32)(cstr_info.numdecompos[compno] + 1);
- else
- Aux = j + 1;
-
- opj_write_bytes(l_data_header,Aux,4);
- opj_stream_write_data(cio,l_data_header,4,p_manager);
-
- /*cio_write(img.tile[i].tile_parts[j].num_reso_AUX,4);*/ /* Aux_i,j : Auxiliary value */
- /* fprintf(stderr,"AUX value %d\n",Aux);*/
- }
- /*cio_write(0,4);*/
+ cio_write( cio, num_max_tile_parts, size_of_coding); /* NMAX */
+ cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding); /* M */
+ for (i = 0; i < cstr_info.tw*cstr_info.th; i++){
+ for (j = 0; j < cstr_info.tile[i].num_tps; j++){
+ tp = cstr_info.tile[i].tp[j];
+ cio_write( cio, tp.tp_start_pos-coff, size_of_coding); /* start position */
+ cio_write( cio, tp.tp_end_pos-tp.tp_start_pos+1, size_of_coding); /* length */
+ if (version & 0x02){
+ if( cstr_info.tile[i].num_tps == 1 && cstr_info.numdecompos[compno] > 1)
+ Aux = cstr_info.numdecompos[compno] + 1;
+ else
+ Aux = j + 1;
+
+ cio_write( cio, Aux,4);
+ /*cio_write(img.tile[i].tile_parts[j].num_reso_AUX,4);*/ /* Aux_i,j : Auxiliary value */
+ /* fprintf(stderr,"AUX value %d\n",Aux);*/
}
+ /*cio_write(0,4);*/
+ }
/* PADDING */
- while (j < num_max_tile_parts)
- {
-
- opj_write_bytes(l_data_header,0,size_of_coding);/* start position */
- opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
- opj_write_bytes(l_data_header,0,size_of_coding);/* length */
- opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
-
+ while (j < num_max_tile_parts){
+ cio_write( cio, 0, size_of_coding); /* start position */
+ cio_write( cio, 0, size_of_coding); /* length */
if (version & 0x02)
- opj_write_bytes(l_data_header,0,4); /* Aux_i,j : Auxiliary value */
- opj_stream_write_data(cio,l_data_header,4,p_manager);
+ cio_write( cio, 0,4); /* Aux_i,j : Auxiliary value */
j++;
- }
}
+ }
- len = (OPJ_UINT32)(opj_stream_tell(cio)-lenp);
- opj_stream_seek(cio, lenp,p_manager);
- opj_write_bytes(l_data_header,len,4);/* L */
- opj_stream_write_data(cio,l_data_header,4,p_manager);
- opj_stream_seek(cio, lenp+len,p_manager);
+ len = cio_tell( cio)-lenp;
+ cio_seek( cio, lenp);
+ cio_write( cio, len, 4); /* L */
+ cio_seek( cio, lenp+len);
+
+ return len;
- return (int)len;
}
int get_num_max_tile_parts( opj_codestream_info_t cstr_info)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-28 12:53:18 +0300