Commit 1c58561f authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'issue_740_fix' into 'main' 

Resolve "Overlap-add zeroed for HQ-core at 24.4 kbps & 32 kbps (ISM)"

See merge request !254
parents e3b14a9e 633b2816

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ 
#define FIX_ISSUE_723_INFO_TCX_NOISE /*FhG: Issue 723: fix for IGF that introduces wrong noise filling behavion*/



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



#define FIX_740_HQ_CORE_OVA // Proposed fix to solve overlap and add issue for HQ_CORE

/* ################## End DEVELOPMENT switches ######################### */



/* clang-format on */

lib_dec/ivas_core_dec.c

+2 −1
Original line number Diff line number Diff line
@@ -2308,8 +2308,9 @@ ivas_error ivas_core_dec( 
             exp_old_out = Find_Max_Norm16(st->hHQ_core->old_out_fx + NS2SA(st->output_Fs, N_ZERO_MDCT_NS), NS2SA(st->output_Fs, N_ZERO_MDCT_NS) + NS2SA(st->output_Fs, PH_ECU_LOOKAHEAD_NS) - NS2SA(st->output_Fs, N_ZERO_MDCT_NS));

             exp_delay_buf_out = Find_Max_Norm16(st->delay_buf_out_fx, NS2SA(st->output_Fs, DELAY_CLDFB_NS));

             exp_synth_history = Find_Max_Norm16(st->hTcxDec->synth_history_fx + output_frame, 2 * output_frame - NS2SA(st->output_Fs, DELAY_CLDFB_NS) + NS2SA(st->output_Fs, PH_ECU_MEM_NS) - output_frame);

#ifndef FIX_740_HQ_CORE_OVA

             exp_synth_history += st->hTcxDec->q_synth_history_fx;



#endif

             exp_max = s_min(exp_synth_history, exp_ouput);

             exp_max = s_min(exp_max, exp_prev_synth_buffer); move16();

             exp_max = s_min(exp_max, exp_old_out); move16();