Commit 0f3d7d7d authored by Shikha Shetgeri's avatar Shikha Shetgeri
Browse files

addressed review comments

parent 3cdb7c4a

lib_com/ivas_cnst.h

+2 −2
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             IVAS_FORMAT_SIGNALING_NBITS_SBA + SBA_ORDER_BITS + SBA_PLANAR_BITS + AGC_HUFF_ARTH + SPAR_NUM_CODING_STRAT_BITS

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

#endif
@@ -969,7 +969,7 @@ typedef enum 
#define AGC_BITS_PER_CH                         3

#define AGC_EMAX                                0

#ifdef ARITH_HUFF_CODER_CHANGES

#define AGC_HUFF_ARTH                           1

#define AGC_SIGNALLING_BITS                     1

#endif



/* Common SPAR metadata constants */

lib_com/ivas_rom_com.c

+7 −1
Original line number Diff line number Diff line
@@ -936,7 +936,13 @@ const ivas_spar_br_table_t ivas_spar_br_table_consts[IVAS_SPAR_BR_TABLE_LEN] = 
    { { 31, 11, 11, 1 },{ 1, 1, 1, 1 },{ 1, 1, 1, 1 } }, 1, 2, 0 },



    { 256000, 0, SBA_HOA3_ORDER, FB, 24000, 4, WYXZ, 0, 0,{ { 76300, 73550, 112000 },{ 59350, 57200, 56000 },{ 42400, 40850, 48000 },{ 25450, 24500, 40000 } },

    { { 31, 11, 11, 1 },{ 1, 1, 1, 1 },{ 31, 1, 1, 1 } }, 1, 2, 0 },

    { { 31, 11, 11, 1 },{ 1, 1, 1, 1 },

#ifdef ARITH_HUFF_CODER_CHANGES

    { 1, 1, 1, 1 }

#else

    { 31, 1, 1, 1 }

#endif

 }, 1, 2, 0 },



    { 384000, 0, SBA_FOA_ORDER, FB, 24000, 4, WYXZ, 0, 0,{ { 128000, 128000, 128000 },{ 100000, 100000, 128000 },{ 79850, 79850, 104000 },{ 66600, 66600, 104000 } },   // not yet optimized

    { { 31, 1, 1, 1 },{ 1, 1, 1, 1 },{ 1, 1, 1, 1 } }, 1, 2, 0 },

lib_enc/ivas_spar_md_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ ivas_error ivas_spar_md_enc_open( 
    {

        quant_strat = QUANT_STRAT_2;

    }

    n_input = ivas_sba_get_nchan_metadata( hEncoderConfig->sba_order );

    n_input = ivas_sba_get_nchan_metadata(sba_order);

    n_dmx = ivas_spar_br_table_consts[table_idx].nchan_transport;

    n_dec = n_input - n_dmx;

    bits_PR = ( (int16_t) log2( ivas_spar_br_table_consts[table_idx].q_lvls[quant_strat][0] ) + 1 ) * ( n_input - 1 );