walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'associated_data_support' of https://github.com/HWiman/openjpeg into associated_data_support

This commit is contained in:
hw 2018-05-28 14:09:45 +02:00
parent 34801b40f4 ae71bb88a6
commit ec4aec11e2
4 changed files with 53 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/lib/openjp2/jp2.c
View File

@ -114,7 +114,7 @@ static void opj_jp2_apply_cdef(opj_image_t *image, opj_jp2_color_t *color,
/** /**
* Destroy list of ASOC entities * Destroy list of ASOC entities
*/ */
static void opj_jp2_asoc_destroy( opj_jp2_asoc_t *p_asoc, OPJ_UINT32 num ); static void opj_jp2_asoc_destroy(opj_jp2_asoc_t *p_asoc, OPJ_UINT32 num);
/** /**
* Writes the Channel Definition box. * Writes the Channel Definition box.
@ -177,10 +177,10 @@ static OPJ_BOOL opj_jp2_read_ftyp(opj_jp2_t *jp2,
* *
* @return true if the ASOC box is valid. * @return true if the ASOC box is valid.
*/ */
static OPJ_BOOL opj_jp2_read_asoc( opj_jp2_t *jp2, static OPJ_BOOL opj_jp2_read_asoc(opj_jp2_t *jp2,
OPJ_BYTE * p_header_data, OPJ_BYTE * p_header_data,
OPJ_UINT32 p_header_size, OPJ_UINT32 p_header_size,
opj_event_mgr_t * p_manager); opj_event_mgr_t * p_manager);
static OPJ_BOOL opj_jp2_skip_jp2c(opj_jp2_t *jp2, static OPJ_BOOL opj_jp2_skip_jp2c(opj_jp2_t *jp2,
opj_stream_private_t *stream, opj_stream_private_t *stream,
@ -2660,10 +2660,10 @@ static OPJ_BOOL opj_jp2_read_ftyp(opj_jp2_t *jp2,
return OPJ_TRUE; return OPJ_TRUE;
} }
static OPJ_BOOL opj_jp2_read_asoc( opj_jp2_t *jp2, static OPJ_BOOL opj_jp2_read_asoc(opj_jp2_t *jp2,
OPJ_BYTE * p_header_data, OPJ_BYTE * p_header_data,
OPJ_UINT32 p_header_size, OPJ_UINT32 p_header_size,
opj_event_mgr_t * p_manager) opj_event_mgr_t * p_manager)
{ {
OPJ_UINT32 label_tag; OPJ_UINT32 label_tag;
OPJ_UINT32 asoc_tag; OPJ_UINT32 asoc_tag;
@ -2676,31 +2676,34 @@ static OPJ_BOOL opj_jp2_read_asoc( opj_jp2_t *jp2,
assert(p_manager != 00); assert(p_manager != 00);
if (p_header_size < 8) { if (p_header_size < 8) {
opj_event_msg(p_manager, EVT_ERROR, "Cannot handle ASOC box of less than 8 bytes\n"); opj_event_msg(p_manager, EVT_ERROR,
"Cannot handle ASOC box of less than 8 bytes\n");
return OPJ_FALSE; return OPJ_FALSE;
} }
opj_read_bytes(p_header_data,&asoc_size,4); opj_read_bytes(p_header_data, &asoc_size, 4);
p_header_data += 4; p_header_data += 4;
p_header_size -= 4; p_header_size -= 4;
if (p_header_size < asoc_size) { if (p_header_size < asoc_size) {
opj_event_msg(p_manager, EVT_ERROR, "ASOC super box is smaller than containing sub box\n"); opj_event_msg(p_manager, EVT_ERROR,
"ASOC super box is smaller than containing sub box\n");
return OPJ_FALSE; return OPJ_FALSE;
} }
opj_read_bytes(p_header_data,&label_tag,4); opj_read_bytes(p_header_data, &label_tag, 4);
p_header_data += 4; p_header_data += 4;
p_header_size -= 4; p_header_size -= 4;
asoc_size -= 4; asoc_size -= 4;
if (label_tag != JP2_LBL) { if (label_tag != JP2_LBL) {
/* TODO: Verify that ASOC must have a following label ? */ /* TODO: Verify that ASOC must have a following label ? */
opj_event_msg(p_manager, EVT_WARNING, "ASOC data does not have a label (LBL)\n"); opj_event_msg(p_manager, EVT_WARNING,
"ASOC data does not have a label (LBL)\n");
return OPJ_TRUE; // No error if we could not parse return OPJ_TRUE; // No error if we could not parse
} }
if ( jp2->numasoc == 0 ) { if (jp2->numasoc == 0) {
/* Create a first asoc */ /* Create a first asoc */
jp2->numasoc = 1; jp2->numasoc = 1;
jp2->asoc = opj_malloc(sizeof(opj_jp2_asoc_t)); jp2->asoc = opj_malloc(sizeof(opj_jp2_asoc_t));
@ -2710,12 +2713,14 @@ static OPJ_BOOL opj_jp2_read_asoc( opj_jp2_t *jp2,
jp2->asoc = opj_realloc(jp2->asoc, jp2->numasoc * sizeof(opj_jp2_asoc_t)); jp2->asoc = opj_realloc(jp2->asoc, jp2->numasoc * sizeof(opj_jp2_asoc_t));
} }
asoc = &(jp2->asoc[jp2->numasoc-1]); asoc = &(jp2->asoc[jp2->numasoc - 1]);
asoc->level = jp2->numasoc-1; /* TODO: This is not correct if a parent asoc contains multiple child asocs! */
asoc->label_length = asoc_size+1; /* TODO: This is not correct if a parent asoc contains multiple child asocs! */
asoc->level = jp2->numasoc - 1;
asoc->label_length = asoc_size + 1;
asoc->label = opj_malloc(asoc->label_length); asoc->label = opj_malloc(asoc->label_length);
memcpy(asoc->label, p_header_data, asoc_size); memcpy(asoc->label, p_header_data, asoc_size);
asoc->label[asoc->label_length-1] = '\0'; /* NULL terminated label string */ asoc->label[asoc->label_length - 1] = '\0'; /* NULL terminated label string */
asoc->xml_buf = 00; asoc->xml_buf = 00;
asoc->xml_len = 0; asoc->xml_len = 0;
@ -2723,55 +2728,56 @@ static OPJ_BOOL opj_jp2_read_asoc( opj_jp2_t *jp2,
p_header_size -= asoc_size; p_header_size -= asoc_size;
if (p_header_size < 4) { if (p_header_size < 4) {
opj_event_msg(p_manager, EVT_ERROR, "Cannot handle ASOC sub box of less than 4 bytes\n"); opj_event_msg(p_manager, EVT_ERROR,
"Cannot handle ASOC sub box of less than 4 bytes\n");
return OPJ_FALSE; return OPJ_FALSE;
} }
opj_read_bytes(p_header_data,&asoc_tag,4); opj_read_bytes(p_header_data, &asoc_tag, 4);
p_header_data += 4; p_header_data += 4;
p_header_size -= 4; p_header_size -= 4;
switch (asoc_tag) { switch (asoc_tag) {
case JP2_ASOC: { case JP2_ASOC: {
/* Start of nested ASOC tags. Parse this level. */ /* Start of nested ASOC tags. Parse this level. */
if (!opj_jp2_read_asoc( jp2, p_header_data, p_header_size, p_manager )) { if (!opj_jp2_read_asoc(jp2, p_header_data, p_header_size, p_manager)) {
return OPJ_FALSE; return OPJ_FALSE;
} }
} }
break; break;
case JP2_XML: { case JP2_XML: {
asoc->xml_len = p_header_size+1; asoc->xml_len = p_header_size + 1;
asoc->xml_buf = opj_malloc(asoc->xml_len); asoc->xml_buf = opj_malloc(asoc->xml_len);
memcpy( asoc->xml_buf, p_header_data, p_header_size ); memcpy(asoc->xml_buf, p_header_data, p_header_size);
asoc->xml_buf[asoc->xml_len-1] = '\0'; asoc->xml_buf[asoc->xml_len - 1] = '\0';
} }
break; break;
default: { default: {
/* Copy the unknown data for external handling. /* Copy the unknown data for external handling.
NOTE: This is not tested, but does the same as if an XML tag was found.*/ NOTE: This is not tested, but does the same as if an XML tag was found.*/
asoc->xml_len = p_header_size+1; asoc->xml_len = p_header_size + 1;
asoc->xml_buf = opj_malloc(asoc->xml_len); asoc->xml_buf = opj_malloc(asoc->xml_len);
memcpy( asoc->xml_buf, p_header_data, p_header_size ); memcpy(asoc->xml_buf, p_header_data, p_header_size);
asoc->xml_buf[asoc->xml_len-1] = '\0'; asoc->xml_buf[asoc->xml_len - 1] = '\0';
} }
} }
return OPJ_TRUE; return OPJ_TRUE;
} }
static void opj_jp2_asoc_destroy( opj_jp2_asoc_t *p_asoc, OPJ_UINT32 num ) static void opj_jp2_asoc_destroy(opj_jp2_asoc_t *p_asoc, OPJ_UINT32 num)
{ {
OPJ_UINT32 i; OPJ_UINT32 i;
opj_jp2_asoc_t *asoc; opj_jp2_asoc_t *asoc;
for (i=0; i<num; i++) { for (i = 0; i < num; i++) {
asoc = &(p_asoc[i]); asoc = &(p_asoc[i]);
opj_free( asoc->label ); opj_free(asoc->label);
asoc->label = 00; asoc->label = 00;
asoc->label_length = 0; asoc->label_length = 0;
opj_free( asoc->xml_buf ); opj_free(asoc->xml_buf);
asoc->xml_buf = 00; asoc->xml_buf = 00;
asoc->xml_len = 0; asoc->xml_len = 0;
} }
@ -3209,8 +3215,8 @@ void opj_jp2_destroy(opj_jp2_t *jp2)
jp2->m_procedure_list = 00; jp2->m_procedure_list = 00;
} }
if ( jp2->numasoc ) { if (jp2->numasoc) {
opj_jp2_asoc_destroy( jp2->asoc, jp2->numasoc ); opj_jp2_asoc_destroy(jp2->asoc, jp2->numasoc);
jp2->asoc = 00; jp2->asoc = 00;
jp2->numasoc = 0; jp2->numasoc = 0;
} }
@ -3381,7 +3387,7 @@ opj_codestream_info_v2_t* jp2_get_cstr_info(opj_jp2_t* p_jp2)
return p_info; return p_info;
} }
opj_jp2_metadata_t* jp2_get_metadata(opj_jp2_t* p_jp2) OPJ_BOOL jp2_copy_asoc_data(opj_jp2_t* p_jp2, opj_codestream_info_v2_t* p_info)
{ {
opj_jp2_metadata_t* p_metadata = opj_malloc(sizeof(opj_jp2_metadata_t)); opj_jp2_metadata_t* p_metadata = opj_malloc(sizeof(opj_jp2_metadata_t));
jp2_copy_asoc_data( p_jp2, p_metadata ); jp2_copy_asoc_data( p_jp2, p_metadata );
@ -3392,6 +3398,7 @@ OPJ_BOOL jp2_copy_asoc_data( opj_jp2_t* p_jp2, opj_jp2_metadata_t* p_jp2_metadat
{ {
OPJ_UINT32 i; OPJ_UINT32 i;
opj_jp2_asoc_t *asoc, *to_asoc; opj_jp2_asoc_t *asoc, *to_asoc;
p_jp2_metadata->nbasoc = p_jp2->numasoc; p_jp2_metadata->nbasoc = p_jp2->numasoc;
p_jp2_metadata->asoc_info = opj_malloc(p_jp2_metadata->nbasoc * sizeof(opj_jp2_asoc_t)); p_jp2_metadata->asoc_info = opj_malloc(p_jp2_metadata->nbasoc * sizeof(opj_jp2_asoc_t));
for (i=0; i<p_jp2_metadata->nbasoc; i++) { for (i=0; i<p_jp2_metadata->nbasoc; i++) {
@ -3401,7 +3408,7 @@ OPJ_BOOL jp2_copy_asoc_data( opj_jp2_t* p_jp2, opj_jp2_metadata_t* p_jp2_metadat
to_asoc->label_length = asoc->label_length; to_asoc->label_length = asoc->label_length;
to_asoc->xml_len = asoc->xml_len; to_asoc->xml_len = asoc->xml_len;
if (asoc->label_length && asoc->label) { if (asoc->label_length && asoc->label) {
to_asoc->label = opj_malloc( to_asoc->label_length ); to_asoc->label = opj_malloc(to_asoc->label_length);
memcpy(to_asoc->label, asoc->label, to_asoc->label_length); memcpy(to_asoc->label, asoc->label, to_asoc->label_length);
} else { } else {
to_asoc->label = 00; to_asoc->label = 00;

2
src/lib/openjp2/jp2.h
View File

@ -498,7 +498,7 @@ opj_codestream_info_v2_t* jp2_get_cstr_info(opj_jp2_t* p_jp2);
/** /**
* Copy associated data * Copy associated data
*/ */
OPJ_BOOL jp2_copy_asoc_data( opj_jp2_t* p_jp2, opj_jp2_metadata_t* p_jp2_metadata ); OPJ_BOOL jp2_copy_asoc_data(opj_jp2_t* p_jp2, opj_jp2_metadata_t* p_jp2_metadata);
/** /**
* Get the codestream index from a JPEG2000 codec. * Get the codestream index from a JPEG2000 codec.

16
src/lib/openjp2/openjpeg.c
View File

@ -37,7 +37,7 @@
#include "opj_includes.h" #include "opj_includes.h"
static void opj_asoc_destroy( opj_jp2_asoc_t *p_asoc, OPJ_UINT32 num ); static void opj_asoc_destroy(opj_jp2_asoc_t *p_asoc, OPJ_UINT32 num);
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
/* Functions to set the message handlers */ /* Functions to set the message handlers */
@ -961,12 +961,12 @@ void OPJ_CALLCONV opj_dump_codec(opj_codec_t *p_codec,
void OPJ_CALLCONV opj_dump_associated_data( void OPJ_CALLCONV opj_dump_associated_data(
opj_jp2_metadata_t* jp2_info, opj_jp2_metadata_t* jp2_info,
FILE* output_stream ) FILE* output_stream)
{ {
OPJ_UINT32 i; OPJ_UINT32 i;
if ( jp2_info && jp2_info->asoc_info ) { if (jp2_info && jp2_info->asoc_info) {
fprintf(output_stream, "\n\nAssociated data: {\n"); fprintf(output_stream, "\n\nAssociated data: {\n");
for (i=0; i<jp2_info->nbasoc; i++) { for (i = 0; i < jp2_info->nbasoc; i++) {
fprintf(output_stream, "\tlabel=%s, xml/data=", (char*) jp2_info->asoc_info[i].label); fprintf(output_stream, "\tlabel=%s, xml/data=", (char*) jp2_info->asoc_info[i].label);
if (jp2_info->asoc_info[i].xml_buf) { if (jp2_info->asoc_info[i].xml_buf) {
fprintf(output_stream, "%s\n", (char*) jp2_info->asoc_info[i].xml_buf); fprintf(output_stream, "%s\n", (char*) jp2_info->asoc_info[i].xml_buf);
@ -989,17 +989,17 @@ opj_codestream_info_v2_t* OPJ_CALLCONV opj_get_cstr_info(opj_codec_t *p_codec)
return NULL; return NULL;
} }
void opj_asoc_destroy( opj_jp2_asoc_t *p_asoc, OPJ_UINT32 num ) void opj_asoc_destroy(opj_jp2_asoc_t *p_asoc, OPJ_UINT32 num)
{ {
OPJ_UINT32 i; OPJ_UINT32 i;
opj_jp2_asoc_t *asoc; opj_jp2_asoc_t *asoc;
for (i=0; i<num; i++) { for (i = 0; i < num; i++) {
asoc = &(p_asoc[i]); asoc = &(p_asoc[i]);
opj_free( asoc->label ); opj_free(asoc->label);
asoc->label = 00; asoc->label = 00;
asoc->label_length = 0; asoc->label_length = 0;
opj_free( asoc->xml_buf ); opj_free(asoc->xml_buf);
asoc->xml_buf = 00; asoc->xml_buf = 00;
asoc->xml_len = 0; asoc->xml_len = 0;
} }

2
src/lib/openjp2/openjpeg.h
View File

@ -1641,7 +1641,7 @@ OPJ_API opj_codestream_info_v2_t* OPJ_CALLCONV opj_get_cstr_info(
*/ */
OPJ_API void OPJ_CALLCONV opj_dump_associated_data( OPJ_API void OPJ_CALLCONV opj_dump_associated_data(
opj_jp2_metadata_t* cstr_info, opj_jp2_metadata_t* cstr_info,
FILE* output_stream ); FILE* output_stream);
/** /**
* Get the codestream index from the codec * Get the codestream index from the codec