Commit 3cdb7c4a authored by Shikha Shetgeri's avatar Shikha Shetgeri
Browse files

modified macro defination

parent 3e007194

lib_com/ivas_cnst.h

+4 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ typedef enum 
#define IVAS_FORMAT_SIGNALING_NBITS             2                           /* number of bits for signaling the IVAS format */

#define IVAS_FORMAT_SIGNALING_NBITS_SBA         ( IVAS_FORMAT_SIGNALING_NBITS + 1 )

#ifdef ARITH_HUFF_CODER_CHANGES

#define IVAS_SBA_SIGNALING_OVERHEAD             550

#define IVAS_SBA_SIGNALING_OVERHEAD             IVAS_FORMAT_SIGNALING_NBITS_SBA + SBA_ORDER_BITS + SBA_PLANAR_BITS + AGC_HUFF_ARTH + SPAR_NUM_CODING_STRAT_BITS

#endif
@@ -968,6 +968,9 @@ typedef enum 
/* AGC constants */

#define AGC_BITS_PER_CH                         3

#define AGC_EMAX                                0

#ifdef ARITH_HUFF_CODER_CHANGES

#define AGC_HUFF_ARTH                           1

#endif



/* Common SPAR metadata constants */

#define IVAS_ACTIVEW_DM_F_SCALE                 0.5f

lib_enc/ivas_spar_md_enc.c

+2 −3
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include <assert.h>

#include "wmc_auto.h"





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

 * PreProcessor

 *------------------------------------------------------------------------------------------*/
@@ -233,8 +232,8 @@ ivas_error ivas_spar_md_enc_open( 
    bits_C = ( (int16_t) log2( ivas_spar_br_table_consts[table_idx].q_lvls[quant_strat][1] ) + 1 ) * ( ( n_dmx - 1 ) * n_dec );

    bits_P = ( (int16_t) log2( ivas_spar_br_table_consts[table_idx].q_lvls[quant_strat][2] ) + 1 ) * n_dec;

    wc_coarse_strat = bits_PR + bits_C + bits_P;

    wc_coarse_strat = ( wc_coarse_strat * num_bands_arith_huff * FRAMES_PER_SECOND ) + IVAS_SBA_SIGNALING_OVERHEAD;

    wc_coarse_strat = wc_coarse_strat / FRAMES_PER_SECOND;

    wc_coarse_strat = ( ( wc_coarse_strat * num_bands_arith_huff ) + ( IVAS_SBA_SIGNALING_OVERHEAD + hMdEnc->spar_md_cfg.quant_strat_bits ) ) * FRAMES_PER_SEC;

    wc_coarse_strat = wc_coarse_strat / FRAMES_PER_SEC;

    hMdEnc->wc_strat = wc_coarse_strat;

    hMdEnc->wc_coarse_strat_buff = (Indice *) malloc( wc_coarse_strat * sizeof( Indice ) );

#endif