Commit 41a63a9a authored by gaoyuy's avatar gaoyuy
Browse files

Merge branch 'hw/issue_84_LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE' into 'main' 

[non-BE] activate LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE

See merge request !511
parents f07a1257 dcbfaed7

lib_com/bits_alloc.c

+26 −21
Original line number Diff line number Diff line
@@ -536,6 +536,9 @@ ivas_error config_acelp1( 
    const int16_t tdm_lp_reuse_flag, /* i  : LPC reuse flag (can be 1 only with secondary channel */

    const int16_t tdm_low_rate_mode, /* i  : secondary channel low rate mode flag */

    const int16_t idchan,            /* i  : stereo channel ID               */

#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE

    const int16_t active_cnt, /* i  : Active frame counter            */

#endif

    const int16_t tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag*/

    const int16_t tdm_LRTD_flag,        /* i  : LRTD stereo mode flag           */

    const int16_t GSC_IVAS_mode         /* i  : GSC IVAS mode                   */
@@ -754,11 +757,12 @@ ivas_error config_acelp1( 
            bits -= acelp_cfg->mid_lsf_bits;

        }

#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE

        else if ( tdm_lp_reuse_flag == 1 && idchan == 1 )

        else if ( tdm_lp_reuse_flag == 1 && idchan == 1 && active_cnt != 1 )

        {

            bits -= TDM_IC_LSF_PRED_BITS;

        }

#endif



        /* gain Q bit-budget - part 1 */

        if ( ( coder_type != UNVOICED && coder_type != AUDIO && coder_type != INACTIVE && !( core_brate <= ACELP_8k00 && coder_type != TRANSITION ) ) || ( coder_type == INACTIVE && total_brate > MAX_GSC_INACTIVE_BRATE ) )

        {
@@ -1323,6 +1327,7 @@ ivas_error config_acelp1( 
                else

                {

                    int16_t nb_prm = 4;



                    if ( tdm_low_rate_mode == 1 )

                    {

                        nb_prm = 2;

lib_com/ivas_cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -793,7 +793,7 @@ enum fea_names 
#define TDM_SIGNAL_BITS_READ_FROM_THE_END_OF_BS ( TDM_SECONDARY_SIGNALLING + TDM_RATIO_BITS + TDM_LP_REUSE_BITS + TDM_LR_CONTENT_BITS + STEREO_BITS_TCA )

#ifdef LSF_RE_USE_SECONDARY_CHANNEL

#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE

#define TDM_IC_LSF_PRED_BITS                    1                           /* Number of bits to code the inter channel lsf prediction mode */

#define TDM_IC_LSF_PRED_BITS                    1                           /* number of bits to code the inter channel LSF prediction mode */

#endif

#endif

lib_com/ivas_prot.h

+4 −4
Original line number Diff line number Diff line
@@ -1919,7 +1919,7 @@ void tdm_low_rate_dec( 
void tdm_SCh_LSF_intra_pred(

    const int32_t element_brate,                                /* i  : element bitrate                         */

    const float *tdm_lsfQ_PCh,                                  /* i  : primary channel LSFs                    */

    float *pred_lsf_secondary                                   /* o  : predicted secondary channel LSFs        */

    float *pred_lsf_SCh                                         /* o  : predicted secondary channel LSFs        */

);



#ifdef LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE
@@ -1930,7 +1930,7 @@ void tdm_SCh_lsf_reuse( 
    float lsp_new[M],                                           /* i/o: LSPs at the end of the frame            */

    const float tdm_lsfQ_PCh[M],                                /* i  : primary channel LSFs                    */

    const float lsf_wgts[M],                                    /* i  : LSF weights                             */

    int16_t beta_index[]                                        /* i/o: quantization index                      */

    int16_t *beta_index                                         /* i/o: quantization index                      */

);

#endif

#endif

lib_com/ivas_rom_com.c

+4 −4
Original line number Diff line number Diff line
@@ -669,10 +669,10 @@ const float tdm_LSF_MEAN_RE_USE[M] = 
    3299.107307F, 3686.249102F, 4034.473656F, 4393.818819F, 4781.683038F, 5155.954294F, 5542.569582F, 5927.377309F

};













const float tdm_Beta_Q1bit_re_use_132[2] = { 0.97F, 0.75F };













const float tdm_Beta_Q1bit_re_use_164[2] = { 0.95F, 0.71F };













const float tdm_Beta_Q1bit_re_use_244_320[2] = { 0.93F, 0.73F };













const float tdm_Beta_Q1bit_re_use_480[2] = { 0.97F, 0.77F };













const float tdm_Beta_Q1bit_re_use_13k2[2] = { 0.97F, 0.75F };













const float tdm_Beta_Q1bit_re_use_16k4[2] = { 0.95F, 0.71F };













const float tdm_Beta_Q1bit_re_use_24k4_32k[2] = { 0.93F, 0.73F };













const float tdm_Beta_Q1bit_re_use_48k[2] = { 0.97F, 0.77F };





























const float tdm_RE_USE_adaptive_beta_prd_diag_3[15 + 16 + 15] =















{

































lib_com/ivas_rom_com.h



+4
−4




























Original line number
Diff line number
Diff line








@@ -115,10 +115,10 @@ extern const float tdm_LSF_MEAN_RE_USE_OUT[M];













extern const float tdm_LSF_MEAN_RE_USE_IN[M];















extern const float tdm_LSF_MEAN_RE_USE[M];





























extern const float tdm_Beta_Q1bit_re_use_132[2];













extern const float tdm_Beta_Q1bit_re_use_164[2];













extern const float tdm_Beta_Q1bit_re_use_244_320[2];













extern const float tdm_Beta_Q1bit_re_use_480[2];













extern const float tdm_Beta_Q1bit_re_use_13k2[2];













extern const float tdm_Beta_Q1bit_re_use_16k4[2];













extern const float tdm_Beta_Q1bit_re_use_24k4_32k[2];













extern const float tdm_Beta_Q1bit_re_use_48k[2];































extern const float tdm_RE_USE_adaptive_beta_prd_diag_3[15 + 16 + 15];















#endif