Commit 0ac7e711 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

temp change: reverting prev bfi change

parent 0b6a1753

lib_dec/ivas_corecoder_dec_reconfig.c

+9 −19
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ ivas_error ivas_corecoder_dec_reconfig( 
    MC_MODE last_mc_mode;

    DECODER_CONFIG_HANDLE hDecoderConfig;

    ivas_error error;

#ifdef NONBE_FIX_862_UBSAN_SPAR_DEC_BR_SW_PLC

#if 0 // def NONBE_FIX_862_UBSAN_SPAR_DEC_BR_SW_PLC

    int16_t prev_bfi;

    Decoder_State *st0;

#endif
@@ -145,7 +145,7 @@ ivas_error ivas_corecoder_dec_reconfig( 
    }

    else

    {

#ifdef NONBE_FIX_862_UBSAN_SPAR_DEC_BR_SW_PLC

#if 0 // def NONBE_FIX_862_UBSAN_SPAR_DEC_BR_SW_PLC

        st0 = ( nSCE_old > 0 ) ? st_ivas->hSCE[0]->hCoreCoder[0] : st_ivas->hCPE[0]->hCoreCoder[0];

        prev_bfi = st0->prev_bfi;

#endif
@@ -221,6 +221,9 @@ ivas_error ivas_corecoder_dec_reconfig( 
            {

                return error;

            }

#if 0 // def NONBE_FIX_862_UBSAN_SPAR_DEC_BR_SW_PLC

            st_ivas->hSCE[sce_id]->hCoreCoder[0]->prev_bfi = prev_bfi;

#endif

        }

        if ( st_ivas->sba_dirac_stereo_flag && sba_dirac_stereo_flag_old && st_ivas->nchan_transport == 1 && nSCE_old == 0 )

        {
@@ -249,6 +252,10 @@ ivas_error ivas_corecoder_dec_reconfig( 
            {

                return error;

            }

#if 0 // def NONBE_FIX_862_UBSAN_SPAR_DEC_BR_SW_PLC

            st_ivas->hCPE[cpe_id]->hCoreCoder[0]->prev_bfi = prev_bfi;

            st_ivas->hCPE[cpe_id]->hCoreCoder[1]->prev_bfi = prev_bfi;

#endif

        }



        if ( st_ivas->nCPE > 1 && nCPE_old <= 1 )
@@ -301,23 +308,6 @@ ivas_error ivas_corecoder_dec_reconfig( 
                st_ivas->hCPE[0]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_REGULAR;

            }

        }



#ifdef NONBE_FIX_862_UBSAN_SPAR_DEC_BR_SW_PLC

        for ( sce_id = 0; sce_id < st_ivas->nSCE; sce_id++ )

        {

            st_ivas->hSCE[sce_id]->hCoreCoder[0]->prev_bfi = prev_bfi;

        }

        for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ )

        {

            for ( n = 0; n < CPE_CHANNELS; n++ )

            {

                if ( st_ivas->hCPE[cpe_id]->hCoreCoder[n] != NULL )

                {

                    st_ivas->hCPE[cpe_id]->hCoreCoder[n]->prev_bfi = prev_bfi;

                }

            }

        }

#endif

    }



    /* create dummy CPE element for DFT stereo-like upmix */