Commit ce5579b7 authored by PLAINSI's avatar PLAINSI
Browse files

Update name of define

parent c26005fe

lib_com/ivas_cnst.h

+2 −2
Original line number Diff line number Diff line
@@ -1346,7 +1346,7 @@ typedef enum { 
    BETA

} PAR_TYPE;



#ifndef FIX_DLB_PARAMUPMIX_CLEANUP

#ifndef FIX_891_PARAMUPMIX_CLEANUP

typedef enum {

    FINE,

    COARSE
@@ -1358,7 +1358,7 @@ typedef struct { 
    int16_t offset;

    float data[35];

} ACPL_QUANT_TABLE;  

#ifdef FIX_DLB_PARAMUPMIX_CLEANUP

#ifdef FIX_891_PARAMUPMIX_CLEANUP

typedef struct

{

    const int16_t (*alpha)[2];

lib_com/ivas_rom_com.c

+2 −2
Original line number Diff line number Diff line
@@ -2522,7 +2522,7 @@ const uint16_t ivas_param_mc_sym_freq_ild_delta_combined_48_16bits[2 * PARAM_MC_ 
/*----------------------------------------------------------------------------------*

 * Parametric Upmix MC ROM tables

 *----------------------------------------------------------------------------------*/

#ifdef FIX_DLB_PARAMUPMIX_CLEANUP

#ifdef FIX_891_PARAMUPMIX_CLEANUP

const int16_t ivas_param_upmx_mx_qmap[33] =

{ 

    0, 1, 2, 3, 4, 5, 6, 7, 8, 7, 6, 5, 4, 3, 2, 1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 7, 6, 5, 4, 3, 2, 1, 0
@@ -6443,7 +6443,7 @@ const int16_t sns_1st_means_32k[2][16] = 
/*----------------------------------------------------------------------*

 * MC ParamUpmix ROM tables

 *-----------------------------------------------------------------------*/

#ifdef FIX_DLB_PARAMUPMIX_CLEANUP

#ifdef FIX_891_PARAMUPMIX_CLEANUP

const ACPL_QUANT_TABLE ivas_mc_paramupmix_alpha_quant_table =

{

        33, /* nquant */

lib_com/ivas_rom_com.h

+2 −2
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ extern const uint16_t ivas_param_mc_sym_freq_icc_delta_combined_48_16bits[2 * PA 
/*----------------------------------------------------------------------------------*

 * Parametric Upmix MC ROM tables

 *----------------------------------------------------------------------------------*/

#ifdef FIX_DLB_PARAMUPMIX_CLEANUP

#ifdef FIX_891_PARAMUPMIX_CLEANUP

extern const int16_t ivas_param_upmx_mx_qmap[33];

#else

extern const int16_t ivas_param_upmx_mx_qmap[2][33];
@@ -456,7 +456,7 @@ extern const int16_t sns_1st_means_32k[2][16]; 
/*----------------------------------------------------------------------*

 * MC ParamUpmix ROM tables

 *-----------------------------------------------------------------------*/

#ifdef FIX_DLB_PARAMUPMIX_CLEANUP

#ifdef FIX_891_PARAMUPMIX_CLEANUP

extern const ACPL_QUANT_TABLE ivas_mc_paramupmix_alpha_quant_table;

extern const ACPL_QUANT_TABLE ivas_mc_paramupmix_beta_quant_table[9];

#else

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ 
#define FIX_890_ARRAY_SIZE                              /* Nokia: issue #890: mismatch in 2D array size declaration and use */

#define BE_FIX_887_GCC_WARNING_ARRAY_SIZE               /* VoiceAge: Issue 887: change array size definition to avoid warning with gcc 11.4.0 */

#define FIX_247_EXTERNAL_RENDERER_COMMAND_LINE          /* VA: issue 247: harmonize command-line options names of external renderer with the decoder */

#define FIX_DLB_PARAMUPMIX_CLEANUP

#define FIX_891_PARAMUPMIX_CLEANUP                      /* Dlb: issue 891: remove unneeded code from ParamUpmix */



/* #################### End BE switches ################################## */

lib_dec/ivas_mc_paramupmix_dec.c

+15 −16
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static void ivas_param_upmix_dec_decorr_subframes( Decoder_Struct *st_ivas, cons 
static void paramupmix_td_decorr_process( ivas_td_decorr_state_t *hTdDecorr[], float *pcm_in[], float **pp_out_pcm, const int16_t output_frame );



static int16_t huff_read( Decoder_State *st, const int16_t ( *ht )[2] );

#ifdef FIX_DLB_PARAMUPMIX_CLEANUP

#ifdef FIX_891_PARAMUPMIX_CLEANUP

static void huffman_decode( Decoder_State *st, PAR_TYPE parType, int32_t *vq );



static void dequant_alpha( int32_t *vq, float *v );
@@ -149,7 +149,7 @@ void ivas_mc_paramupmix_dec_read_BS( 


        for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ )

        {

#ifdef FIX_DLB_PARAMUPMIX_CLEANUP

#ifdef FIX_891_PARAMUPMIX_CLEANUP

            get_ec_data( st0, ALPHA, hMCParamUpmix->alpha_quant[i], alpha_quant, hMCParamUpmix->alphas[i] );



            get_ec_data( st0, BETA, hMCParamUpmix->beta_quant[i], alpha_quant, hMCParamUpmix->betas[i] );
@@ -1348,13 +1348,12 @@ static int16_t huff_read( 


static void huffman_decode(

    Decoder_State *st,

#ifndef FIX_DLB_PARAMUPMIX_CLEANUP

#ifndef FIX_891_PARAMUPMIX_CLEANUP

    const int16_t nv,

    const int16_t ivStart,

    const PAR_TYPE parType,

    const QUANT_TYPE quant_type,

    const int16_t bNoDt,

    0

#else

    const PAR_TYPE parType,

#endif
@@ -1366,7 +1365,7 @@ static void huffman_decode( 
    nquant = 0;

    switch ( parType )

    {

#ifdef FIX_DLB_PARAMUPMIX_CLEANUP

#ifdef FIX_891_PARAMUPMIX_CLEANUP

        case ALPHA:

            nquant = ivas_mc_paramupmix_alpha_quant_table.nquant;

            break;
@@ -1387,7 +1386,7 @@ static void huffman_decode( 


    offset = nquant - 1; /* range of df/dt [-(nquant - 1), nquant - 1] */



#ifdef FIX_DLB_PARAMUPMIX_CLEANUP

#ifdef FIX_891_PARAMUPMIX_CLEANUP

    bdt = st->bit_stream[st->next_bit_pos];

    st->next_bit_pos++;

#else
@@ -1405,7 +1404,7 @@ static void huffman_decode( 
    { /* Get dt */

        switch ( parType )

        {

#ifdef FIX_DLB_PARAMUPMIX_CLEANUP

#ifdef FIX_891_PARAMUPMIX_CLEANUP

            case ALPHA:

                huff_node_table = ivas_mc_paramupmix_huff_nodes_dt.alpha;

                break;
@@ -1441,7 +1440,7 @@ static void huffman_decode( 
    {

        switch ( parType )

        {

#ifdef FIX_DLB_PARAMUPMIX_CLEANUP

#ifdef FIX_891_PARAMUPMIX_CLEANUP

            case ALPHA:

                huff_node_table = ivas_mc_paramupmix_huff_nodes_df0.alpha;

                break;
@@ -1507,7 +1506,7 @@ static void huffman_decode( 




static void dequant_alpha(

#ifndef FIX_DLB_PARAMUPMIX_CLEANUP

#ifndef FIX_891_PARAMUPMIX_CLEANUP

    const int16_t nv,

    const int16_t ivStart,

    const QUANT_TYPE quant_type,
@@ -1516,7 +1515,7 @@ static void dequant_alpha( 
    float *v )

{

    int16_t iv;

#ifdef FIX_DLB_PARAMUPMIX_CLEANUP

#ifdef FIX_891_PARAMUPMIX_CLEANUP

    const ACPL_QUANT_TABLE *quant_table = &ivas_mc_paramupmix_alpha_quant_table;



    for ( iv = 0; iv < 0; iv++ )
@@ -1546,7 +1545,7 @@ static void dequant_alpha( 




static void dequant_beta(

#ifndef FIX_DLB_PARAMUPMIX_CLEANUP

#ifndef FIX_891_PARAMUPMIX_CLEANUP

    const int16_t nv,

    const int16_t ivStart,

    const QUANT_TYPE quant_type,
@@ -1558,7 +1557,7 @@ static void dequant_beta( 
    int16_t iv;

    const ACPL_QUANT_TABLE *quant_table;



#ifdef FIX_DLB_PARAMUPMIX_CLEANUP

#ifdef FIX_891_PARAMUPMIX_CLEANUP

    for ( iv = 0; iv < 0; iv++ )

    {

        beta[iv] = 0;
@@ -1588,7 +1587,7 @@ static void dequant_beta( 
static void get_ec_data(

    Decoder_State *st,

    const PAR_TYPE parType,

#ifndef FIX_DLB_PARAMUPMIX_CLEANUP

#ifndef FIX_891_PARAMUPMIX_CLEANUP

    const QUANT_TYPE quant_type,

    const int16_t nParBand,

    const int16_t parBandStart,
@@ -1597,7 +1596,7 @@ static void get_ec_data( 
    int32_t *alphaQEnv,

    float ab[IVAS_MAX_NUM_BANDS] )

{

#ifdef FIX_DLB_PARAMUPMIX_CLEANUP

#ifdef FIX_891_PARAMUPMIX_CLEANUP

    huffman_decode( st, parType, parQ );

#else

    huffman_decode( st, nParBand, parBandStart, parType, quant_type, 0, parQ );
@@ -1605,7 +1604,7 @@ static void get_ec_data( 


    if ( parType == ALPHA )

    {

#ifdef FIX_DLB_PARAMUPMIX_CLEANUP

#ifdef FIX_891_PARAMUPMIX_CLEANUP

        dequant_alpha( parQ, ab );

        mvl2l( parQ, alphaQEnv, (int16_t) IVAS_MAX_NUM_BANDS );

#else
@@ -1615,7 +1614,7 @@ static void get_ec_data( 
    }

    else

    {

#ifdef FIX_DLB_PARAMUPMIX_CLEANUP

#ifdef FIX_891_PARAMUPMIX_CLEANUP

        dequant_beta( alphaQEnv, parQ, ab );

#else

        dequant_beta( nParBand, parBandStart, quant_type, alphaQEnv, parQ, ab );