Commit 27744513 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '878-possible-crash-in-apply_noisefill_hq_fx' into 'main'

Change to L_mac0_sat for HQ noisefill energy calculation. Resolves #878.

Closes #878

See merge request !614
parents 53cb969d 0bfe1d28
Loading
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ void apply_noisefill_HQ_fx(
                        {
                            cb_buff[i] = CodeBook_mod[cb_pos++];
                            move16();
                            L_E_cb_vec = L_mac0( L_E_cb_vec, cb_buff[i], cb_buff[i] ); /*Q24 (12+12) */
                            L_E_cb_vec = L_mac0_sat( L_E_cb_vec, cb_buff[i], cb_buff[i] ); /*Q24 (12+12) */

                            if ( GE_16( cb_pos, cb_size ) )
                            {
@@ -446,7 +446,7 @@ void apply_noisefill_HQ_fx(
                        {
                            cb_buff[i] = CodeBook[cb_pos++];
                            move16();
                            L_E_cb_vec = L_mac0( L_E_cb_vec, cb_buff[i], cb_buff[i] ); /*Q24 (12+12) */
                            L_E_cb_vec = L_mac0_sat( L_E_cb_vec, cb_buff[i], cb_buff[i] ); /*Q24 (12+12) */

                            if ( GE_16( cb_pos, cb_size ) )
                            {