Commit 4d84ca10 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_ISSUE_1801_NOISE_FLOOR_REDUCTION

parent 00e76c17

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ 
 */





#define FIX_ISSUE_1801_NOISE_FLOOR_REDUCTION    /* FhG: Fixed getScalefactor usage */





#define NONBE_FIX_TCX5_INTERLEAVING_FOR_FS_IN_UNEQUAL_FS_OUT /* FhG: apply correct TCX5 grouping/interleaving when input_fs != output_fs */

lib_dec/ivas_mct_dec_fx.c

+0 −16
Original line number Diff line number Diff line
@@ -293,37 +293,21 @@ ivas_error ivas_mct_dec_fx( 
        Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[0]->old_Aq_12_8_fx, hCPE->hCoreCoder[0]->old_Aq_12_8_fx_32, add( M, 1 ), sub( 28, sub( 15, norm_s( sub( hCPE->hCoreCoder[0]->old_Aq_12_8_fx[0], 1 ) ) ) ) );

        Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[1]->old_Aq_12_8_fx, hCPE->hCoreCoder[1]->old_Aq_12_8_fx_32, add( M, 1 ), sub( 28, sub( 15, norm_s( sub( hCPE->hCoreCoder[1]->old_Aq_12_8_fx[0], 1 ) ) ) ) );

        ivas_mdct_core_reconstruct_fx( hCPE, x_fx, synth_fx, fUseTns[cpe_id], 1, q_output, e_sig );

#ifdef FIX_ISSUE_1801_NOISE_FLOOR_REDUCTION

        Word16 hdrm;

#else

        Word16 hdrm, sh;

#endif

        hdrm = getScaleFactor16( synth_fx[0], hCPE->hCoreCoder[0]->hTcxDec->L_frameTCX );

        IF( hdrm != 0 )

        {

#ifdef FIX_ISSUE_1801_NOISE_FLOOR_REDUCTION

            hdrm = sub( hdrm, 1 );

            Scale_sig( synth_fx[0], hCPE->hCoreCoder[0]->hTcxDec->L_frameTCX, hdrm );

            e_sig[0] = sub( e_sig[0], hdrm );

#else

            sh = s_min( sub( e_sig[0], 16 ), hdrm );

            Scale_sig( synth_fx[0], hCPE->hCoreCoder[0]->hTcxDec->L_frameTCX, sh );

            e_sig[0] = sub( e_sig[0], sh );

#endif

            move16();

        }

        hdrm = getScaleFactor16( synth_fx[1], hCPE->hCoreCoder[0]->hTcxDec->L_frameTCX );

        IF( hdrm != 0 )

        {

#ifdef FIX_ISSUE_1801_NOISE_FLOOR_REDUCTION

            hdrm = sub( hdrm, 1 );

            Scale_sig( synth_fx[1], hCPE->hCoreCoder[1]->hTcxDec->L_frameTCX, hdrm );

            e_sig[1] = sub( e_sig[1], hdrm );

#else

            sh = s_min( sub( e_sig[1], 16 ), hdrm );

            Scale_sig( synth_fx[1], hCPE->hCoreCoder[1]->hTcxDec->L_frameTCX, sh );

            e_sig[1] = sub( e_sig[1], sh );

#endif

            move16();

        }