Commit 0b809363 authored by Manuel Jander's avatar Manuel Jander
Browse files

Fix more cases where number of bands is lower than CLDFB_NO_CHANNELS_HALF.

parent 2ab6e934

lib_rend/ivas_dirac_output_synthesis_dec_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -2060,9 +2060,9 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx( 
#ifdef FIX_867_CLDFB_NRG_SCALE

            /* Is this necessary at all ? */

            q_com = s_min( s_min( q_reference_power_smooth[0], q_reference_power_smooth[1] ), h_dirac_output_synthesis_state->q_cy_auto_diff_smooth );

            scale_sig32( reference_power_smooth, CLDFB_NO_CHANNELS_HALF, sub( q_com, q_reference_power_smooth[0] ) );                                                                                                     /**q_reference_power_smooth->q_com*/

            scale_sig32( reference_power_smooth + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( q_com, q_reference_power_smooth[1] ) );                                         /**q_reference_power_smooth->q_com*/

            scale_sig32( h_dirac_output_synthesis_state->reference_power_smooth_prev_fx, CLDFB_NO_CHANNELS_HALF, sub( q_com, q_reference_power_smooth[0] ) );                                                             /**q_reference_power_smooth->q_com*/

            scale_sig32( reference_power_smooth, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( q_com, q_reference_power_smooth[0] ) );                                                                                                     /**q_reference_power_smooth->q_com*/

            scale_sig32( reference_power_smooth + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( num_freq_bands, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) ), sub( q_com, q_reference_power_smooth[1] ) );                                         /**q_reference_power_smooth->q_com*/

            scale_sig32( h_dirac_output_synthesis_state->reference_power_smooth_prev_fx, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( q_com, q_reference_power_smooth[0] ) );                                                             /**q_reference_power_smooth->q_com*/

            scale_sig32( h_dirac_output_synthesis_state->reference_power_smooth_prev_fx + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( q_com, q_reference_power_smooth[1] ) ); /**q_reference_power_smooth->q_com*/

            scale_sig32( h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx,

                         i_mult( num_freq_bands, nchan_target_psds ),