Commit 50f46e9d authored by multrus's avatar multrus
Browse files

cherry pick patch NONBE_FIX_1376_MDCT_CONCEALMENT

parent b04e6d98

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ 
#define NONBE_1328_FIX_NON_LINEARITY                    /* VA: Fix possible issue when computing bwe_exc_extended and previous frame were almost 0, float issue 1328  */



#define FIX_1984_SAT_IN_PSYCHAD                         /* VA: Issue 1984: proposal to fix an assert */

#define NONBE_FIX_1376_MDCT_CONCEALMENT                 /* FhG: fix concealment artifact in MDCT Stereo with DTX, in case transition frame gets lost */



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_mdct_core_dec_fx.c

+10 −0
Original line number Diff line number Diff line
@@ -1678,7 +1678,17 @@ void ivas_mdct_core_tns_ns_fx( 
                q_x = add( q_x, 1 );

            }



#ifdef NONBE_FIX_1376_MDCT_CONCEALMENT

            /*

               2025-09-07, mul:

               in case of PLC, applying SNS up to L_spec might not be enough: In case the transition frame from DTX after an inactive period is lost, L_spec is assumed to represent a regular TCX frame,

               however, this frame is nevertheless acting as an transition frame as also visible in L_frameTCX; thus, the safer approach to prevent high frequency artifacts is to apply the SNS up to L_frameTCX;

               in case this is not necessary, x[] is filled with zeros, and the multiplication is not causing any additional harm

            */

            v_multc_fixed( x_fx[ch][k] + st->hTcxCfg->psychParamsCurrent->nBins, sns_int_scf_fx[FDNS_NPTS - 1], x_fx[ch][k] + st->hTcxCfg->psychParamsCurrent->nBins, sub( s_max( L_spec[ch], L_frameTCX[ch] ), st->hTcxCfg->psychParamsCurrent->nBins ) );

#else

            v_multc_fixed( x_fx[ch][k] + st->hTcxCfg->psychParamsCurrent->nBins, sns_int_scf_fx[FDNS_NPTS - 1], x_fx[ch][k] + st->hTcxCfg->psychParamsCurrent->nBins, sub( L_spec[ch], st->hTcxCfg->psychParamsCurrent->nBins ) );

#endif



            q_2 = sub( add( q_x, q_sns_int_scf ), 31 );

            Scale_sig32( &x_fx[ch][k][0], st->hTcxCfg->psychParamsCurrent->nBins, sub( q_2, q_x ) );