API Clean Up to remove unsupported (de)compression instructions.
This commit is contained in:
parent
86979f8ffa
commit
3920405c4c
4 changed files with 58 additions and 58 deletions
|
@ -90,16 +90,16 @@
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
void bwc_set_error_resilience (bwc_field *const field);
|
void bwc_set_error_resilience (bwc_field *const field);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
void bwc_set_quant_style (bwc_field *const field,
|
void set_quant_style (bwc_field *const field,
|
||||||
bwc_quant_st const quantization_style);
|
bwc_quant_st const quantization_style);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
void bwc_set_quant_step_size (bwc_field *const field,
|
void set_quant_step_size (bwc_field *const field,
|
||||||
double const delta);
|
double const delta);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
void bwc_set_progression (bwc_field *const field,
|
void set_progression (bwc_field *const field,
|
||||||
bwc_prog_ord const progression);
|
bwc_prog_ord const progression);
|
||||||
//==========|==========================|======================|======|=======|====================
|
//==========|==========================|======================|======|=======|====================
|
||||||
void bwc_set_kernels (bwc_field *const field,
|
void set_kernels (bwc_field *const field,
|
||||||
bwc_dwt_filter const KernelX,
|
bwc_dwt_filter const KernelX,
|
||||||
bwc_dwt_filter const KernelY,
|
bwc_dwt_filter const KernelY,
|
||||||
bwc_dwt_filter const KernelZ,
|
bwc_dwt_filter const KernelZ,
|
||||||
|
|
|
@ -703,7 +703,7 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
|
|
||||||
if(CSsgc & (0x01 << 1))
|
if(CSsgc & (0x01 << 1))
|
||||||
{
|
{
|
||||||
bwc_set_quant_style(field, (bwc_quant_st)buff_long);
|
set_quant_style(field, (bwc_quant_st)buff_long);
|
||||||
}
|
}
|
||||||
|
|
||||||
buff_long = get_symbol(stream, 1);
|
buff_long = get_symbol(stream, 1);
|
||||||
|
@ -719,14 +719,14 @@ parse_main_header(bwc_data *const data,bitstream *const stream)
|
||||||
buff_long = get_symbol(stream, 1);
|
buff_long = get_symbol(stream, 1);
|
||||||
if(CSsgc & (0x01 << 3))
|
if(CSsgc & (0x01 << 3))
|
||||||
{
|
{
|
||||||
bwc_set_progression(field, (uint8)buff_long);
|
set_progression(field, (uint8)buff_long);
|
||||||
}
|
}
|
||||||
|
|
||||||
buff_long = get_symbol(stream, 1);
|
buff_long = get_symbol(stream, 1);
|
||||||
if(CSsgc & (0x01 << 4))
|
if(CSsgc & (0x01 << 4))
|
||||||
{
|
{
|
||||||
bwc_set_kernels(field, (uint8)(0x03 & (buff_long >> 6)), (uint8)(0x03 & (buff_long >> 4)),
|
set_kernels(field, (uint8)(0x03 & (buff_long >> 6)), (uint8)(0x03 & (buff_long >> 4)),
|
||||||
(uint8)(0x03 & (buff_long >> 2)), (uint8)(0x03 & buff_long));
|
(uint8)(0x03 & (buff_long >> 2)), (uint8)(0x03 & buff_long));
|
||||||
}
|
}
|
||||||
|
|
||||||
buff_long = get_symbol(stream, 4);
|
buff_long = get_symbol(stream, 4);
|
||||||
|
|
|
@ -2709,7 +2709,7 @@ bwc_set_error_resilience(bwc_field *const field)
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
void
|
void
|
||||||
bwc_set_quant_style(bwc_field *const field, bwc_quant_st quantization_style)
|
set_quant_style(bwc_field *const field, bwc_quant_st quantization_style)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE STRUCTS: !
|
! DEFINE STRUCTS: !
|
||||||
|
@ -2775,7 +2775,7 @@ bwc_set_quant_style(bwc_field *const field, bwc_quant_st quantization_style)
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
void
|
void
|
||||||
bwc_set_quant_step_size(bwc_field *const field, double delta)
|
set_quant_step_size(bwc_field *const field, double delta)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE STRUCTS: !
|
! DEFINE STRUCTS: !
|
||||||
|
@ -2880,7 +2880,7 @@ bwc_set_quant_step_size(bwc_field *const field, double delta)
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
void
|
void
|
||||||
bwc_set_progression(bwc_field *const field, bwc_prog_ord progression)
|
set_progression(bwc_field *const field, bwc_prog_ord progression)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE STRUCTS: !
|
! DEFINE STRUCTS: !
|
||||||
|
@ -2953,8 +2953,8 @@ bwc_set_progression(bwc_field *const field, bwc_prog_ord progression)
|
||||||
! !
|
! !
|
||||||
\*----------------------------------------------------------------------------------------------------------*/
|
\*----------------------------------------------------------------------------------------------------------*/
|
||||||
void
|
void
|
||||||
bwc_set_kernels(bwc_field *const field, bwc_dwt_filter KernelX, bwc_dwt_filter KernelY,
|
set_kernels(bwc_field *const field, bwc_dwt_filter KernelX, bwc_dwt_filter KernelY,
|
||||||
bwc_dwt_filter KernelZ, bwc_dwt_filter KernelTS)
|
bwc_dwt_filter KernelZ, bwc_dwt_filter KernelTS)
|
||||||
{
|
{
|
||||||
/*-----------------------*\
|
/*-----------------------*\
|
||||||
! DEFINE STRUCTS: !
|
! DEFINE STRUCTS: !
|
||||||
|
|
|
@ -2751,38 +2751,38 @@ main(int argc,
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! !
|
! !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
temp = retrieve_arg(args, "wavelet_kernels");
|
// temp = retrieve_arg(args, "wavelet_kernels");
|
||||||
if((temp != NULL) && (temp->count == 4) && (temp->dim != 0x00))
|
// if((temp != NULL) && (temp->count == 4) && (temp->dim != 0x00))
|
||||||
{
|
// {
|
||||||
for(i = 0; i < temp->count; ++i)
|
// for(i = 0; i < temp->count; ++i)
|
||||||
{
|
// {
|
||||||
switch(hash(temp->lit_opt[i]))
|
// switch(hash(temp->lit_opt[i]))
|
||||||
{
|
// {
|
||||||
case 0x000000000B87CF64:
|
// case 0x000000000B87CF64:
|
||||||
{
|
// {
|
||||||
filter[i] = bwc_dwt_9_7;
|
// filter[i] = bwc_dwt_9_7;
|
||||||
break;
|
// break;
|
||||||
}
|
// }
|
||||||
case 0x00000652AB15772A:
|
// case 0x00000652AB15772A:
|
||||||
{
|
// {
|
||||||
filter[i] = bwc_dwt_5_3;
|
// filter[i] = bwc_dwt_5_3;
|
||||||
break;
|
// break;
|
||||||
}
|
// }
|
||||||
case 0x000000017C858EFF:
|
// case 0x000000017C858EFF:
|
||||||
{
|
// {
|
||||||
filter[i] = bwc_dwt_5_3;
|
// filter[i] = bwc_dwt_5_3;
|
||||||
break;
|
// break;
|
||||||
}
|
// }
|
||||||
default:
|
// default:
|
||||||
{
|
// {
|
||||||
filter[i] = bwc_dwt_9_7;
|
// filter[i] = bwc_dwt_9_7;
|
||||||
break;
|
// break;
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
bwc_set_kernels(field, filter[0], filter[1],
|
// bwc_set_kernels(field, filter[0], filter[1],
|
||||||
filter[2], filter[3]);
|
// filter[2], filter[3]);
|
||||||
}
|
// }
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! !
|
! !
|
||||||
|
@ -2827,23 +2827,23 @@ main(int argc,
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! !
|
! !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
temp = retrieve_arg(args, "quantisation_style");
|
// temp = retrieve_arg(args, "quantisation_style");
|
||||||
if((temp != NULL) && (temp->count == 1))
|
// if((temp != NULL) && (temp->count == 1))
|
||||||
{
|
// {
|
||||||
if(strcmp(temp->lit_opt[0], "NONE"))
|
// if(strcmp(temp->lit_opt[0], "NONE"))
|
||||||
bwc_set_quant_style(field, bwc_qt_none);
|
// bwc_set_quant_style(field, bwc_qt_none);
|
||||||
else
|
// else
|
||||||
bwc_set_quant_style(field, bwc_qt_derived);
|
// bwc_set_quant_style(field, bwc_qt_derived);
|
||||||
}
|
// }
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! !
|
! !
|
||||||
\*--------------------------------------------------------*/
|
\*--------------------------------------------------------*/
|
||||||
temp = retrieve_arg(args, "quantisation_step_size");
|
// temp = retrieve_arg(args, "quantisation_step_size");
|
||||||
if((temp != NULL) && (temp->count == 1))
|
// if((temp != NULL) && (temp->count == 1))
|
||||||
{
|
// {
|
||||||
bwc_set_quant_step_size(field, temp->num_opt[0]);
|
// bwc_set_quant_step_size(field, temp->num_opt[0]);
|
||||||
}
|
// }
|
||||||
|
|
||||||
/*--------------------------------------------------------*\
|
/*--------------------------------------------------------*\
|
||||||
! !
|
! !
|
||||||
|
|
Loading…
Reference in a new issue