Commit 0a070491 authored by Jan Kiene's avatar Jan Kiene
Browse files

fix non-BE in non-MDCT Stereo TCX modes

parent 6fd5cf2e

lib_dec/fd_cng_dec.c

+4 −3
Original line number Diff line number Diff line
@@ -506,8 +506,8 @@ void ApplyFdCng( 
            {

                /* update lsf cng estimate for concealment. Do that during concealment, in order to avoid addition clean channel complexity*/



                /* always set psychParameters ... */

                if ( st->hTonalMDCTConc != NULL )

                /* always set psychParameters for MDCT-Stereo ... */

                if ( st->element_mode == IVAS_CPE_MDCT && st->hTonalMDCTConc != NULL )

                {

                    st->hTonalMDCTConc->psychParams = ( st->core == TCX_20_CORE ) ? &st->hTonalMDCTConc->psychParamsTCX20 : &st->hTonalMDCTConc->psychParamsTCX10;

                }
@@ -526,6 +526,7 @@ void ApplyFdCng( 
                        mvr2r( lsp_cng, st->lspold_cng, M );

                        lsp2lsf( lsp_cng, st->lsf_cng, M, sr_core );

                    }

                    st->plcBackgroundNoiseUpdated = 1;

                }

#endif
@@ -534,8 +535,8 @@ void ApplyFdCng( 
                mvr2r( lsp_cng, st->lspold_cng, M );



                lsp2lsf( lsp_cng, st->lsf_cng, M, st->sr_core );

#endif

                st->plcBackgroundNoiseUpdated = 1;

#endif

            }

            break;

lib_dec/igf_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1222,7 +1222,7 @@ void IGFDecApplyMono( 
        IGF_prep( hPrivateData, igfGridIdx, hIGFDec->infoTCXNoise, igf_spec, hPrivateData->pSpecFlat, element_mode );

        IGF_calc( hPrivateData, igfGridIdx, spectrum, igf_spec );

#ifdef MDCT_STEREO_PLC_FADE_2_BG_NOISE

        IGF_appl( hPrivateData, igfGridIdx, spectrum, igf_spec, hIGFDec->virtualSpec, hIGFDec->flag_sparse, element_mode != IVAS_CPE_MDCT );

        IGF_appl( hPrivateData, igfGridIdx, spectrum, igf_spec, hIGFDec->virtualSpec, hIGFDec->flag_sparse, 1 );

#else

        IGF_appl( hPrivateData, igfGridIdx, spectrum, igf_spec, hIGFDec->virtualSpec, hIGFDec->flag_sparse );

#endif

lib_dec/tonalMDCTconcealment.c

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ void TonalMDCTConceal_InsertNoise( 


    g = 1.0f - crossfadeGain;

#ifdef MDCT_STEREO_PLC_FADE_2_BG_NOISE

    if ( !hTonalMDCTConc->lastBlockData.blockIsConcealed && concealment_noise != NULL )

    if ( !hTonalMDCTConc->lastBlockData.blockIsConcealed )

#else

    if ( !hTonalMDCTConc->lastBlockData.blockIsConcealed )

#endif