Commit a5ac972f authored by vaclav's avatar vaclav
Browse files

rename evs_brs -> core_brs

parent f9090347

lib_com/ivas_spar_com.c

+4 −5
Original line number Diff line number Diff line
@@ -2139,8 +2139,8 @@ void ivas_spar_set_bitrate_config( 


    for ( i = 0; i < pSpar_md_cfg->nchan_transport; i++ )

    {

        total_bits += (int16_t) ( ivas_spar_br_table_consts[table_idx].evs_brs[i][0] / FRAMES_PER_SEC );

        max_bits += (int16_t) ( ivas_spar_br_table_consts[table_idx].evs_brs[i][1] / FRAMES_PER_SEC );

        total_bits += (int16_t) ( ivas_spar_br_table_consts[table_idx].core_brs[i][0] / FRAMES_PER_SEC );

        max_bits += (int16_t) ( ivas_spar_br_table_consts[table_idx].core_brs[i][1] / FRAMES_PER_SEC );

    }

    pSpar_md_cfg->tgt_bits_per_blk = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC ) - IVAS_FORMAT_SIGNALING_NBITS_SBA - SBA_PLANAR_BITS - SBA_ORDER_BITS - length - total_bits;
@@ -2165,7 +2165,6 @@ void ivas_spar_set_bitrate_config( 
 * Set SPAR bitrate distribution

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



// this function is not currently used but it is kept for future use

void ivas_spar_bitrate_dist(

    int32_t core_brates_act[],      /* o  : bitrates per core-coder     */

    const int16_t nAvailBits,       /* i  : number of available bits    */
@@ -2185,7 +2184,7 @@ void ivas_spar_bitrate_dist( 
    sum_core_act_bits = 0;

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

    {

        core_bits_act[i] = (int16_t) ( ivas_spar_br_table_consts[table_idx].evs_brs[i][0] / FRAMES_PER_SEC );

        core_bits_act[i] = (int16_t) ( ivas_spar_br_table_consts[table_idx].core_brs[i][0] / FRAMES_PER_SEC );



        sum_core_act_bits += core_bits_act[i];

    }
@@ -2211,7 +2210,7 @@ void ivas_spar_bitrate_dist( 
    {

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

        {

            core_range_bits[i] = (int16_t) ( ( ivas_spar_br_table_consts[table_idx].evs_brs[i][0] - ivas_spar_br_table_consts[table_idx].evs_brs[i][1] ) / FRAMES_PER_SEC );

            core_range_bits[i] = (int16_t) ( ( ivas_spar_br_table_consts[table_idx].core_brs[i][0] - ivas_spar_br_table_consts[table_idx].evs_brs[i][1] ) / FRAMES_PER_SEC );

        }



        overflow_bits = -residual_bits;

lib_com/ivas_stat_com.h

+2 −1
Original line number Diff line number Diff line
@@ -373,11 +373,12 @@ typedef struct ivas_spar_br_table_t 
    ivas_spar_pmx_strings_t dmx_str;

    int16_t active_w;

    int16_t tmode;

    int32_t evs_brs[FOA_CHANNELS][3]; // VE: rename to core_brs

    int32_t core_brs[FOA_CHANNELS][3];

    int16_t q_lvls[MAX_QUANT_STRATS][NUM_MD_Q_COEFS_SET];

    int16_t td_ducking;

    int16_t agc_bits_ch_idx; /* 0-3, Indicates core-coder channel index from which AGC bits have been taken from*/

    int16_t usePlanarCoeff;



} ivas_spar_br_table_t;