generic-library/openjpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

trying to track issue with msgqueue_manager on win32. Use C-style comments

Browse Source
This commit is contained in:
Mathieu Malaterre
2012-01-30 08:44:05 +00:00
parent 6dd7da0e05
commit baf01b98fd
18 changed files with 238 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
applications/jpip/libopenjpip/msgqueue_manager.c
View File

@@ -46,7 +46,7 @@
#define FCGI_stdout stdout
#define FCGI_stderr stderr
#define logstream stderr
#endif //SERVER
#endif /*SERVER*/
msgqueue_param_t * gene_msgqueue( bool stateless, cachemodel_param_t *cachemodel)
{
@@ -134,7 +134,7 @@ void enqueue_mainheader( msgqueue_param_t *msgqueue)
msg->csn = target->csn;
msg->bin_offset = 0;
msg->length = codeidx->mhead_length;
msg->aux = 0; // non exist
msg->aux = 0; /* non exist*/
msg->res_offset = codeidx->offset;
msg->phld = NULL;
msg->next = NULL;
@@ -162,9 +162,9 @@ void enqueue_tileheader( int tile_id, msgqueue_param_t *msgqueue)
msg->class_id = TILE_HEADER_MSG;
msg->csn = target->csn;
msg->bin_offset = 0;
msg->length = codeidx->tileheader[tile_id]->tlen-2; // SOT marker segment is removed
msg->aux = 0; // non exist
msg->res_offset = codeidx->offset + get_elemOff( codeidx->tilepart, 0, tile_id) + 2; // skip SOT marker seg
msg->length = codeidx->tileheader[tile_id]->tlen-2; /* SOT marker segment is removed*/
msg->aux = 0; /* non exist*/
msg->res_offset = codeidx->offset + get_elemOff( codeidx->tilepart, 0, tile_id) + 2; /* skip SOT marker seg*/
msg->phld = NULL;
msg->next = NULL;
@@ -178,7 +178,7 @@ void enqueue_tile( int tile_id, int level, msgqueue_param_t *msgqueue)
cachemodel_param_t *cachemodel;
target_param_t *target;
bool *tp_model;
Byte8_t numOftparts; // num of tile parts par tile
Byte8_t numOftparts; /* num of tile parts par tile*/
Byte8_t numOftiles;
index_param_t *codeidx;
faixbox_param_t *tilepart;
@@ -364,7 +364,7 @@ message_param_t * gene_metamsg( int meta_id, Byte8_t binOffset, Byte8_t length,
msg->csn = csn;
msg->bin_offset = binOffset;
msg->length = length;
msg->aux = 0; // non exist
msg->aux = 0; /* non exist*/
msg->res_offset = res_offset;
msg->phld = phld;
msg->next = NULL;
@@ -426,7 +426,7 @@ void recons_stream_from_msgqueue( msgqueue_param_t *msgqueue, int tmpfd)
add_vbas_stream( msg->bin_offset, tmpfd);
add_vbas_stream (msg->length, tmpfd);
if( msg->class_id%2) // Aux is present only if the id is odd
if( msg->class_id%2) /* Aux is present only if the id is odd*/
add_vbas_stream( msg->aux, tmpfd);
if( msg->phld)
@@ -446,8 +446,8 @@ void add_bin_id_vbas_stream( Byte_t bb, Byte_t c, Byte8_t in_class_id, int tmpfd
int bytelength;
Byte8_t tmp;
// A.2.3 In-class identifiers
// 7k-3bits, where k is the number of bytes in the VBAS
/* A.2.3 In-class identifiers */
/* 7k-3bits, where k is the number of bytes in the VBAS*/
bytelength = 1;
tmp = in_class_id >> 4;
while( tmp){
@@ -567,12 +567,12 @@ Byte_t * parse_vbas( Byte_t *streamptr, Byte8_t *elem);
void parse_JPIPstream( Byte_t *JPIPstream, Byte8_t streamlen, Byte8_t offset, msgqueue_param_t *msgqueue)
{
Byte_t *ptr; // stream pointer
Byte_t *ptr; /* stream pointer*/
message_param_t *msg;
Byte_t bb, c;
Byte8_t class_id, csn;
class_id = -1; // dummy
class_id = -1; /* dummy*/
csn = -1;
ptr = JPIPstream;
while( ptr-JPIPstream < streamlen){
@@ -594,7 +594,7 @@ void parse_JPIPstream( Byte_t *JPIPstream, Byte8_t streamlen, Byte8_t offset, ms
ptr = parse_vbas( ptr, &msg->bin_offset);
ptr = parse_vbas( ptr, &msg->length);
if( msg->class_id%2) // Aux is present only if the id is odd
if( msg->class_id%2) /* Aux is present only if the id is odd*/
ptr = parse_vbas( ptr, &msg->aux);
else
msg->aux = 0;
@@ -637,6 +637,8 @@ placeholder_param_t * parse_phld( Byte_t *datastream, Byte8_t metalength);
void parse_metadata( metadata_param_t *metadata, message_param_t *msg, Byte_t *datastream)
{
box_param_t *box;
placeholder_param_t *phld;
char *boxtype = (char *)(datastream+4);
msg->phld = NULL;
@@ -645,7 +647,7 @@ void parse_metadata( metadata_param_t *metadata, message_param_t *msg, Byte_t *d
if( !metadata->placeholderlist)
metadata->placeholderlist = gene_placeholderlist();
placeholder_param_t *phld = parse_phld( datastream, msg->length);
phld = parse_phld( datastream, msg->length);
msg->phld = phld;
insert_placeholder_into_list( phld, metadata->placeholderlist);
}
@@ -655,7 +657,7 @@ void parse_metadata( metadata_param_t *metadata, message_param_t *msg, Byte_t *d
if( !metadata->boxlist)
metadata->boxlist = gene_boxlist();
box_param_t *box = gene_boxbyOffinStream( datastream, msg->res_offset);
box = gene_boxbyOffinStream( datastream, msg->res_offset);
insert_box_into_list( box, metadata->boxlist);
}
else