diff --git a/mj2/meta_out.c b/mj2/meta_out.c index 99870036..12c97f35 100644 --- a/mj2/meta_out.c +++ b/mj2/meta_out.c @@ -39,7 +39,8 @@ static BOOL raw = TRUE; static BOOL derived = TRUE; /* Forwards */ -int xml_write_overall_header(FILE *xmlout, mj2_movie_t * movie); +int xml_write_overall_header(FILE *file, FILE *xmlout, mj2_movie_t * movie, unsigned int sampleframe); +int xml_write_moov(FILE *file, FILE *xmlout, mj2_movie_t * movie, unsigned int sampleframe); void uint_to_chars(unsigned int value, char* buf); @@ -77,8 +78,8 @@ void xml_out_frame_plm(FILE* xmlout); /* j2k_default_tcp is passed globally */ / void xml_out_frame_plt(FILE* xmlout, j2k_tcp_t *tcp); /* NO-OP. PLM NOT SAVED IN DATA STRUCTURE. opt in main; can be used in conjunction with PLT */ void xml_out_frame_crg(FILE* xmlout); /* j2k_default_tcp is passed globally */ /* opt in main; */ void xml_out_frame_com(FILE* xmlout, j2k_tcp_t *tcp); /* NO-OP. COM NOT SAVED IN DATA STRUCTURE */ /* opt in main; */ -void xml_out_dump_hex(FILE* xmlout, char *data, int data_len); -void xml_out_dump_hex_and_ascii(FILE* xmlout, char *data, int data_len); +void xml_out_dump_hex(FILE* xmlout, char *data, int data_len, char* s); +void xml_out_dump_hex_and_ascii(FILE* xmlout, char *data, int data_len, char* s); void xml_out_frame_jp2h(FILE* xmlout, jp2_struct_t *jp2_struct); #ifdef NOTYET /* Shown with cp, extended, as data structure... but it could be a new different one */ @@ -102,8 +103,6 @@ void xml_write_init(BOOL n, BOOL t, BOOL r, BOOL d) } int xml_write_struct(FILE* file, FILE *xmlout, mj2_movie_t * movie, unsigned int sampleframe, char* stringDTD) { - unsigned int tnum; - mj2_tk_t *track; if(stringDTD != NULL) { @@ -117,28 +116,19 @@ int xml_write_struct(FILE* file, FILE *xmlout, mj2_movie_t * movie, unsigned int fprintf(xmlout,"\n"); fprintf(xmlout, "\n"); - xml_write_overall_header(xmlout, movie); - // Find first video track - tnum = 0; - while (movie->tk[tnum].track_type != 0) - tnum ++; - - track = &(movie->tk[tnum]); - - // For now, output info on first video track - xml_write_trak(file, xmlout, track, tnum, sampleframe); - + xml_write_overall_header(file, xmlout, movie, sampleframe); fprintf(xmlout, ""); return 0; } /* ------------- */ -int xml_write_overall_header(FILE *xmlout, mj2_movie_t * movie) +int xml_write_overall_header(FILE *file, FILE *xmlout, mj2_movie_t * movie, unsigned int sampleframe) { int i; char buf[5]; buf[4] = '\0'; + fprintf(xmlout, " \n"); // Called after structure initialized by mj2_read_ftyp fprintf(xmlout, " \n"); @@ -153,6 +143,22 @@ int xml_write_overall_header(FILE *xmlout, mj2_movie_t * movie) } fprintf(xmlout, " \n"); fprintf(xmlout, " \n"); + xml_write_moov(file, xmlout, movie, sampleframe); + // To come? // This is the container for media data that can also be accessed through track structures, + // so is redundant, and simply not of interest as metadata + // // Allows incremental build up of movie. Probably not in Simple Profile + xml_write_free_and_skip(xmlout, movie); /* NO OP so far */ /* May be a place where user squirrels metadata */ + xml_write_uuid(xmlout, movie); /* NO OP so far */ /* May be a place where user squirrels metadata */ + return 0; +} + +/* ------------- */ + +int xml_write_moov(FILE *file, FILE *xmlout, mj2_movie_t * movie, unsigned int sampleframe) +{ + unsigned int tnum; + mj2_tk_t *track; + fprintf(xmlout, " \n"); fprintf(xmlout, " \n"); fprintf(xmlout, " \n"); @@ -243,35 +249,38 @@ int xml_write_overall_header(FILE *xmlout, mj2_movie_t * movie) fprintf(xmlout, " 0x%08x\n", movie->trans_matrix[8]); fprintf(xmlout, " \n"); fprintf(xmlout, " \n"); - // Done elsewhere: one or more - // to come: // possibly not in Simple Profile - xml_write_moov_udta(xmlout, movie); /* NO OP so far */ /* contains */ - - fprintf(xmlout, " \n"); - // To come? // This is the container for media data that can also be accessed through track structures, - // so is redundant, and simply not of interest as metadata - // // Allows incremental build up of movie. Probably not in Simple Profile - xml_write_free_and_skip(xmlout, movie); /* NO OP so far */ /* May be a place where user squirrels metadata */ - xml_write_uuid(xmlout, movie); /* NO OP so far */ /* May be a place where user squirrels metadata */ - - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n", movie->num_vtk); - fprintf(xmlout, " \n", movie->num_stk); - fprintf(xmlout, " %d\n", movie->num_htk); + + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n", movie->num_vtk); + fprintf(xmlout, " \n", movie->num_stk); + fprintf(xmlout, " %d\n", movie->num_htk); if(notes) - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); /* See Part 3 Amend 2 Section 4.2 for relation of MJ2 to Part 12 Sections 7 and 10 hints */ - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); /* Idea for the future: It would be possible to add code to verify that the file values: 1) are legal and self-consistent 2) comply with particular JP2 and/or MJ2 profiles. This could be reported here as additional XML elements */ + + // Find first video track + tnum = 0; + while (movie->tk[tnum].track_type != 0) + tnum ++; + + track = &(movie->tk[tnum]); + // For now, output info on first video track + xml_write_trak(file, xmlout, track, tnum, sampleframe); + + // to come: // possibly not in Simple Profile + xml_write_moov_udta(xmlout, movie); /* NO OP so far */ /* contains */ + fprintf(xmlout, " \n"); return 0; } -/* ------------- */ +/* --------------- */ void uint_to_chars(unsigned int value, char* buf) { @@ -413,7 +422,7 @@ void xml_write_uuid(FILE* xmlout, mj2_movie_t * movie) { void xml_write_trak(FILE* file, FILE* xmlout, mj2_tk_t *track, unsigned int tnum, unsigned int sampleframe) { - fprintf(xmlout, " \n", tnum); + fprintf(xmlout, " \n", tnum); xml_write_tkhd(file, xmlout, track, tnum); // TO DO: TrackReferenceContainer 'tref' just used in hint track // TO DO: EditListContainer 'edts', contains EditList 'elst' with media-time, segment-duration, media-rate @@ -437,96 +446,96 @@ void xml_write_trak(FILE* file, FILE* xmlout, mj2_tk_t *track, unsigned int tnum return; /* Not great error handling here */ } } - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } /* ------------- */ void xml_write_tkhd(FILE* file, FILE* xmlout, mj2_tk_t *track, unsigned int tnum) { - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } - fprintf(xmlout, " %u\n", track->track_ID); + fprintf(xmlout, " %u\n", track->track_ID); if(track->track_type==0) /* For visual track */ { - fprintf(xmlout, " %d\n", track->layer); + fprintf(xmlout, " %d\n", track->layer); if(notes) - fprintf(xmlout," \n"); + fprintf(xmlout," \n"); } if(track->track_type!=0) /* volume irrelevant for visual track */ { #ifdef CURRENTSTRUCT track->volume = track->volume << 8; #endif - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); if(notes) { - fprintf(xmlout," \n"); - fprintf(xmlout," \n"); + fprintf(xmlout," \n"); + fprintf(xmlout," \n"); } if(raw) - fprintf(xmlout," 0x%04x\n", track->volume); + fprintf(xmlout," 0x%04x\n", track->volume); if(derived) - fprintf(xmlout," %6.3f\n", (double)track->volume/(double)0x0100); - fprintf(xmlout, " \n"); + fprintf(xmlout," %6.3f\n", (double)track->volume/(double)0x0100); + fprintf(xmlout, " \n"); #ifdef CURRENTSTRUCT if(notes) - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); track->volume = track->volume >> 8; #endif } if(track->track_type==0) { /* Transformation matrix for video */ - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); if(notes) { - fprintf(xmlout," \n"); - fprintf(xmlout," \n"); + fprintf(xmlout," \n"); + fprintf(xmlout," \n"); } - fprintf(xmlout, " 0x%08x\n", track->trans_matrix[0]); - fprintf(xmlout, " 0x%08x\n", track->trans_matrix[1]); - fprintf(xmlout, " 0x%08x\n", track->trans_matrix[2]); - fprintf(xmlout, " 0x%08x\n", track->trans_matrix[3]); - fprintf(xmlout, " 0x%08x\n", track->trans_matrix[4]); - fprintf(xmlout, " 0x%08x\n", track->trans_matrix[5]); - fprintf(xmlout, " 0x%08x\n", track->trans_matrix[6]); - fprintf(xmlout, " 0x%08x\n", track->trans_matrix[7]); - fprintf(xmlout, " 0x%08x\n", track->trans_matrix[8]); - fprintf(xmlout, " \n"); + fprintf(xmlout, " 0x%08x\n", track->trans_matrix[0]); + fprintf(xmlout, " 0x%08x\n", track->trans_matrix[1]); + fprintf(xmlout, " 0x%08x\n", track->trans_matrix[2]); + fprintf(xmlout, " 0x%08x\n", track->trans_matrix[3]); + fprintf(xmlout, " 0x%08x\n", track->trans_matrix[4]); + fprintf(xmlout, " 0x%08x\n", track->trans_matrix[5]); + fprintf(xmlout, " 0x%08x\n", track->trans_matrix[6]); + fprintf(xmlout, " 0x%08x\n", track->trans_matrix[7]); + fprintf(xmlout, " 0x%08x\n", track->trans_matrix[8]); + fprintf(xmlout, " \n"); } #ifdef CURRENTSTRUCT track->w = track->w << 16; track->h = track->h << 16; #endif if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); if(raw) - fprintf(xmlout, " 0x%08x\n", track->w); + fprintf(xmlout, " 0x%08x\n", track->w); if(derived) - fprintf(xmlout, " %12.6f\n", (double)track->w/(double)0x00010000); /* Rate to play presentation (default = 0x00010000) */ - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " %12.6f\n", (double)track->w/(double)0x00010000); /* Rate to play presentation (default = 0x00010000) */ + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); if(raw) - fprintf(xmlout, " 0x%08x\n", track->h); + fprintf(xmlout, " 0x%08x\n", track->h); if(derived) - fprintf(xmlout, " %12.6f\n", (double)track->h/(double)0x00010000); /* Rate to play presentation (default = 0x00010000) */ - fprintf(xmlout, " \n"); + fprintf(xmlout, " %12.6f\n", (double)track->h/(double)0x00010000); /* Rate to play presentation (default = 0x00010000) */ + fprintf(xmlout, " \n"); #ifdef CURRENTSTRUCT if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } track->w = track->w >> 16; track->h = track->h >> 16; #endif - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } /* ------------- */ @@ -544,16 +553,16 @@ void xml_write_udta(FILE* file, FILE* xmlout, mj2_tk_t *track, unsigned int tnum if(track->udta != 1) return; /* Not present */ - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); for(i = 0; i < track->copyright_count; i++) { - fprintf(xmlout, " Instance=\"%d\">\n", i+1); + fprintf(xmlout, " Instance=\"%d\">\n", i+1); int16_to_3packedchars((short int)track->copyright_languages[i], buf); - fprintf(xmlout, " %s\n", buf); /* 3 chars */ - fprintf(xmlout, " %s\n",track->copyright_notices[i]); - fprintf(xmlout, " \n", i+1); + fprintf(xmlout, " %s\n", buf); /* 3 chars */ + fprintf(xmlout, " %s\n",track->copyright_notices[i]); + fprintf(xmlout, " \n", i+1); } /* TO DO: Non-standard boxes */ - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); #endif } @@ -565,165 +574,165 @@ void xml_write_mdia(FILE* file, FILE* xmlout, mj2_tk_t *track, unsigned int tnum int i, k; buf[4] = '\0'; - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); if(raw) - fprintf(xmlout, " %u\n", track->creation_time); + fprintf(xmlout, " %u\n", track->creation_time); if(notes) - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); /* 2082844800 = seconds between 1/1/04 and 1/1/70 */ /* There's still a time zone offset problem not solved... but spec is ambigous as to whether stored time should be local or UTC */ if(derived) { - fprintf(xmlout, " "); + fprintf(xmlout, " "); xml_time_out(xmlout, track->creation_time - 2082844800); fprintf(xmlout,"\n"); } - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); if(raw) - fprintf(xmlout, " %u\n", track->modification_time); + fprintf(xmlout, " %u\n", track->modification_time); if(derived) { - fprintf(xmlout, " "); + fprintf(xmlout, " "); xml_time_out(xmlout, track->modification_time - 2082844800); fprintf(xmlout,"\n"); } - fprintf(xmlout, " \n"); - fprintf(xmlout, " %d\n", track->timescale); + fprintf(xmlout, " \n"); + fprintf(xmlout, " %d\n", track->timescale); if(notes) - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); if(raw) - fprintf(xmlout, " %u\n", track->duration); + fprintf(xmlout, " %u\n", track->duration); if(derived) - fprintf(xmlout, " %12.3f\n", (double)track->duration/(double)track->timescale); // Make this double later to get fractional seconds - fprintf(xmlout, " \n"); + fprintf(xmlout, " %12.3f\n", (double)track->duration/(double)track->timescale); // Make this double later to get fractional seconds + fprintf(xmlout, " \n"); int16_to_3packedchars((short int)track->language, buf); - fprintf(xmlout, " %s\n", buf); /* 3 chars */ - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " %s\n", buf); /* 3 chars */ + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); switch(track->track_type) { case 0: - fprintf(xmlout, " video media track\n"); break; + fprintf(xmlout, " video media track\n"); break; case 1: - fprintf(xmlout, " Sound\n"); break; + fprintf(xmlout, " Sound\n"); break; case 2: - fprintf(xmlout, " Hint\n"); break; + fprintf(xmlout, " Hint\n"); break; } if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); switch(track->track_type) { case 0: - fprintf(xmlout, " \n"); - fprintf(xmlout, " 0x%02x\n", track->graphicsmode); + fprintf(xmlout, " \n"); + fprintf(xmlout, " 0x%02x\n", track->graphicsmode); if(notes) { - fprintf(xmlout," \n"); - fprintf(xmlout," \n"); - fprintf(xmlout," \n"); - fprintf(xmlout," \n"); -/* fprintf(xmlout," \n"); This was evidently dropped upon amendment */ - fprintf(xmlout," \n"); - fprintf(xmlout," \n"); + fprintf(xmlout," \n"); + fprintf(xmlout," \n"); + fprintf(xmlout," \n"); + fprintf(xmlout," \n"); +/* fprintf(xmlout," \n"); This was evidently dropped upon amendment */ + fprintf(xmlout," \n"); + fprintf(xmlout," \n"); } - fprintf(xmlout, " \n"); - fprintf(xmlout, " 0x%02x\n", track->opcolor[0]); - fprintf(xmlout, " 0x%02x\n",track->opcolor[1]); - fprintf(xmlout, " 0x%02x\n",track->opcolor[2]); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " 0x%02x\n", track->opcolor[0]); + fprintf(xmlout, " 0x%02x\n",track->opcolor[1]); + fprintf(xmlout, " 0x%02x\n",track->opcolor[2]); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); break; case 1: - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); #ifdef CURRENTSTRUCT track->balance = track->balance << 8; #endif - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); if(notes) { - fprintf(xmlout," \n"); - fprintf(xmlout," \n"); - fprintf(xmlout," \n"); + fprintf(xmlout," \n"); + fprintf(xmlout," \n"); + fprintf(xmlout," \n"); } if(raw) - fprintf(xmlout," 0x%04x\n", track->balance); + fprintf(xmlout," 0x%04x\n", track->balance); if(derived) - fprintf(xmlout," %6.3f\n", (double)track->balance/(double)0x0100); - fprintf(xmlout, " \n"); + fprintf(xmlout," %6.3f\n", (double)track->balance/(double)0x0100); + fprintf(xmlout, " \n"); #ifdef CURRENTSTRUCT if(notes) - fprintf(xmlout," \n"); + fprintf(xmlout," \n"); track->balance = track->balance >> 8; #endif - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); break; case 2: - fprintf(xmlout, " \n"); - fprintf(xmlout, " %d\n", track->maxPDUsize); + fprintf(xmlout, " \n"); + fprintf(xmlout, " %d\n", track->maxPDUsize); if(notes) - fprintf(xmlout," \n"); - fprintf(xmlout, " %d\n", track->avgPDUsize); + fprintf(xmlout," \n"); + fprintf(xmlout, " %d\n", track->avgPDUsize); if(notes) - fprintf(xmlout," \n"); - fprintf(xmlout, " %d\n", track->maxbitrate); + fprintf(xmlout," \n"); + fprintf(xmlout, " %d\n", track->maxbitrate); if(notes) - fprintf(xmlout," \n"); - fprintf(xmlout, " %d\n", track->avgbitrate); + fprintf(xmlout," \n"); + fprintf(xmlout, " %d\n", track->avgbitrate); if(notes) - fprintf(xmlout," \n"); - fprintf(xmlout, " %d\n", track->slidingavgbitrate); + fprintf(xmlout," \n"); + fprintf(xmlout, " %d\n", track->slidingavgbitrate); if(notes) - fprintf(xmlout," \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout," \n"); + fprintf(xmlout, " \n"); break; } - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n", track->num_url, track->num_urn); // table w. flags, URLs, URNs + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n", track->num_url, track->num_urn); // table w. flags, URLs, URNs // Data structure does not distinguish between single URL, single URN, or DREF table or URLs & URNs. // We could infer those, but for now just present everything as a DREF table. if(notes) - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); for(k = 0; k < track->num_url; k++) { - fprintf(xmlout, " \n"); // table w. flags, URLs, URNs + fprintf(xmlout, " \n"); // table w. flags, URLs, URNs if(notes) - fprintf(xmlout," \n"); + fprintf(xmlout," \n"); for(i = 0; i < 4; i++) { uint_to_chars(track->url[track->num_url].location[i], buf); - fprintf(xmlout, " %s\n"); + fprintf(xmlout, " %s\n"); } - fprintf(xmlout, " \n"); // table w. flags, URLs, URNs + fprintf(xmlout, " \n"); // table w. flags, URLs, URNs } for(k = 0; k < track->num_urn; k++) { - fprintf(xmlout," \n"); // table w. flags, URLs, URNs + fprintf(xmlout," \n"); // table w. flags, URLs, URNs // Only the first 16 bytes are recorded in the data structure currently. if(notes) - fprintf(xmlout," \n"); - fprintf(xmlout, " "); + fprintf(xmlout," \n"); + fprintf(xmlout, " "); for(i = 0; i < 4; i++) { uint_to_chars(track->urn[track->num_urn].name[i], buf); fprintf(xmlout,"%s", buf); } fprintf(xmlout, "\n"); - fprintf(xmlout, " "); + fprintf(xmlout, " "); for(i = 0; i < 4; i++) { uint_to_chars(track->urn[track->num_urn].location[i], buf); fprintf(xmlout,"%s"); } fprintf(xmlout, "\n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); xml_write_stbl(file, xmlout, track, tnum); /* SampleTable */ - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } /* ------------- */ @@ -734,42 +743,42 @@ void xml_write_stbl(FILE* file, FILE* xmlout, mj2_tk_t *track, unsigned int tnum int i, len; buf[4] = '\0'; - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); if(notes) - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); switch(track->track_type) { case 0: // There could be multiple instances of this, but "entry_count" is just a local at read-time. // And it's used wrong, too, as count of just visual type, when it's really all 3 types. // This is referred to as "smj2" within mj2.c - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } /* No shifting required. If CURRENTSTRUCT gets changed, then may need to revisit treatment of these */ - fprintf(xmlout, " %d\n", track->w); - fprintf(xmlout, " %d\n", track->h); + fprintf(xmlout, " %d\n", track->w); + fprintf(xmlout, " %d\n", track->h); // Horizresolution and vertresolution don't require shifting, already stored right in CURRENTSTRUCT if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); if(raw) - fprintf(xmlout, " 0x%08x\n", track->horizresolution); + fprintf(xmlout, " 0x%08x\n", track->horizresolution); if(derived) - fprintf(xmlout, " %12.6f\n", (double)track->horizresolution/(double)0x00010000); /* Rate to play presentation (default = 0x00010000) */ - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " %12.6f\n", (double)track->horizresolution/(double)0x00010000); /* Rate to play presentation (default = 0x00010000) */ + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); if(raw) - fprintf(xmlout, " 0x%08x\n", track->vertresolution); + fprintf(xmlout, " 0x%08x\n", track->vertresolution); if(derived) - fprintf(xmlout, " %12.6f\n", (double)track->vertresolution/(double)0x00010000); /* Rate to play presentation (default = 0x00010000) */ - fprintf(xmlout, " \n"); + fprintf(xmlout, " %12.6f\n", (double)track->vertresolution/(double)0x00010000); /* Rate to play presentation (default = 0x00010000) */ + fprintf(xmlout, " \n"); buf33[0] = '\0'; for(i = 0; i < 8; i++) { @@ -778,147 +787,147 @@ void xml_write_stbl(FILE* file, FILE* xmlout, mj2_tk_t *track, unsigned int tnum } len = (int)buf33[0]; /* First byte has string length in bytes. There may be garbage beyond it. */ buf33[len+1] = '\0'; /* Suppress it */ - fprintf(xmlout, " %s\n", buf33+1); /* Start beyond first byte */ + fprintf(xmlout, " %s\n", buf33+1); /* Start beyond first byte */ if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } - fprintf(xmlout, " 0x%02x\n",track->depth); + fprintf(xmlout, " 0x%02x\n",track->depth); if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } xml_out_frame_jp2h(xmlout, &(track->jp2_struct)); /* JP2 Header */ /* Following subboxes are optional */ - fprintf(xmlout, " \n"); - fprintf(xmlout, " %d\n", (unsigned int)track->fieldcount); /* uchar as 1 byte uint */ + fprintf(xmlout, " \n"); + fprintf(xmlout, " %d\n", (unsigned int)track->fieldcount); /* uchar as 1 byte uint */ if(notes) - fprintf(xmlout, " \n"); - fprintf(xmlout, " %d\n", (unsigned int)track->fieldorder); /* uchar as 1 byte uint */ + fprintf(xmlout, " \n"); + fprintf(xmlout, " %d\n", (unsigned int)track->fieldorder); /* uchar as 1 byte uint */ if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); - fprintf(xmlout, " \n",track->num_br); + fprintf(xmlout, " \n",track->num_br); for (i = 0; i < track->num_br; i++) /* read routine stored in reverse order, so let's undo damage */ { uint_to_chars(track->br[i], buf); - fprintf(xmlout, " %s\n", buf); /*4 characters, each CLi */ + fprintf(xmlout, " %s\n", buf); /*4 characters, each CLi */ } - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); - fprintf(xmlout, " \n",track->num_jp2x); + fprintf(xmlout, " \n",track->num_jp2x); for (i = 0; i < track->num_jp2x; i++) { // We'll probably need better formatting than this - fprintf(xmlout, " 0x%02x\n", track->jp2xdata[i]); /* Each entry is single byte */ + fprintf(xmlout, " 0x%02x\n", track->jp2xdata[i]); /* Each entry is single byte */ } - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); /* These values are all 1 byte */ + fprintf(xmlout, " \n"); /* These values are all 1 byte */ if(notes) - fprintf(xmlout, " \n"); - fprintf(xmlout, " %d\n", track->hsub); - fprintf(xmlout, " %d\n", track->vsub); - fprintf(xmlout, " %d\n", track->hoff); - fprintf(xmlout, " %d\n", track->voff); + fprintf(xmlout, " \n"); + fprintf(xmlout, " %d\n", track->hsub); + fprintf(xmlout, " %d\n", track->vsub); + fprintf(xmlout, " %d\n", track->hoff); + fprintf(xmlout, " %d\n", track->voff); if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } - fprintf(xmlout, " \n"); /* These values are all 1 byte */ + fprintf(xmlout, " \n"); /* These values are all 1 byte */ - fprintf(xmlout, " \n"); /* Part III Appx. 2 */ - fprintf(xmlout, " %u\n", (unsigned int)track->or_fieldcount); /* uchar as 1-byte uint */ + fprintf(xmlout, " \n"); /* Part III Appx. 2 */ + fprintf(xmlout, " %u\n", (unsigned int)track->or_fieldcount); /* uchar as 1-byte uint */ if(notes) - fprintf(xmlout, " \n"); - fprintf(xmlout, " %u\n", (unsigned int)track->or_fieldorder); /* uchar as 1-byte uint */ + fprintf(xmlout, " \n"); + fprintf(xmlout, " %u\n", (unsigned int)track->or_fieldorder); /* uchar as 1-byte uint */ if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); break; case 1: case 2: if(notes) - fprintf(xmlout, " \n"); break; + fprintf(xmlout, " \n"); break; } - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " %d\n", track->num_samples); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " %d\n", track->num_samples); if(notes) - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n", track->num_tts); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n", track->num_tts); for (i = 0; i < track->num_tts; i++) { - fprintf(xmlout, " \n", + fprintf(xmlout, "
\n", i+1, track->tts[i].sample_count, track->tts[i].sample_delta); } - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); - fprintf(xmlout, " \n", track->num_samplestochunk); + fprintf(xmlout, " \n", track->num_samplestochunk); for (i = 0; i < track->num_samplestochunk; i++) { - fprintf(xmlout, " %u\n",track->sampletochunk[i].first_chunk); /* 4 bytes */ - fprintf(xmlout, " %u\n",track->sampletochunk[i].samples_per_chunk); /* 4 bytes */ - fprintf(xmlout, " %u\n",track->sampletochunk[i].sample_descr_idx); /* 4 bytes */ + fprintf(xmlout, " %u\n",track->sampletochunk[i].first_chunk); /* 4 bytes */ + fprintf(xmlout, " %u\n",track->sampletochunk[i].samples_per_chunk); /* 4 bytes */ + fprintf(xmlout, " %u\n",track->sampletochunk[i].sample_descr_idx); /* 4 bytes */ } - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); // After reading this info in, track->num_chunks is calculated and a decompressed table established internally. - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); if(track->same_sample_size) { // all values in track->sample[i].sample_size are equal. Grab the first one. - fprintf(xmlout, " %u\n", track->sample[0].sample_size); + fprintf(xmlout, " %u\n", track->sample[0].sample_size); if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } } else { - fprintf(xmlout, " 0\n"); + fprintf(xmlout, " 0\n"); if(notes) if(sampletables) - fprintf(xmlout," \n"); + fprintf(xmlout," \n"); else - fprintf(xmlout," \n"); - fprintf(xmlout, " %u\n", track->num_samples); + fprintf(xmlout," \n"); + fprintf(xmlout, " %u\n", track->num_samples); if(sampletables) for (i = 0; i < (int)track->num_samples; i++) { - fprintf(xmlout, " %u\n", i+1, track->sample[i].sample_size); + fprintf(xmlout, " %u\n", i+1, track->sample[i].sample_size); } } - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); // Structure not yet - Variant ChunkLargeOffset 'co64' - fprintf(xmlout, " %u\n", track->num_chunks); + fprintf(xmlout, " %u\n", track->num_chunks); if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } if(sampletables) for (i = 0; i < (int)track->num_chunks; i++) - fprintf(xmlout, " %u\n", i+1, track->chunk[i].offset); - fprintf(xmlout, " \n"); + fprintf(xmlout, " %u\n", i+1, track->chunk[i].offset); + fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } /* ------------- */ @@ -950,12 +959,12 @@ int xml_out_frame(FILE* file, FILE* xmlout, mj2_sample_t *sample, unsigned int s } numcomps = img.numcomps; -/* Alignments: " < To help maintain xml pretty-printing */ - fprintf(xmlout, " \n", snum+1); - fprintf(xmlout, " \n"); +/* Alignments: " < To help maintain xml pretty-printing */ + fprintf(xmlout, " \n", snum+1); + fprintf(xmlout, " \n"); /* There can be multiple codestreams; a particular image is entirely within a single codestream */ /* TO DO: A frame can be represented by two I-guess-contigious codestreams if its interleaved. */ - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); /* "cp" stands for "coding parameter"; "tcp" is tile coding parameters, "tccp" is tile-component coding parameters */ xml_out_frame_siz(xmlout, &img, &cp); /* reqd in main */ xml_out_frame_cod(xmlout, &j2k_default_tcp); /* reqd in main */ @@ -973,14 +982,14 @@ int xml_out_frame(FILE* file, FILE* xmlout, mj2_sample_t *sample, unsigned int s xml_out_frame_crg(xmlout); /* NO-OP. CRG NOT SAVED IN DATA STRUCTURE */ /* opt in main; */ xml_out_frame_com(xmlout, &j2k_default_tcp); /* NO-OP. COM NOT SAVED IN DATA STRUCTURE */ /* opt in main; */ - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); /* TO DO: all the tile headers (sigh) */ - fprintf(xmlout, " \n", cp.tileno_size); /* size of the vector tileno */ + fprintf(xmlout, " \n", cp.tileno_size); /* size of the vector tileno */ for(i = 0; i < cp.tileno_size; i++) { /* I think cp.tileno_size will be same number as (cp.tw * cp.th) or as global j2k_curtileno */ // Standard seems to use zero-based # for tile-part. - fprintf(xmlout, " \n", i, cp.tileno[i]); /* ID number of the tiles present in the codestream */ - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n", i, cp.tileno[i]); /* ID number of the tiles present in the codestream */ + fprintf(xmlout, " \n"); /* All markers in tile-part headers (between SOT and SOD) are optional, unless structure requires. */ if(i == 0) { xml_out_frame_cod(xmlout, &(cp.tcps[i])); /* No more than 1 per tile */ @@ -996,13 +1005,13 @@ int xml_out_frame(FILE* file, FILE* xmlout, mj2_sample_t *sample, unsigned int s xml_out_frame_plt(xmlout, &(cp.tcps[i])); /* NO-OP. PLT NOT SAVED IN DATA STRUCTURE */ /* Can be used in conjunction with main's PLM */ xml_out_frame_com(xmlout, &(cp.tcps[i])); /* NO-OP. COM NOT SAVED IN DATA STRUCTURE */ /* j2k_tcp_t * cp.tcps; "tile coding parameters" */ - /* Maybe not: fprintf(xmlout, " <>%d, cp.matrice[i]; */ /* Fixed layer */ - fprintf(xmlout, " \n"); + /* Maybe not: fprintf(xmlout, " <>%d, cp.matrice[i]; */ /* Fixed layer */ + fprintf(xmlout, " \n"); if(notes) - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } - fprintf(xmlout, " \n"); /* size of the vector tileno */ + fprintf(xmlout, " \n"); /* size of the vector tileno */ #ifdef NOTYET IMAGINE the cp object has data to support the following... but we could use an new different data structure instead @@ -1014,23 +1023,23 @@ int xml_out_frame(FILE* file, FILE* xmlout, mj2_sample_t *sample, unsigned int s xml_out_frame_uinf(xmlout, &cp); /* UUIDInfo 'uinf', includes UUIDList 'ulst' and URL 'url\40' */ #endif - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); /* Extra commentary: */ if(notes) { - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); if (((img.numcomps == 3) && (img.comps[0].dx == img.comps[1].dx / 2) && (img.comps[0].dx == img.comps[2].dx / 2 ) && (img.comps[0].dx == 1)) || (img.numcomps == 1)) { - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } else if ((img.numcomps == 3) && (img.comps[0].dx == 1) && (img.comps[1].dx == 1)&& (img.comps[2].dx == 1)) {// If YUV 4:4:4 input --> to bmp - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } else { - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } } @@ -1066,64 +1075,64 @@ void xml_out_frame_siz(FILE* xmlout, j2k_image_t *img, j2k_cp_t *cp) j2k_comp_t *comp; int i; - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); // This is similar to j2k.c's j2k_dump_image. // Not of interest: Lsiz, Rsiz - fprintf(xmlout, " %d\n", img->x1); - fprintf(xmlout, " %d\n", img->y1); + fprintf(xmlout, " %d\n", img->x1); + fprintf(xmlout, " %d\n", img->y1); if(notes) - fprintf(xmlout, " \n"); - fprintf(xmlout, " %d\n", img->x0); - fprintf(xmlout, " %d\n", img->y0); + fprintf(xmlout, " \n"); + fprintf(xmlout, " %d\n", img->x0); + fprintf(xmlout, " %d\n", img->y0); if(notes) - fprintf(xmlout, " \n"); - fprintf(xmlout, " %d\n", cp->tdx); - fprintf(xmlout, " %d\n", cp->tdy); + fprintf(xmlout, " \n"); + fprintf(xmlout, " %d\n", cp->tdx); + fprintf(xmlout, " %d\n", cp->tdy); if(notes) - fprintf(xmlout, " \n"); - fprintf(xmlout, " %d\n", cp->tx0); - fprintf(xmlout, " %d\n", cp->ty0); + fprintf(xmlout, " \n"); + fprintf(xmlout, " %d\n", cp->tx0); + fprintf(xmlout, " %d\n", cp->ty0); if(notes) - fprintf(xmlout, " \n"); - fprintf(xmlout, " %d\n", img->numcomps); + fprintf(xmlout, " \n"); + fprintf(xmlout, " %d\n", img->numcomps); if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - //fprintf(xmlout," \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + //fprintf(xmlout," \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } for (i = 0; i < img->numcomps; i++) {/* image-components */ comp = &(img->comps[i]); - fprintf(xmlout, " \n", i+1); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n", i+1); + fprintf(xmlout, " \n"); if(raw) - fprintf(xmlout," 0x%02x\n", (comp->sgnd << 7) & (comp->prec - 1)); + fprintf(xmlout," 0x%02x\n", (comp->sgnd << 7) & (comp->prec - 1)); if(derived) { - fprintf(xmlout," %d\n", comp->sgnd); - fprintf(xmlout," %d\n", comp->prec); + fprintf(xmlout," %d\n", comp->sgnd); + fprintf(xmlout," %d\n", comp->prec); } - fprintf(xmlout, " \n"); - fprintf(xmlout, " %d\n", comp->dx); - fprintf(xmlout, " %d\n", comp->dy); - fprintf(xmlout, " %d\n", comp->w); - fprintf(xmlout, " %d\n", comp->h); + fprintf(xmlout, " \n"); + fprintf(xmlout, " %d\n", comp->dx); + fprintf(xmlout, " %d\n", comp->dy); + fprintf(xmlout, " %d\n", comp->w); + fprintf(xmlout, " %d\n", comp->h); /* Rest of these aren't calculated when SIZ is read: - fprintf(xmlout, " %d\n", comp->x0); - fprintf(xmlout, " %d\n", comp->y0); + fprintf(xmlout, " %d\n", comp->x0); + fprintf(xmlout, " %d\n", comp->y0); if(notes) - fprintf(xmlout," \n"); - fprintf(xmlout, " %d\n", comp->bpp); - fprintf(xmlout, " %d\n", comp->resno_decoded); */ + fprintf(xmlout," \n"); + fprintf(xmlout, " %d\n", comp->bpp); + fprintf(xmlout, " %d\n", comp->resno_decoded); */ // SUPPRESS: n/a to mj2_to_metadata. fprintf(xmlout," %dfactor); /* factor = number of division by 2 of the out image compare to the original size of image */ // TO DO comp->data: int *data; /* image-component data */ - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } /* ------------- */ @@ -1132,14 +1141,14 @@ void xml_out_frame_cod(FILE* xmlout, j2k_tcp_t *tcp) { /* Could be called with tcp = &j2k_default_tcp; /* Or, for tile-part header, with &j2k_cp->tcps[j2k_curtileno] -/* Alignment for main:" < < < < To help maintain xml pretty-printing */ -/* Alignment for tile:" < < < To help maintain xml pretty-printing */ +/* Alignment for main:" < < < < To help maintain xml pretty-printing */ +/* Alignment for tile:" < < < To help maintain xml pretty-printing */ j2k_tccp_t *tccp; int i; - char spaces[11] = " "; /* 10 spaces if tilepart*/ + char spaces[13] = " "; /* 12 spaces if tilepart*/ char* s = spaces; if(tcp == &j2k_default_tcp) { - s++;s++; /* shorten s to 8 spaces if main */ + s++;s++; /* shorten s to 10 spaces if main */ } tccp = &(tcp->tccps[0]); @@ -1212,11 +1221,16 @@ void xml_out_frame_cod(FILE* xmlout, j2k_tcp_t *tcp) /* ------------- */ -void xml_out_frame_coc(FILE* xmlout, j2k_tcp_t *tcp, int numcomps) +void xml_out_frame_coc(FILE* xmlout, j2k_tcp_t *tcp, int numcomps) /* Optional in main & tile-part headers */ { /* Uses global j2k_default_tcp */ j2k_tccp_t *tccp, *firstcomp_tccp; int i, compno; + char spaces[13] = " "; /* 12 spaces if tilepart*/ + char* s = spaces; + if(tcp == &j2k_default_tcp) { + s++;s++; /* shorten s to 10 spaces if main */ + } firstcomp_tccp = &(tcp->tccps[0]); /* Internal data structure tccp defines separate defaults for each component, set from main */ @@ -1225,11 +1239,11 @@ void xml_out_frame_coc(FILE* xmlout, j2k_tcp_t *tcp, int numcomps) /* We don't really know which was the default, and which were not */ /* Let's pretend that [0] is the default and all others are not */ if(notes) { - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s\n", s); if(tcp == &j2k_default_tcp) - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s\n", s); else - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s\n", s); } for (compno = 1; compno < numcomps; compno++) /* spec says components are zero-based */ { @@ -1237,18 +1251,18 @@ void xml_out_frame_coc(FILE* xmlout, j2k_tcp_t *tcp, int numcomps) if(same_component_style(firstcomp_tccp, tccp)) continue; -/* Alignments: " < < < < < To help maintain xml pretty-printing */ - fprintf(xmlout, " \n"); /* Optional in main header, at most 1 per component */ +/* Alignments: " < < < < < To help maintain xml pretty-printing */ + fprintf(xmlout, "%s\n", s); /* Optional in main header, at most 1 per component */ if(notes) - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); /* Overrides the main COD for the specific component */ /* Not retained or of interest: Lcod */ - fprintf(xmlout, " 0x%02x\n", tccp->csty); /* 1 byte */ + fprintf(xmlout, "%s 0x%02x\n", s, tccp->csty); /* 1 byte */ if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); } - fprintf(xmlout, " %d\n", compno); /* 1 or 2 bytes */ + fprintf(xmlout, "%s %d\n", s, compno); /* 1 or 2 bytes */ /* Unfortunately compo isn't retained in j2k_read_coc: compno = cio_read(j2k_img->numcomps <= 256 ? 1 : 2); /* Ccoc */ /*if(j2k_img_numcomps <=256) component is 1 byte @@ -1256,45 +1270,45 @@ void xml_out_frame_coc(FILE* xmlout, j2k_tcp_t *tcp, int numcomps) compno is 2 byte */ /* This code will compile only if declaration of j2k_default_tcp is changed from static (to implicit extern) in j2k.c */ - fprintf(xmlout, " \n"); - fprintf(xmlout, " %d\n", tccp->numresolutions - 1); /* 1 byte, SPcox (D) */ - fprintf(xmlout, " %d\n", tccp->cblkw - 2); /* 1 byte, SPcox (E) */ - fprintf(xmlout, " %d\n", tccp->cblkh - 2); /* 1 byte, SPcox (F) */ + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s %d\n", s, tccp->numresolutions - 1); /* 1 byte, SPcox (D) */ + fprintf(xmlout, "%s %d\n", s, tccp->cblkw - 2); /* 1 byte, SPcox (E) */ + fprintf(xmlout, "%s %d\n", s, tccp->cblkh - 2); /* 1 byte, SPcox (F) */ if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); } - fprintf(xmlout, " 0x%02x\n", tccp->cblksty); /* 1 byte, SPcox (G) */ + fprintf(xmlout, "%s 0x%02x\n", s, tccp->cblksty); /* 1 byte, SPcox (G) */ if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); } - fprintf(xmlout, " %d\n", tccp->qmfbid); /* 1 byte, SPcox (H) */ + fprintf(xmlout, "%s %d\n", s, tccp->qmfbid); /* 1 byte, SPcox (H) */ if(notes) - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); if (tccp->csty & J2K_CP_CSTY_PRT) { - fprintf(xmlout, " \n"); /* 1 byte, SPcox (I_i) */ + fprintf(xmlout, "%s \n", s); /* 1 byte, SPcox (I_i) */ if(notes) - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); for (i = 0; i < tccp->numresolutions-1; i++) { /* subtract 1 to get # of decomposition levels */ - fprintf(xmlout, " \n", i); + fprintf(xmlout, "%s \n", s, i); if(raw) - fprintf(xmlout," 0x%02x\n", (tccp->prch[i] << 4) | tccp->prcw[i]); /* packed into 1 byte, SPcox (G) */ + fprintf(xmlout,"%s 0x%02x\n", s, (tccp->prch[i] << 4) | tccp->prcw[i]); /* packed into 1 byte, SPcox (G) */ if(derived) { - fprintf(xmlout," %d\n", tccp->prcw[i]); - fprintf(xmlout," %d\n", tccp->prch[i]); + fprintf(xmlout,"%s %d\n", s, tccp->prcw[i]); + fprintf(xmlout,"%s %d\n", s, tccp->prch[i]); } - fprintf(xmlout, " \n", i); + fprintf(xmlout, "%s \n", s, i); } - fprintf(xmlout, " \n"); /* 1 byte, SPcox (I_i) */ + fprintf(xmlout, "%s \n", s); /* 1 byte, SPcox (I_i) */ } - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s\n", s); } } @@ -1331,121 +1345,126 @@ void xml_out_frame_qcd(FILE* xmlout, j2k_tcp_t *tcp) /* This code will compile only if declaration of j2k_default_tcp is changed from static (to implicit extern) in j2k.c */ j2k_tccp_t *tccp; int bandno, numbands; + char spaces[13] = " "; /* 12 spaces if tilepart*/ + char* s = spaces; + if(tcp == &j2k_default_tcp) { + s++;s++; /* shorten s to 10 spaces if main */ + } /* Compare j2k_read_qcx */ - fprintf(xmlout, " \n"); /* Required in main header, single occurrence */ + fprintf(xmlout, "%s\n", s); /* Required in main header, single occurrence */ tccp = &(tcp->tccps[0]); /* Not retained or of interest: Lqcd */ - fprintf(xmlout, " \n"); /* 1 byte */ + fprintf(xmlout, "%s \n", s); /* 1 byte */ if(notes) - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); if(raw) - fprintf(xmlout, " 0x%02x\n", (tccp->numgbits) << 5 | tccp->qntsty); + fprintf(xmlout, "%s 0x%02x\n", s, (tccp->numgbits) << 5 | tccp->qntsty); if(derived) - fprintf(xmlout, " %d\n", tccp->qntsty); + fprintf(xmlout, "%s %d\n", s, tccp->qntsty); if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); } if(derived) - fprintf(xmlout, " %d\n", tccp->numgbits); + fprintf(xmlout, "%s %d\n", s, tccp->numgbits); if(notes) - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); /* Problem: numbands in some cases is calculated from len, which is not retained or available here at this time */ /* So we'll just dump all internal values */ /* We could calculate it, but I'm having trouble believing the length equations in the standard */ - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); switch(tccp->qntsty) { case J2K_CCP_QNTSTY_NOQNT: /* no quantization */ /* This is what standard says, but I don't believe it: len = 4 + (3*decomp); */ numbands = J2K_MAXBANDS; /* should be: numbands = len - 1; */ /* Better: IMAGINE numbands = tccp->stepsize_numbands; */ /* Instead look for first zero exponent, quit there. Adequate? */ - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); } for (bandno = 0; bandno < numbands; bandno++) { if(tccp->stepsizes[bandno].expn == 0) break; /* Remove when we have real numbands */ - fprintf(xmlout, " \n", bandno); + fprintf(xmlout, "%s \n", s, bandno); if(raw) - fprintf(xmlout," 0x%02x\n", tccp->stepsizes[bandno].expn << 3); + fprintf(xmlout,"%s 0x%02x\n", s, tccp->stepsizes[bandno].expn << 3); if(derived) - fprintf(xmlout," %d\n", tccp->stepsizes[bandno].expn); - fprintf(xmlout, " \n"); + fprintf(xmlout,"%s %d\n", s, tccp->stepsizes[bandno].expn); + fprintf(xmlout, "%s \n", s); } - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); break; case J2K_CCP_QNTSTY_SIQNT: /* scalar quantization derived */ /* This is what standard says. Should I believe it:: len = 5; /* numbands = 1; */ - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); if(notes) - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); if(notes) - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); } for (bandno = 1; bandno < J2K_MAXBANDS; bandno++) { if(tccp->stepsizes[bandno].expn == 0) break; - fprintf(xmlout, " %d\n", bandno, tccp->stepsizes[bandno].expn); + fprintf(xmlout, "%s %d\n", s, bandno, tccp->stepsizes[bandno].expn); } - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); break; default: /* J2K_CCP_QNTSTY_SEQNT */ /* scalar quantization expounded */ /* This is what standard says, but should I believe it: len = 5 + 6*decomp; */ numbands = J2K_MAXBANDS; /* should be: (len - 1) / 2;*/ /* Better: IMAGINE numbands = tccp->stepsize_numbands; */ - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); } for (bandno = 0; bandno < numbands; bandno++) { if(tccp->stepsizes[bandno].expn == 0 && tccp->stepsizes[bandno].mant == 0) break; /* Remove when we have real numbands */ - fprintf(xmlout, " \n", bandno); + fprintf(xmlout, "%s \n", s, bandno); if(raw) - fprintf(xmlout," 0x%02x\n", (tccp->stepsizes[bandno].expn << 11) | tccp->stepsizes[bandno].mant); + fprintf(xmlout,"%s 0x%02x\n", s, (tccp->stepsizes[bandno].expn << 11) | tccp->stepsizes[bandno].mant); if(derived) { - fprintf(xmlout," %d\n", tccp->stepsizes[bandno].expn); - fprintf(xmlout," %d\n", tccp->stepsizes[bandno].mant); + fprintf(xmlout,"%s %d\n", s, tccp->stepsizes[bandno].expn); + fprintf(xmlout,"%s %d\n", s, tccp->stepsizes[bandno].mant); } - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); } - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); break; } /* switch */ - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s\n", s); /* Alignments: " < < < < < To help maintain xml pretty-printing */ } @@ -1459,6 +1478,11 @@ void xml_out_frame_qcc(FILE* xmlout, j2k_tcp_t *tcp, int numcomps) j2k_tccp_t *tccp, *firstcomp_tccp; int bandno, numbands; int compno; + char spaces[13] = " "; /* 12 spaces if tilepart*/ + char* s = spaces; + if(tcp == &j2k_default_tcp) { + s++;s++; /* shorten s to 10 spaces if main */ + } firstcomp_tccp = &(tcp->tccps[0]); /* Internal data structure tccp defines separate defaults for each component, set from main */ @@ -1467,11 +1491,11 @@ void xml_out_frame_qcc(FILE* xmlout, j2k_tcp_t *tcp, int numcomps) /* We don't really know which was the default, and which were not */ /* Let's pretend that [0] is the default and all others are not */ if(notes) { - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s\n", s); if(tcp == &j2k_default_tcp) - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s\n", s); else - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s\n", s); } for (compno = 1; compno < numcomps; compno++) /* spec says components are zero-based */ { @@ -1480,113 +1504,113 @@ void xml_out_frame_qcc(FILE* xmlout, j2k_tcp_t *tcp, int numcomps) continue; /* Compare j2k_read_qcx */ - fprintf(xmlout, " \n", compno); /* Required in main header, single occurrence */ + fprintf(xmlout, "%s\n", s, compno); /* Required in main header, single occurrence */ tccp = &j2k_default_tcp.tccps[0]; /* Not retained or perhaps of interest: Lqcd It maybe can be calculated. */ - fprintf(xmlout, " \n"); /* 1 byte */ + fprintf(xmlout, "%s \n", s); /* 1 byte */ if(notes) - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); if(raw) - fprintf(xmlout, " 0x%02x\n", (tccp->numgbits) << 5 | tccp->qntsty); + fprintf(xmlout, "%s 0x%02x\n", s, (tccp->numgbits) << 5 | tccp->qntsty); if(derived) - fprintf(xmlout, " %d\n", tccp->qntsty); + fprintf(xmlout, "%s %d\n", s, tccp->qntsty); if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); } if(derived) - fprintf(xmlout, " %d\n", tccp->numgbits); + fprintf(xmlout, "%s %d\n", s, tccp->numgbits); if(notes) - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); /* Problem: numbands in some cases is calculated from len, which is not retained or available here at this time */ /* So we'll just dump all internal values */ - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); switch(tccp->qntsty) { case J2K_CCP_QNTSTY_NOQNT: numbands = J2K_MAXBANDS; /* should be: numbands = len - 1; */ /* Better: IMAGINE numbands = tccp->stepsize_numbands; */ /* Instead look for first zero exponent, quit there. Adequate? */ - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); } for (bandno = 0; bandno < numbands; bandno++) { if(tccp->stepsizes[bandno].expn == 0) break; /* Remove this once we have real numbands */ - fprintf(xmlout, " \n", bandno); + fprintf(xmlout, "%s \n", s, bandno); if(raw) - fprintf(xmlout," 0x%02x\n", tccp->stepsizes[bandno].expn << 3); + fprintf(xmlout,"%s 0x%02x\n", s, tccp->stepsizes[bandno].expn << 3); if(derived) - fprintf(xmlout," %d\n", tccp->stepsizes[bandno].expn); - fprintf(xmlout, " \n"); + fprintf(xmlout,"%s %d\n", s, tccp->stepsizes[bandno].expn); + fprintf(xmlout, "%s \n", s); } - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); break; case J2K_CCP_QNTSTY_SIQNT: /* numbands = 1; */ - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); if(notes) - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); if(notes) - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); } for (bandno = 1; bandno < J2K_MAXBANDS; bandno++) { if(tccp->stepsizes[bandno].expn == 0) break; - fprintf(xmlout, " %d\n", bandno, tccp->stepsizes[bandno].expn); + fprintf(xmlout, "%s %d\n", s, bandno, tccp->stepsizes[bandno].expn); } - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); break; default: /* J2K_CCP_QNTSTY_SEQNT */ numbands = J2K_MAXBANDS; /* should be: (len - 1) / 2;*/ /* Better: IMAGINE numbands = tccp->stepsize_numbands; */ - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s \n", s); } for (bandno = 0; bandno < numbands; bandno++) { if(tccp->stepsizes[bandno].expn == 0 && tccp->stepsizes[bandno].mant == 0) break; /* Remove this once we have real numbands count */ - fprintf(xmlout, " \n", bandno); + fprintf(xmlout, "%s \n", s, bandno); if(raw) - fprintf(xmlout," 0x%02x\n", (tccp->stepsizes[bandno].expn << 11) | tccp->stepsizes[bandno].mant); + fprintf(xmlout,"%s 0x%02x\n", s, (tccp->stepsizes[bandno].expn << 11) | tccp->stepsizes[bandno].mant); if(derived) { - fprintf(xmlout," %d\n", tccp->stepsizes[bandno].expn); - fprintf(xmlout," %d\n", tccp->stepsizes[bandno].mant); + fprintf(xmlout,"%s %d\n", s, tccp->stepsizes[bandno].expn); + fprintf(xmlout,"%s %d\n", s, tccp->stepsizes[bandno].mant); } - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); } - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); break; } /* switch */ - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s\n", s); } /* Alignments: " < < < < < To help maintain xml pretty-printing */ } @@ -1637,24 +1661,30 @@ BOOL same_component_quantization(j2k_tccp_t *tccp1, j2k_tccp_t *tccp2) void xml_out_frame_rgn(FILE* xmlout, j2k_tcp_t *tcp, int numcomps) { int compno, SPrgn; - /* Don't know if MJ2 files can have regions of interest. Assume yes. */ + /* MJ2 files can have regions of interest if hybridized with JPX Part II */ + char spaces[13] = " "; /* 12 spaces if tilepart*/ + char* s = spaces; + if(tcp == &j2k_default_tcp) { + s++;s++; /* shorten s to 10 spaces if main */ + } + for(compno = 0; compno < numcomps; compno++) { SPrgn = tcp->tccps[compno].roishift; /* 1 byte; SPrgn */ if(SPrgn == 0) continue; /* Yet another kludge */ - fprintf(xmlout, " \n"); /* Optional in main header, at most 1 per component */ + fprintf(xmlout, "%s\n", s); /* Optional in main header, at most 1 per component */ if(notes) - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s\n", s); /* Not retained or of interest: Lrgd */ - fprintf(xmlout, " 0\n"); /* 1 byte */ + fprintf(xmlout, "%s 0\n", s); /* 1 byte */ if(notes) - fprintf(xmlout, " \n"); - fprintf(xmlout, " %d\n", compno); /* 1 or 2 bytes */ - fprintf(xmlout, " %d\n", SPrgn); /* 1 byte */ + fprintf(xmlout, "%s \n", s); + fprintf(xmlout, "%s %d\n", s, compno); /* 1 or 2 bytes */ + fprintf(xmlout, "%s %d\n", s, SPrgn); /* 1 byte */ if(notes) - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n", s); + fprintf(xmlout, "POC != 1) return; /* Not present */ - fprintf(xmlout, " \n"); /* Optional in main header, at most 1 per component */ + fprintf(xmlout, "%s\n", s); /* Optional in main header, at most 1 per component */ /* j2k_read_poc seems to allow accumulation of default pocs from multiple POC segments, but does the spec really allow that? */ /* 2 bytes, not retained; Lpoc */ /* I probably didn't get this dump precisely right. */ for (i = 0; i < tcp->numpocs; i++) { poc = &tcp->pocs[i]; - fprintf(xmlout, " \n", i+1); - fprintf(xmlout, " %d\n", poc->resno0); /* 1 byte, RSpoc_i */ + fprintf(xmlout, "%s \n", s, i+1); + fprintf(xmlout, "%S %d\n", s, poc->resno0); /* 1 byte, RSpoc_i */ if(notes) - fprintf(xmlout," \n"); - fprintf(xmlout, " %d\n", poc->compno0);/* j2k_img->numcomps <= 256 ? 1 byte : 2 bytes; CSpoc_i */ + fprintf(xmlout,"%s \n", s); + fprintf(xmlout, "%s %d\n", s, poc->compno0);/* j2k_img->numcomps <= 256 ? 1 byte : 2 bytes; CSpoc_i */ if(notes) - fprintf(xmlout," \n"); - fprintf(xmlout, " %d\n", poc->layno1); /* int_min(cio_read(2), tcp->numlayers); /* 2 bytes; LYEpoc_i */ + fprintf(xmlout,"%s \n", s); + fprintf(xmlout, "%s %d\n", s, poc->layno1); /* int_min(cio_read(2), tcp->numlayers); /* 2 bytes; LYEpoc_i */ if(notes) - fprintf(xmlout," \n"); - fprintf(xmlout, " %d\n", poc->resno1); /*int_min(cio_read(1), tccp->numresolutions); /* REpoc_i */ + fprintf(xmlout,"%s \n", s); + fprintf(xmlout, "%s %d\n", s, poc->resno1); /*int_min(cio_read(1), tccp->numresolutions); /* REpoc_i */ if(notes) - fprintf(xmlout," \n"); - fprintf(xmlout, " %d\n", poc->compno1); /* int_min(cio_read(j2k_img->numcomps <= 256 ? 1 : 2), j2k_img->numcomps); /* CEpoc_i */ + fprintf(xmlout,"%s \n", s); + fprintf(xmlout, "%s %d\n", s, poc->compno1); /* int_min(cio_read(j2k_img->numcomps <= 256 ? 1 : 2), j2k_img->numcomps); /* CEpoc_i */ if(notes) - fprintf(xmlout," \n"); - fprintf(xmlout, " %d\n", poc->prg); /* 1 byte Ppoc_i */ + fprintf(xmlout,"%s \n", s); + fprintf(xmlout, "%s %d\n", s, poc->prg); /* 1 byte Ppoc_i */ if(notes) { - fprintf(xmlout," \n"); - fprintf(xmlout," \n"); - fprintf(xmlout," \n"); + fprintf(xmlout,"%s \n", s); + fprintf(xmlout,"%s \n", s); + fprintf(xmlout,"%s \n", s); } - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s \n", s); } - fprintf(xmlout, " ppm != 1) return; /* Not present */ - - fprintf(xmlout, " \n"); /* Optional in main header, but if not, must be in PPT or codestream */ +/* Main header uses indent of 10 spaces */ + fprintf(xmlout, " \n"); /* Optional in main header, but if not, must be in PPT or codestream */ /* 2 bytes Lppm not saved */ if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } /* 1 byte, not retained ; Zppm is sequence # of this PPM header */ /* 4 bytes, possibly overwritten multiple times in j2k_cp->ppm_previous: Nppm */ /* Use j symbol for index instead of i, to make comparable with j2k_read_ppm */ /* Not real clear whether to use ppm->store or ppm_len as upper bound */ - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); xml_out_dump_hex(xmlout, cp->ppm_data, cp->ppm_len); /* Dump packet headers 1 byte at a time: lppm[i][j] */ - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); /* Optional in main header, but if not, must be in PPT or codestream */ + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); /* Optional in main header, but if not, must be in PPT or codestream */ } /* ------------- */ -void xml_out_frame_ppt(FILE *xmlout, j2k_tcp_t *tcp) { /* opt in tilepart header */ +void xml_out_frame_ppt(FILE *xmlout, j2k_tcp_t *tcp) { /* For tile-part header, not main (which uses PPM instead). */ +/* Either the PPM or PPT is required if the packet headers are not distributed in the bit stream */ +/* Use of PPM and PPT are mutually exclusive. */ /* Compare j2k_read_ppt() */ int j; if(tcp->ppt != 1) return; /* Not present */ - fprintf(xmlout, " \n"); /* Optional in main header, but if not, must be in PPT or codestream */ + /* Tile-part indents are 12 spaces */ + fprintf(xmlout, " \n"); /* Optional in main header, but if not, must be in PPT or codestream */ /* 2 bytes Lppm not saved */ if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } /* 1 byte, not retained ; Zppt is sequence # of this PPT header */ /* 4 bytes, possibly overwritten multiple times in j2k_cp->ppt_previous: Nppt */ /* Use j symbol for index instead of i, to make comparable with j2k_read_ppt */ /* Not real clear whether to use ppt->store or ppt_len as upper bound */ - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); xml_out_dump_hex(xmlout, tcp->ppt_data, tcp->ppt_len); /* Dump packet headers 1 byte at a time: lppt[i][j] */ - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); /* Optional in tile-part header, but if not, must be in PPM or codestream */ + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); /* Optional in tile-part header, but if not, must be in PPM or codestream */ } #endif SUPPRESS_FOR_NOW @@ -1770,26 +1810,29 @@ void xml_out_frame_ppt(FILE *xmlout, j2k_tcp_t *tcp) { /* opt in tilepart heade void xml_out_frame_tlm(FILE* xmlout) { /* opt, main header only. May be multiple. */ /* Compare j2k_read_tlm()... which doesn't retain anything! */ /* Plan: Since this is only called from main header, not tilepart, use global j2k_default_tcp rather than parameter */ +/* Main header indents are 10 spaces */ } /* ------------- */ -void xml_out_frame_plm(FILE* xmlout) { /* opt in main; can be used in conjunction with PLT */ +void xml_out_frame_plm(FILE* xmlout) { /* opt, main header only; can be used in conjunction with tile-part's PLT */ /* NO-OP. PLM NOT SAVED IN DATA STRUCTURE */ /* Compare j2k_read_plm()... which doesn't retain anything! */ /* Plan: Since this is only called from main header, not tilepart, use global j2k_default_tcp rather than parameter */ +/* Main header indents are 10 spaces */ } /* ------------- */ -void xml_out_frame_plt(FILE* xmlout, j2k_tcp_t *tcp) { /* opt in main; can be used in conjunction with PLT */ +void xml_out_frame_plt(FILE* xmlout, j2k_tcp_t *tcp) { /* opt, tile-part headers only; can be used in conjunction with main header's PLM */ /* NO-OP. PLT NOT SAVED IN DATA STRUCTURE */ /* Compare j2k_read_plt()... which doesn't retain anything! */ +/* Tile-part header indents are 12 spaces */ } /* ------------- */ -void xml_out_frame_crg(FILE* xmlout) { /* NO-OP. CRG NOT SAVED IN DATA STRUCTURE */ /* opt in main; */ +void xml_out_frame_crg(FILE* xmlout) { /* NO-OP. CRG NOT SAVED IN DATA STRUCTURE */ /* opt, main header only; */ /* Compare j2k_read_crg()... which doesn't retain anything! */ /* Plan: Since this is only called from main header, not tilepart, use global j2k_default_tcp rather than parameter */ #ifdef NOTYET @@ -1798,36 +1841,37 @@ void xml_out_frame_crg(FILE* xmlout) { /* NO-OP. CRG NOT SAVED IN DATA STRUCTUR if(j2k_default_tcp->crg != 1 || j2k_default_tcp->crg_i == 0) return; /* Not present */ - fprintf(xmlout, " \n", j2k_default_tcp->crg_i); +/* Main header indents are 10 spaces */ + fprintf(xmlout, " \n", j2k_default_tcp->crg_i); if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } /* This isn't the most compact form of table, but is OK when number of components is small, as is likely. */ for (i = 0; i < j2k_default_tcp->crg_i; i++) { - fprintf(xmlout, " \n", i+1); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n", i+1); + fprintf(xmlout, " \n"); if(raw) - fprintf(xmlout," %d\n", j2k_default_tcp->crg_xcrg[i]); + fprintf(xmlout," %d\n", j2k_default_tcp->crg_xcrg[i]); if(derived) { /* Calculate n * 100%/65536; 4 digits after decimal point is sufficiently accurate */ - fprintf(xmlout," %.4f\n", ((double)j2k_default_tcp->crg_xcrg[i])/655.36); + fprintf(xmlout," %.4f\n", ((double)j2k_default_tcp->crg_xcrg[i])/655.36); /* We could do another calculation that include XRsiz[i]; maybe later. */ } - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); if(raw) - fprintf(xmlout," %d\n", j2k_default_tcp->crg_ycrg[i]); + fprintf(xmlout," %d\n", j2k_default_tcp->crg_ycrg[i]); if(derived) { - fprintf(xmlout," %f\n", ((double)j2k_default_tcp->crg_ycrg[i])/655.36); + fprintf(xmlout," %f\n", ((double)j2k_default_tcp->crg_ycrg[i])/655.36); } - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); #endif } @@ -1835,44 +1879,51 @@ void xml_out_frame_crg(FILE* xmlout) { /* NO-OP. CRG NOT SAVED IN DATA STRUCTUR /* ------------- */ /* Regrettably from a metadata point of view, j2k_read_com() skips over any comments in main header or tile-part-header */ -void xml_out_frame_com(FILE* xmlout, j2k_tcp_t *tcp) { /* NO-OP. COM NOT SAVED IN DATA STRUCTURE */ /* opt in main; */ +void xml_out_frame_com(FILE* xmlout, j2k_tcp_t *tcp) { /* NO-OP. COM NOT SAVED IN DATA STRUCTURE */ /* opt in main or tile-part headers; */ /* Compare j2k_read_com()... which doesn't retain anything! */ #ifdef NOTYET + char spaces[13] = " "; /* 12 spaces if tilepart*/ + char* s = spaces; + if(tcp == &j2k_default_tcp) { + s++;s++; /* shorten s to 10 spaces if main */ + } THIS PSEUDOCODE IMAGINES THESE EXIST: tcp->com, tcp->com_len, tcp->com_data array if(tcp->com != 1) return; /* Not present */ - fprintf(xmlout, " \n"); /* Optional in main or tile-part header */ - xml_out_dump_hex_and_ascii(tcp->com_data, tcp->com_len); - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s\n", s); /* Optional in main or tile-part header */ + xml_out_dump_hex_and_ascii(tcp->com_data, tcp->com_len, s); + fprintf(xmlout, "%s\n", s); #endif } -void xml_out_dump_hex(FILE* xmlout, char *data, int data_len) { +void xml_out_dump_hex(FILE* xmlout, char *data, int data_len, char* s) { + /* s is a string of spaces for indent */ int i; /* This is called when raw is true, or there is no appropriate derived form */ - fprintf(xmlout, " \n"); - fprintf(xmlout, " "); /* Inadequate for pretty printing */ + fprintf(xmlout, "%s\n", s); + fprintf(xmlout, "%s ", s); /* Inadequate for pretty printing */ for (i = 0; i < data_len; i++) { /* Dump packet headers */ fprintf(xmlout, "%02x", data[i]); } - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s\n", s); } /* Define this as an even number: */ #define BYTES_PER_DUMP_LINE 40 /* Current total width for Hex and ASCII is : 11 spaces lead + (3 * BPDL) + 2 spaces + BPDL */ -void xml_out_dump_hex_and_ascii(FILE* xmlout, char *data, int data_len) { +void xml_out_dump_hex_and_ascii(FILE* xmlout, char *data, int data_len, char* s) { + /* s is a string of spaces for indent */ int i,j; if(raw) - xml_out_dump_hex(xmlout, data, data_len); + xml_out_dump_hex(xmlout, data, data_len, s); if(derived) { - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s\n", s); for (i = 0; i < data_len; ) { - fprintf(xmlout," "); /* Additional leading space added in loop */ + fprintf(xmlout,"%s ", s); /* Additional leading space added in loop */ /* First column: hex */ for (j = 0; j < BYTES_PER_DUMP_LINE; j++) /* Dump bytes */ fprintf(xmlout," %02x", data[i+j]); @@ -1890,7 +1941,7 @@ void xml_out_dump_hex_and_ascii(FILE* xmlout, char *data, int data_len) { data is UTF-8 format but still ASCII, then we'll be able to read every byte as ASCII in column 2. */ } - fprintf(xmlout, " \n"); + fprintf(xmlout, "%s\n", s); } } @@ -1901,93 +1952,93 @@ void xml_out_frame_jp2h(FILE* xmlout, jp2_struct_t *jp2_struct) { /* JP2 Header /* Compare jp2_read_jp2h(jp2_struct_t * jp2_struct) */ int i; - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); /* Compare jp2_read_ihdr(jp2_struct)) */ - fprintf(xmlout, " \n"); - fprintf(xmlout, " %d\n", jp2_struct->h); /* 4 bytes */ - fprintf(xmlout, " %d\n", jp2_struct->w); /* 4 bytes */ + fprintf(xmlout, " \n"); + fprintf(xmlout, " %d\n", jp2_struct->h); /* 4 bytes */ + fprintf(xmlout, " %d\n", jp2_struct->w); /* 4 bytes */ if(notes) - fprintf(xmlout, " \n"); - fprintf(xmlout, " %d\n", jp2_struct->numcomps); /* 2 bytes */ + fprintf(xmlout, " \n"); + fprintf(xmlout, " %d\n", jp2_struct->numcomps); /* 2 bytes */ if(notes) - fprintf(xmlout, " \n"); /* 2 bytes */ - fprintf(xmlout, " \n"); /* 1 byte */ + fprintf(xmlout, " \n"); /* 2 bytes */ + fprintf(xmlout, " \n"); /* 1 byte */ if(jp2_struct->bpc == 255) { - fprintf(xmlout, " 0x%02x\n", jp2_struct->bpc); /* 1 byte */ + fprintf(xmlout, " 0x%02x\n", jp2_struct->bpc); /* 1 byte */ if(notes) - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } else { /* Not 0xff */ if(raw) { - fprintf(xmlout, " 0x%02x\n", jp2_struct->bpc); /* 1 byte */ + fprintf(xmlout, " 0x%02x\n", jp2_struct->bpc); /* 1 byte */ if(notes) - fprintf(xmlout," \n"); + fprintf(xmlout," \n"); } if(derived) { - fprintf(xmlout, " %d\n", jp2_struct->bpc & 0x7f); - fprintf(xmlout, " %d\n", jp2_struct->bpc >> 7); + fprintf(xmlout, " %d\n", jp2_struct->bpc & 0x7f); + fprintf(xmlout, " %d\n", jp2_struct->bpc >> 7); } } - fprintf(xmlout, " \n"); - fprintf(xmlout, " %d\n", jp2_struct->C); /* 1 byte */ + fprintf(xmlout, " \n"); + fprintf(xmlout, " %d\n", jp2_struct->C); /* 1 byte */ if(notes) - fprintf(xmlout, " \n"); /* 2 bytes */ - fprintf(xmlout, " %d\n", jp2_struct->UnkC); /* 1 byte */ + fprintf(xmlout, " \n"); /* 2 bytes */ + fprintf(xmlout, " %d\n", jp2_struct->UnkC); /* 1 byte */ if(notes) - fprintf(xmlout, " \n"); /* 1 byte */ - fprintf(xmlout, " %d\n", jp2_struct->IPR); /* 1 byte */ + fprintf(xmlout, " \n"); /* 1 byte */ + fprintf(xmlout, " %d\n", jp2_struct->IPR); /* 1 byte */ if(notes) - fprintf(xmlout, " \n"); /* 2 bytes */ - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); /* 2 bytes */ + fprintf(xmlout, " \n"); if (jp2_struct->bpc == 255) { - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); if(notes) - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); /* Bits per pixel varies with components */ /* Compare jp2_read_bpcc(jp2_struct) */ for (i = 0; i < (int)jp2_struct->numcomps; i++) { if(raw) - fprintf(xmlout," 0x%02x\n", jp2_struct->comps[i].bpcc); /* 1 byte */ + fprintf(xmlout," 0x%02x\n", jp2_struct->comps[i].bpcc); /* 1 byte */ if(derived) { - fprintf(xmlout," %d\n", (jp2_struct->comps[i].bpcc & 0x7f)+1); - fprintf(xmlout," %d\n", jp2_struct->comps[i].bpcc >> 7); + fprintf(xmlout," %d\n", (jp2_struct->comps[i].bpcc & 0x7f)+1); + fprintf(xmlout," %d\n", jp2_struct->comps[i].bpcc >> 7); } } - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } /* Compare jp2_read_colr(jp2_struct) */ - fprintf(xmlout, " \n"); - fprintf(xmlout, " %d\n", jp2_struct->meth); /* 1 byte */ + fprintf(xmlout, " \n"); + fprintf(xmlout, " %d\n", jp2_struct->meth); /* 1 byte */ if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } - fprintf(xmlout, " %d\n", jp2_struct->precedence); /* 1 byte */ + fprintf(xmlout, " %d\n", jp2_struct->precedence); /* 1 byte */ if(notes) - fprintf(xmlout, " \n"); - fprintf(xmlout, " %d\n", jp2_struct->approx); /* 1 byte */ + fprintf(xmlout, " \n"); + fprintf(xmlout, " %d\n", jp2_struct->approx); /* 1 byte */ if(notes) - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); if (jp2_struct->meth == 1) { - fprintf(xmlout, " %d\n", jp2_struct->enumcs); /* 4 bytes */ + fprintf(xmlout, " %d\n", jp2_struct->enumcs); /* 4 bytes */ if(notes) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } } else if(notes) - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); /* only 1 byte is read and nothing stored */ - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); /* TO DO? No OpenJPEG support. Palette 'pclr' @@ -1995,7 +2046,7 @@ void xml_out_frame_jp2h(FILE* xmlout, jp2_struct_t *jp2_struct) { /* JP2 Header ChannelDefinition 'cdef' Resolution 'res' */ - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } /* ------------- */ @@ -2010,12 +2061,12 @@ void xml_out_frame_jp2i(FILE* xmlout, j2k_cp_t *cp) { for(i = 0; i < cp->jp2i_count; i++) { - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); /* I think this can be anything, including binary, so do a dump */ /* Is it better to indent or not indent this content? Indent is better for reading, but worse for cut/paste. */ xml_out_dump_hex_and_ascii(xmlout, cp->jp2i_data[i], cp->jp2i_len[i]); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } } @@ -2030,11 +2081,11 @@ void xml_out_frame_xml(FILE* xmlout, j2k_cp_t *cp) { for(i = 0; i < cp->xml_count; i++) { - fprintf(xmlout, " \n", i+1); + fprintf(xmlout, " \n", i+1); /* Is it better to indent or not indent this content? Indent is better for reading, but worse for cut/paste. Being lazy, didn't indent here. */ fprintf(xmlout,cp->xml_data[i]); /* May be multiple lines */ /* Could check if this is well-formed */ - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } } @@ -2056,15 +2107,15 @@ void xml_out_frame_uuid(FILE* xmlout, j2k_cp_t *cp) { for(i = 0; i < cp->uuid_count; i++) { - fprintf(xmlout, " - fprintf(xmlout, " %s\n", cp->uuid_value[i]); - fprintf(xmlout, " \n"); + fprintf(xmlout, " + fprintf(xmlout, " %s\n", cp->uuid_value[i]); + fprintf(xmlout, " \n"); /* I think this can be anything, including binary, so do a dump */ /* Is it better to indent or not indent this content? Indent is better for reading, but worse for cut/paste. */ xml_out_dump_hex_and_ascii(xmlout, cp->uuid_data[i], cp->uuid_len[i]); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } } @@ -2084,18 +2135,18 @@ void xml_out_frame_uinf(FILE* xmlout, j2k_cp_t *cp) { for(i = 0; i < cp->uuid_count; i++) { - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n",cp->cp->uinf_ulst_nu[i]); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n",cp->cp->uinf_ulst_nu[i]); for(j = 0; j < cp->uinf_ulst_nu[i]; j++) fprintf(xmlout, " %s\n", cp->uuif_uuid[i][j], j+1); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); /* Could add VERS and FLAG here */ - fprintf(xmlout, " \n"); - fprintf(xmlout, " %s",cp->uinf_url[i]); /* Probably single line, so indent works */ /* In theory, could check if this is well-formed, or good live link */ - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " %s",cp->uinf_url[i]); /* Probably single line, so indent works */ /* In theory, could check if this is well-formed, or good live link */ + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } } @@ -2122,12 +2173,12 @@ void xml_out_frame_unknown_type(FILE* xmlout, j2k_cp_t *cp) { for(i = 0; i < cp->unknown_type_count; i++) { - fprintf(xmlout, " \n", cp->unknown_type_boxtype[i]); + fprintf(xmlout, " \n", cp->unknown_type_boxtype[i]); /* Can be anything, including binary, so do a dump */ /* Is it better to indent or not indent this content? Indent is better for reading, but worse for cut/paste. */ xml_out_dump_hex_and_ascii(xmlout, cp->unknown_type_data[i], cp->unknown_type_len[i]); - fprintf(xmlout, " \n"); + fprintf(xmlout, " \n"); } }