Commit f09f909a authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'basop-2306-missing-parameter-update-in-speech-music-classifier' into 'main' 

Resolve "Missing parameter update in speech/music classifier"

Closes #2306

See merge request !2687
parents 4b1eb242 eeab75a1

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ 
#define FIX_2252_LP_CNG_STARTS_SID                      /* VA: issues 2251 and 2252: fix LP CNG uninitialized value in bitstream that starts with an SID */

#define FIX_1381_BWD                                    /* VA: issue 1381: apply no hysteresis in BWD at higher bitrates also in mono MASA and OMASA */

#define FIX_2285_CODE_DECODER_INIT_BW                   /* VA: basop issue 2285: fix core-decoder initialization bandwidth */

#define FIX_2306_MISSING_UPDATE_LOWRATE_PITCH_GAIN      /* Dolby: Fix missing update of low-rate pitch gain in the S/M classifier */



/* ##################### End NON-BE switches ########################### */

lib_enc/enc_gen_voic_fx.c

+5 −0
Original line number Diff line number Diff line
@@ -645,6 +645,11 @@ void encod_gen_voic_ivas_fx( 
            push_indice( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );

        }



#ifdef FIX_2306_MISSING_UPDATE_LOWRATE_PITCH_GAIN

        /*st_fx->lowrate_pitchGain = 0.9f * st_fx->lowrate_pitchGain + 0.1f * gain_pit_fx;*/

        st_fx->hSpMusClas->lowrate_pitchGain = round_fx_sat( L_mac_sat( L_mult( 29491, st_fx->hSpMusClas->lowrate_pitchGain ), 6554, gain_pit_fx ) ); /*Q14*Q16(0.1) + Q15 -> Q15*/

#endif



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

         * Transform domain contribution encoding - active frames

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