Commit aa9f1d31 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch... 

Merge branch 'basop-2397-clang18-msan-use-of-uninitialized-value-in-lib_dec-ivas_stereo_mdct_core_dec_fx-c-392-9' into kiene/test-ubuntu-24_04-runner
parents 86ad4afa a5f9279d

lib_dec/ivas_mct_dec_fx.c

+5 −0
Original line number Diff line number Diff line
@@ -228,7 +228,12 @@ ivas_error ivas_mct_dec_fx( 
        FOR( n = 0; n < CPE_CHANNELS; n++ )

        {

#ifdef FIX_2382_COPY_AQ_IN_MCT

#ifdef FIX_2397_COPY_AQ_MDCT_CORE_BFI

            test();

            IF( !st_ivas->bfi && NE_16( hCPE->hCoreCoder[n]->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )

#else

            IF( NE_16( hCPE->hCoreCoder[n]->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )

#endif

            {

                Word16 nSubframes;

lib_dec/ivas_stereo_mdct_core_dec_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ void stereo_mdct_core_dec_fx( 
    }



#ifdef FIX_2397_COPY_AQ_MDCT_CORE_BFI

    IF( NE_16( bfi, 1 ) )

    IF( !bfi )

    {

#ifdef FIX_2352_COPY_AQ_IN_TCX

        FOR( ch = 0; ch < nChannels; ch++ )
@@ -392,7 +392,7 @@ void stereo_mdct_core_dec_fx( 
#endif

        {

#ifdef FIX_2352_COPY_AQ_IN_TCX

            Copy_Scale_sig_16_32_DEPREC( Aq_fx[ch], Aq_fx_32[ch], nSubframes[ch] * M, sub( Q16, Q12 ) ); /* Q16 */

            Copy_Scale_sig_16_32_DEPREC( Aq_fx[ch], Aq_fx_32[ch], i_mult( nSubframes[ch], M ), sub( Q16, Q12 ) ); /* Q16 */

#else

            Copy_Scale_sig_16_32_DEPREC( Aq_fx[ch], Aq_fx_32[ch], ( NB_SUBFR16k + 1 ) * ( M + 1 ), sub( Q16, Q12 ) ); /* Q16 */

#endif