Commit a769dd49 authored by Mohammadreza Naghibzadeh's avatar Mohammadreza Naghibzadeh
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 2211-fix-assert-in-ivas_rend_crendConvolver_fx-with-mc
parents a75f0f0e fdd4a771

lib_enc/ivas_spar_encoder_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -929,7 +929,11 @@ static ivas_error ivas_spar_enc_process_fx( 
    IF( hSpar->hFbMixer->fb_cfg->active_w_mixing == 0 )

    {

        /*cross fade between new active W channels and old passive W channel*/

#ifdef BE_FIX_1391_COVERAGE_SPAR_DYN__CHANNEL

        IF( EQ_16( dyn_active_w_flag, 1 ) || EQ_16( hSpar->hMdEnc->spar_md.prior_dyn_active_w_flag, 1 ) )

#else

        IF( EQ_16( dyn_active_w_flag, 1 ) )

#endif

        {

            IF( NE_16( hSpar->hMdEnc->spar_md.prior_dyn_active_w_flag, dyn_active_w_flag ) )

            {