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

Start support for qcc/coc

This commit is contained in:
mayeut 2015-07-28 23:58:10 +02:00
parent 5b66156be4
commit 2263b6bacc
1 changed files with 134 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
src/lib/openjp2/j2k.c
View File

@ -212,6 +212,18 @@ static void opj_j2k_tcp_data_destroy (opj_tcp_t *p_tcp);
*/ */
static void opj_j2k_cp_destroy (opj_cp_t *p_cp); static void opj_j2k_cp_destroy (opj_cp_t *p_cp);
/**
* Compare 2 a SPCod/ SPCoc elements, i.e. the coding style of a given component of a tile.
*
* @param p_j2k J2K codec.
* @param p_tile_no Tile number
* @param p_first_comp_no The 1st component number to compare.
* @param p_second_comp_no The 1st component number to compare.
*
* @return OPJ_TRUE if SPCdod are equals.
*/
static OPJ_BOOL opj_j2k_compare_SPCod_SPCoc(opj_j2k_t *p_j2k, OPJ_UINT32 p_tile_no, OPJ_UINT32 p_first_comp_no, OPJ_UINT32 p_second_comp_no);
/** /**
* Writes a SPCod or SPCoc element, i.e. the coding style of a given component of a tile. * Writes a SPCod or SPCoc element, i.e. the coding style of a given component of a tile.
* *
@ -484,7 +496,6 @@ static OPJ_BOOL opj_j2k_read_cod ( opj_j2k_t *p_j2k,
OPJ_UINT32 p_header_size, OPJ_UINT32 p_header_size,
opj_event_mgr_t * p_manager); opj_event_mgr_t * p_manager);
#if 0
/** /**
* Writes the COC marker (Coding style component) * Writes the COC marker (Coding style component)
* *
@ -497,9 +508,7 @@ static OPJ_BOOL opj_j2k_write_coc( opj_j2k_t *p_j2k,
OPJ_UINT32 p_comp_no, OPJ_UINT32 p_comp_no,
opj_stream_private_t *p_stream, opj_stream_private_t *p_stream,
opj_event_mgr_t * p_manager ); opj_event_mgr_t * p_manager );
#endif
#if 0
/** /**
* Writes the COC marker (Coding style component) * Writes the COC marker (Coding style component)
* *
@ -514,7 +523,6 @@ static void opj_j2k_write_coc_in_memory(opj_j2k_t *p_j2k,
OPJ_BYTE * p_data, OPJ_BYTE * p_data,
OPJ_UINT32 * p_data_written, OPJ_UINT32 * p_data_written,
opj_event_mgr_t * p_manager ); opj_event_mgr_t * p_manager );
#endif
/** /**
* Gets the maximum size taken by a coc. * Gets the maximum size taken by a coc.
@ -557,7 +565,7 @@ static OPJ_BOOL opj_j2k_read_qcd ( opj_j2k_t *p_j2k,
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 );
#if 0
/** /**
* Writes the QCC marker (quantization component) * Writes the QCC marker (quantization component)
* *
@ -570,9 +578,7 @@ static OPJ_BOOL opj_j2k_write_qcc( opj_j2k_t *p_j2k,
OPJ_UINT32 p_comp_no, OPJ_UINT32 p_comp_no,
opj_stream_private_t *p_stream, opj_stream_private_t *p_stream,
opj_event_mgr_t * p_manager ); opj_event_mgr_t * p_manager );
#endif
#if 0
/** /**
* Writes the QCC marker (quantization component) * Writes the QCC marker (quantization component)
* *
@ -587,7 +593,6 @@ static void opj_j2k_write_qcc_in_memory(opj_j2k_t *p_j2k,
OPJ_BYTE * p_data, OPJ_BYTE * p_data,
OPJ_UINT32 * p_data_written, OPJ_UINT32 * p_data_written,
opj_event_mgr_t * p_manager ); opj_event_mgr_t * p_manager );
#endif
/** /**
* Gets the maximum size taken by a qcc. * Gets the maximum size taken by a qcc.
@ -1097,7 +1102,7 @@ static OPJ_BOOL opj_j2k_read_cbd ( opj_j2k_t *p_j2k,
OPJ_UINT32 p_header_size, OPJ_UINT32 p_header_size,
opj_event_mgr_t * p_manager); opj_event_mgr_t * p_manager);
#if 0
/** /**
* Writes COC marker for each component. * Writes COC marker for each component.
* *
@ -1108,9 +1113,7 @@ static OPJ_BOOL opj_j2k_read_cbd ( opj_j2k_t *p_j2k,
static OPJ_BOOL opj_j2k_write_all_coc( opj_j2k_t *p_j2k, static OPJ_BOOL opj_j2k_write_all_coc( opj_j2k_t *p_j2k,
opj_stream_private_t *p_stream, opj_stream_private_t *p_stream,
opj_event_mgr_t * p_manager ); opj_event_mgr_t * p_manager );
#endif
#if 0
/** /**
* Writes QCC marker for each component. * Writes QCC marker for each component.
* *
@ -1121,7 +1124,6 @@ static OPJ_BOOL opj_j2k_write_all_coc( opj_j2k_t *p_j2k,
static OPJ_BOOL opj_j2k_write_all_qcc( opj_j2k_t *p_j2k, static OPJ_BOOL opj_j2k_write_all_qcc( opj_j2k_t *p_j2k,
opj_stream_private_t *p_stream, opj_stream_private_t *p_stream,
opj_event_mgr_t * p_manager ); opj_event_mgr_t * p_manager );
#endif
/** /**
* Writes regions of interests. * Writes regions of interests.
@ -2550,7 +2552,6 @@ static OPJ_BOOL opj_j2k_read_cod ( opj_j2k_t *p_j2k,
return OPJ_TRUE; return OPJ_TRUE;
} }
#if 0
static OPJ_BOOL opj_j2k_write_coc( opj_j2k_t *p_j2k, static OPJ_BOOL opj_j2k_write_coc( opj_j2k_t *p_j2k,
OPJ_UINT32 p_comp_no, OPJ_UINT32 p_comp_no,
opj_stream_private_t *p_stream, opj_stream_private_t *p_stream,
@ -2595,9 +2596,26 @@ static OPJ_BOOL opj_j2k_write_coc( opj_j2k_t *p_j2k,
return OPJ_TRUE; return OPJ_TRUE;
} }
#endif
#if 0 static OPJ_BOOL opj_j2k_compare_coc(opj_j2k_t *p_j2k, OPJ_UINT32 p_first_comp_no, OPJ_UINT32 p_second_comp_no)
{
opj_cp_t *l_cp = NULL;
opj_tcp_t *l_tcp = NULL;
/* preconditions */
assert(p_j2k != 00);
l_cp = &(p_j2k->m_cp);
l_tcp = &l_cp->tcps[p_j2k->m_current_tile_number];
if (l_tcp->tccps[p_first_comp_no].csty != l_tcp->tccps[p_second_comp_no].csty) {
return OPJ_FALSE;
}
return opj_j2k_compare_SPCod_SPCoc(p_j2k, p_j2k->m_current_tile_number, p_first_comp_no, p_second_comp_no);
}
static void opj_j2k_write_coc_in_memory( opj_j2k_t *p_j2k, static void opj_j2k_write_coc_in_memory( opj_j2k_t *p_j2k,
OPJ_UINT32 p_comp_no, OPJ_UINT32 p_comp_no,
OPJ_BYTE * p_data, OPJ_BYTE * p_data,
@ -2642,7 +2660,6 @@ static void opj_j2k_write_coc_in_memory( opj_j2k_t *p_j2k,
opj_j2k_write_SPCod_SPCoc(p_j2k,p_j2k->m_current_tile_number,0,l_current_data,&l_remaining_size,p_manager); opj_j2k_write_SPCod_SPCoc(p_j2k,p_j2k->m_current_tile_number,0,l_current_data,&l_remaining_size,p_manager);
* p_data_written = l_coc_size; * p_data_written = l_coc_size;
} }
#endif
static OPJ_UINT32 opj_j2k_get_max_coc_size(opj_j2k_t *p_j2k) static OPJ_UINT32 opj_j2k_get_max_coc_size(opj_j2k_t *p_j2k)
{ {
@ -2816,7 +2833,6 @@ static OPJ_BOOL opj_j2k_read_qcd ( opj_j2k_t *p_j2k,
return OPJ_TRUE; return OPJ_TRUE;
} }
#if 0
static OPJ_BOOL opj_j2k_write_qcc( opj_j2k_t *p_j2k, static OPJ_BOOL opj_j2k_write_qcc( opj_j2k_t *p_j2k,
OPJ_UINT32 p_comp_no, OPJ_UINT32 p_comp_no,
opj_stream_private_t *p_stream, opj_stream_private_t *p_stream,
@ -2855,9 +2871,7 @@ static OPJ_BOOL opj_j2k_write_qcc( opj_j2k_t *p_j2k,
return OPJ_TRUE; return OPJ_TRUE;
} }
#endif
#if 0
static void opj_j2k_write_qcc_in_memory( opj_j2k_t *p_j2k, static void opj_j2k_write_qcc_in_memory( opj_j2k_t *p_j2k,
OPJ_UINT32 p_comp_no, OPJ_UINT32 p_comp_no,
OPJ_BYTE * p_data, OPJ_BYTE * p_data,
@ -2906,7 +2920,6 @@ static void opj_j2k_write_qcc_in_memory( opj_j2k_t *p_j2k,
*p_data_written = l_qcc_size; *p_data_written = l_qcc_size;
} }
#endif
static OPJ_UINT32 opj_j2k_get_max_qcc_size (opj_j2k_t *p_j2k) static OPJ_UINT32 opj_j2k_get_max_qcc_size (opj_j2k_t *p_j2k)
{ {
@ -4877,41 +4890,66 @@ static OPJ_BOOL opj_j2k_write_mct_data_group( opj_j2k_t *p_j2k,
return OPJ_TRUE; return OPJ_TRUE;
} }
#if 0 static OPJ_BOOL opj_j2k_write_all_coc(
static OPJ_BOOL opj_j2k_write_all_coc(opj_j2k_t *p_j2k, opj_j2k_t *p_j2k,
struct opj_stream_private *p_stream, struct opj_stream_private *p_stream,
struct opj_event_mgr * p_manager ) struct opj_event_mgr * p_manager )
{ {
OPJ_UINT32 compno; OPJ_UINT32 compno, compno2;
OPJ_BOOL needed = OPJ_FALSE;
/* preconditions */ /* preconditions */
assert(p_j2k != 00); assert(p_j2k != 00);
assert(p_manager != 00); assert(p_manager != 00);
assert(p_stream != 00); assert(p_stream != 00);
for (compno = 0; compno < (p_j2k->m_private_image->numcomps - 1U); ++compno)
{
for (compno2 = compno = 1U; compno2 < p_j2k->m_private_image->numcomps; ++compno2)
{
if (opj_j2k_compare_coc(p_j2k, compno, compno2) == OPJ_FALSE) {
needed = OPJ_TRUE;
}
}
}
if (needed != OPJ_FALSE) {
for (compno = 0; compno < p_j2k->m_private_image->numcomps; ++compno) for (compno = 0; compno < p_j2k->m_private_image->numcomps; ++compno)
{ {
if (! opj_j2k_write_coc(p_j2k,compno,p_stream, p_manager)) { if (! opj_j2k_write_coc(p_j2k,compno,p_stream, p_manager)) {
return OPJ_FALSE; return OPJ_FALSE;
} }
} }
}
return OPJ_TRUE; return OPJ_TRUE;
} }
#endif
#if 0 static OPJ_BOOL opj_j2k_write_all_qcc(
static OPJ_BOOL opj_j2k_write_all_qcc(opj_j2k_t *p_j2k, opj_j2k_t *p_j2k,
struct opj_stream_private *p_stream, struct opj_stream_private *p_stream,
struct opj_event_mgr * p_manager ) struct opj_event_mgr * p_manager )
{ {
OPJ_UINT32 compno; OPJ_UINT32 compno, compno2;
OPJ_BOOL needed = OPJ_FALSE;
/* preconditions */ /* preconditions */
assert(p_j2k != 00); assert(p_j2k != 00);
assert(p_manager != 00); assert(p_manager != 00);
assert(p_stream != 00); assert(p_stream != 00);
/*
for (compno = 0; compno < (p_j2k->m_private_image->numcomps - 1U); ++compno)
{
for (compno2 = compno = 1U; compno2 < p_j2k->m_private_image->numcomps; ++compno2)
{
if (opj_j2k_compare_qcc(p_j2k, compno, compno2) == OPJ_FALSE) {
needed = OPJ_TRUE;
}
}
}*/
if (needed != OPJ_FALSE) {
for (compno = 0; compno < p_j2k->m_private_image->numcomps; ++compno) for (compno = 0; compno < p_j2k->m_private_image->numcomps; ++compno)
{ {
if (! opj_j2k_write_qcc(p_j2k,compno,p_stream, p_manager)) { if (! opj_j2k_write_qcc(p_j2k,compno,p_stream, p_manager)) {
@ -4920,9 +4958,8 @@ static OPJ_BOOL opj_j2k_write_all_qcc(opj_j2k_t *p_j2k,
} }
return OPJ_TRUE; return OPJ_TRUE;
}
} }
#endif
static OPJ_BOOL opj_j2k_write_regions( opj_j2k_t *p_j2k, static OPJ_BOOL opj_j2k_write_regions( opj_j2k_t *p_j2k,
struct opj_stream_private *p_stream, struct opj_stream_private *p_stream,
@ -8618,6 +8655,52 @@ static OPJ_UINT32 opj_j2k_get_SPCod_SPCoc_size ( opj_j2k_t *p_j2k,
} }
} }
static OPJ_BOOL opj_j2k_compare_SPCod_SPCoc(opj_j2k_t *p_j2k, OPJ_UINT32 p_tile_no, OPJ_UINT32 p_first_comp_no, OPJ_UINT32 p_second_comp_no)
{
OPJ_UINT32 i;
opj_cp_t *l_cp = NULL;
opj_tcp_t *l_tcp = NULL;
opj_tccp_t *l_tccp0 = NULL;
opj_tccp_t *l_tccp1 = NULL;
/* preconditions */
assert(p_j2k != 00);
l_cp = &(p_j2k->m_cp);
l_tcp = &l_cp->tcps[p_tile_no];
l_tccp0 = &l_tcp->tccps[p_first_comp_no];
l_tccp1 = &l_tcp->tccps[p_second_comp_no];
if (l_tccp0->numresolutions != l_tccp1->numresolutions) {
return OPJ_FALSE;
}
if (l_tccp0->cblkw != l_tccp1->cblkw) {
return OPJ_FALSE;
}
if (l_tccp0->cblkh != l_tccp1->cblkh) {
return OPJ_FALSE;
}
if (l_tccp0->cblksty != l_tccp1->cblksty) {
return OPJ_FALSE;
}
if (l_tccp0->qmfbid != l_tccp1->qmfbid) {
return OPJ_FALSE;
}
if ((l_tccp0->csty & J2K_CCP_CSTY_PRT) != (l_tccp1->csty & J2K_CCP_CSTY_PRT)) {
return OPJ_FALSE;
}
for (i = 0U; i < l_tccp0->numresolutions; ++i) {
if (l_tccp0->prcw[i] != l_tccp1->prcw[i]) {
return OPJ_FALSE;
}
if (l_tccp0->prch[i] != l_tccp1->prch[i]) {
return OPJ_FALSE;
}
}
return OPJ_TRUE;
}
static OPJ_BOOL opj_j2k_write_SPCod_SPCoc( opj_j2k_t *p_j2k, static OPJ_BOOL opj_j2k_write_SPCod_SPCoc( opj_j2k_t *p_j2k,
OPJ_UINT32 p_tile_no, OPJ_UINT32 p_tile_no,
OPJ_UINT32 p_comp_no, OPJ_UINT32 p_comp_no,
@ -10278,12 +10361,10 @@ static void opj_j2k_setup_header_writing (opj_j2k_t *p_j2k)
opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_siz ); opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_siz );
opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_cod ); opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_cod );
opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_qcd ); opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_qcd );
if (OPJ_IS_CINEMA(p_j2k->m_cp.rsiz)) {
/* No need for COC or QCC, QCD and COD are used
opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_all_coc ); opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_all_coc );
opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_all_qcc ); opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_all_qcc );
*/
if (OPJ_IS_CINEMA(p_j2k->m_cp.rsiz)) {
opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_tlm ); opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(opj_procedure)opj_j2k_write_tlm );
if (p_j2k->m_cp.rsiz == OPJ_PROFILE_CINEMA_4K) { if (p_j2k->m_cp.rsiz == OPJ_PROFILE_CINEMA_4K) {
@ -10363,7 +10444,6 @@ static OPJ_BOOL opj_j2k_write_first_tile_part (opj_j2k_t *p_j2k,
p_total_data_size -= l_current_nb_bytes_written; p_total_data_size -= l_current_nb_bytes_written;
} }
#endif #endif
if (l_cp->tcps[p_j2k->m_current_tile_number].numpocs) { if (l_cp->tcps[p_j2k->m_current_tile_number].numpocs) {
l_current_nb_bytes_written = 0; l_current_nb_bytes_written = 0;
opj_j2k_write_poc_in_memory(p_j2k,p_data,&l_current_nb_bytes_written,p_manager); opj_j2k_write_poc_in_memory(p_j2k,p_data,&l_current_nb_bytes_written,p_manager);