Commit be6b875f authored by Vidhya V P's avatar Vidhya V P
Browse files

Removed the switch ARITH_HUFF_CODER_CHANGES_1 

[x] Merged it with the switch ARITH_HUFF_CODER_CHANGES
parent 97d501e0

lib_com/ivas_prot.h

+1 −4
Original line number Diff line number Diff line
@@ -4521,12 +4521,9 @@ void ivas_spar_set_bitrate_config( 
    ivas_spar_md_com_cfg *pSpar_md_cfg,                         /* i/o: SPAR MD config. handle                  */

    const int16_t table_idx,                                    /* i  : config. table index                     */

    const int16_t num_bands                                     /* i  : number of bands                         */

#ifdef ARITH_HUFF_CODER_CHANGES_1

    ,

    const int16_t dirac2spar_md_flag

#endif

#ifdef ARITH_HUFF_CODER_CHANGES

    ,

    const int16_t dirac2spar_md_flag,

    const int16_t enc_flag,

    const int16_t pca_flag,

    const int16_t agc_flag

lib_com/ivas_spar_com.c

+2 −13
Original line number Diff line number Diff line
@@ -2136,12 +2136,9 @@ void ivas_spar_set_bitrate_config( 
    ivas_spar_md_com_cfg *pSpar_md_cfg, /* i/o: SPAR MD config. handle  */

    const int16_t table_idx,            /* i  : config. table index     */

    const int16_t num_bands             /* i  : number of bands         */

#ifdef ARITH_HUFF_CODER_CHANGES_1

    ,

    const int16_t dirac2spar_md_flag

#endif

#ifdef ARITH_HUFF_CODER_CHANGES

    ,

    const int16_t dirac2spar_md_flag,

    const int16_t enc_flag,

    const int16_t pca_flag,

    const int16_t agc_flag
@@ -2158,8 +2155,6 @@ void ivas_spar_set_bitrate_config( 
    int16_t wc_coarse_strat;

    int16_t n_input, n_dmx, n_dec;

    int16_t quant_strat;

#endif

#ifdef ARITH_HUFF_CODER_CHANGES_1

    int16_t bands_bw;

#endif

    pSpar_md_cfg->nchan_transport = ivas_spar_br_table_consts[table_idx].nchan_transport;
@@ -2205,7 +2200,7 @@ void ivas_spar_set_bitrate_config( 


    pSpar_md_cfg->tgt_bits_per_blk -= md_coding_bits_header;

    pSpar_md_cfg->max_bits_per_blk -= md_coding_bits_header;

#ifdef ARITH_HUFF_CODER_CHANGES_1

#ifdef ARITH_HUFF_CODER_CHANGES

    if ( ivas_total_brate < IVAS_24k4 )

    {

        bands_bw = 2;
@@ -2235,12 +2230,8 @@ void ivas_spar_set_bitrate_config( 
            quant_strat = QUANT_STRAT_2;

        }



#ifdef ARITH_HUFF_CODER_CHANGES_1

        num_PR_bits_dirac_bands = ( dirac2spar_md_flag == 1 ) ? num_bands - SPAR_DIRAC_SPLIT_START_BAND : 0;

        num_PR_bits_dirac_bands /= bands_bw;

#else

        num_PR_bits_dirac_bands = num_bands - SPAR_DIRAC_SPLIT_START_BAND;

#endif

        num_PR_bits_dirac_bands = max( 0, num_PR_bits_dirac_bands );

        num_PR_bits_dirac_bands *= DIRAC_TO_SPAR_HBR_PRED_CHS;
@@ -2254,9 +2245,7 @@ void ivas_spar_set_bitrate_config( 
        bits_P = (int16_t) ceilf( log2f( ivas_spar_br_table_consts[table_idx].q_lvls[quant_strat][2] ) ) * ( n_dec );

        wc_coarse_strat = bits_PR + bits_C + bits_P;

        wc_coarse_strat *= num_bands;

#ifdef ARITH_HUFF_CODER_CHANGES_1

        wc_coarse_strat /= bands_bw;

#endif

        wc_coarse_strat -= num_PR_bits_dirac_bands;

        wc_coarse_strat += md_coding_bits_header;

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@ 
#define LBR_SBA_DIRAC_FIX                               /* DLB: Bug fix for DirAC at low bitrates */



#define ARITH_HUFF_CODER_CHANGES                        /* DLB: Optimization of metadata memory for Huffman and arithmetic coders */

#define ARITH_HUFF_CODER_CHANGES_1                       /* DLB: additional changes for Huffman and arithmetic coders*/

#define FIX_445_SNS_BUGFIXES                            /* FhG: bug fix for spectral tilt in SNS computation + necessary update of codebooks and converison to fixedpoint-compatible tables */

#define FIX_447_PARAMBIN_MASA_REGU_FAC                  /* Nokia: Issue 447: Fix issue by adjusting regularization factor minimum value. */

#define FIX_441_SBA_PARAMBIN_GAINS                      /* Nokia: Fix issue 441 by changing gains in SBA path of parametric binauralizer */

lib_dec/ivas_spar_md_dec.c

+1 −4
Original line number Diff line number Diff line
@@ -528,12 +528,9 @@ ivas_error ivas_spar_md_dec_init( 


    hMdDec->spar_md.num_bands = ( hMdDec->spar_hoa_md_flag ) ? IVAS_MAX_NUM_BANDS : min( IVAS_MAX_NUM_BANDS, SPAR_DIRAC_SPLIT_START_BAND );

    ivas_spar_set_bitrate_config( &hMdDec->spar_md_cfg, hMdDec->table_idx, hMdDec->spar_md.num_bands

#ifdef ARITH_HUFF_CODER_CHANGES_1

                                  ,

                                  hMdDec->spar_hoa_dirac2spar_md_flag

#endif

#ifdef ARITH_HUFF_CODER_CHANGES

                                  ,

                                  hMdDec->spar_hoa_dirac2spar_md_flag,

                                  0, 0, 0

#endif

    );

lib_enc/ivas_sba_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -292,9 +292,6 @@ int16_t ivas_sba_get_max_md_bits( 
    Encoder_Struct *st_ivas )

{

    int16_t max_md_bits;

#ifndef ARITH_HUFF_CODER_CHANGES_1

    max_md_bits = min( st_ivas->hQMetaData->metadata_max_bits + 1, 500 ); // TODO: remove 500 once max MD bits has been defined at all bitrates in DirAC

#else

    int16_t max_bits;

    if ( ivas_get_hodirac_flag( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->sba_analysis_order ) )

    {
@@ -305,7 +302,6 @@ int16_t ivas_sba_get_max_md_bits( 
        max_bits = 500;

    }

    max_md_bits = min( st_ivas->hQMetaData->metadata_max_bits + 1, max_bits ); // TODO: remove 500 once max MD bits has been defined at all bitrates in DirAC

#endif

    if ( st_ivas->sba_mode == SBA_MODE_SPAR )

    {

        max_md_bits += st_ivas->hSpar->hMdEnc->spar_md_cfg.max_md_bits_spar;