Commit b7f02c3b authored by multrus's avatar multrus
Browse files

use scaled version of 32 bit buffer, also in stereo_switching_enc_fx()

parent 415fa6fe

lib_enc/ivas_stereo_dft_td_itd_fx.c

+4 −3
Original line number Diff line number Diff line
@@ -575,6 +575,7 @@ void stereo_td_itd_mdct_stereo_fx( 
    STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct;

#ifdef NONBE_1203_MDCT2DFT_SWITCHING

    Word16 dft_ovl;

    Word16 sf;

#endif



    test();
@@ -621,9 +622,9 @@ void stereo_td_itd_mdct_stereo_fx( 


        FOR( i = 0; i < CPE_CHANNELS; i++ )

        {

            /* without renormalization, hCPE->hCoreCoder[i]->input_fx has a better resolution than hCPE->hCoreCoder[i]->input32_fx */

            Copy( hCPE->hCoreCoder[i]->input_fx + input_frame - dft_ovl, hCPE->input_mem_fx[i], dft_ovl );

            hCPE->q_input_mem[i] = hCPE->hCoreCoder[i]->q_inp;

            sf = L_norm_arr( hCPE->hCoreCoder[i]->input32_fx + input_frame - dft_ovl, dft_ovl );

            Copy_Scale_sig32_16( hCPE->hCoreCoder[i]->input32_fx + input_frame - dft_ovl, hCPE->input_mem_fx[i], dft_ovl, sf );

            hCPE->q_input_mem[i] = sub( add( hCPE->hCoreCoder[i]->q_inp32, sf ), 16 );

            move16();

        }

    }

lib_enc/ivas_stereo_switching_enc_fx.c

+7 −0
Original line number Diff line number Diff line
@@ -658,9 +658,16 @@ void stereo_switching_enc_fx( 
    {

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

        {

#ifdef NONBE_1203_MDCT2DFT_SWITCHING

            Word16 sf = L_norm_arr( sts[n]->input32_fx + input_frame - dft_ovl, dft_ovl );

            Copy_Scale_sig32_16( sts[n]->input32_fx + input_frame - dft_ovl, hCPE->input_mem_fx[n], dft_ovl, sf ); /* sts[n]->q_inp32 - 16 */

            hCPE->q_input_mem[n] = sub( add( sts[n]->q_inp32, sf ), 16 );

            move16();

#else

            Copy_Scale_sig32_16( sts[n]->input32_fx + input_frame - dft_ovl, hCPE->input_mem_fx[n], dft_ovl, 0 ); /* sts[n]->q_inp32 - 16 */

            hCPE->q_input_mem[n] = sub( sts[n]->q_inp32, 16 );

            move16();

#endif

        }

    }