Commit 00e76c17 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1818_WRONG_PIT_INIT

parent e7041da1

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ 


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



#define FIX_1818_WRONG_PIT_INIT                 /* VA: Fix wrong pitch initialization */



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

lib_enc/core_switching_enc_fx.c

+0 −12
Original line number Diff line number Diff line
@@ -282,11 +282,7 @@ void core_switching_pre_enc_fx( 


        tmp16 = shr( st_fx->L_frame, 6 );

        Copy( st_fx->old_pitch_buf_fx + tmp16, st_fx->old_pitch_buf_fx, tmp16 ); /*Q6*/

#ifdef FIX_1818_WRONG_PIT_INIT

        set16_fx( st_fx->old_pitch_buf_fx + tmp16, L_SUBFR << 6, tmp16 );

#else

        set16_fx( st_fx->old_pitch_buf_fx + tmp16, L_SUBFR, tmp16 );

#endif

        /* Reset old TD BWE buffers */

        IF( hBWE_TD != NULL )

        {
@@ -854,11 +850,7 @@ void core_switching_pre_enc_ivas_fx( 
        }



        Copy( st_fx->old_pitch_buf_fx + tmp16, st_fx->old_pitch_buf_fx, tmp16 );

#ifdef FIX_1818_WRONG_PIT_INIT

        set16_fx( st_fx->old_pitch_buf_fx + tmp16, L_SUBFR << 6, tmp16 );

#else

        set16_fx( st_fx->old_pitch_buf_fx + tmp16, L_SUBFR, tmp16 );

#endif

        /* Reset old ACELP buffers */

        test();

        IF( ( st_fx->element_mode == EVS_MONO ) && hLPDmem != NULL )
@@ -908,11 +900,7 @@ void core_switching_pre_enc_ivas_fx( 


        tmp16 = shr( st_fx->L_frame, 6 );

        Copy( st_fx->old_pitch_buf_fx + tmp16, st_fx->old_pitch_buf_fx, tmp16 );

#ifdef FIX_1818_WRONG_PIT_INIT

        set16_fx( st_fx->old_pitch_buf_fx + tmp16, L_SUBFR << 6, tmp16 );

#else

        set16_fx( st_fx->old_pitch_buf_fx + tmp16, L_SUBFR, tmp16 );

#endif

        /* Reset old TD BWE buffers */

        IF( hBWE_TD != NULL )

        {

lib_enc/rst_enc_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -53,19 +53,11 @@ void CNG_reset_enc_fx( 
    /* reset the pitch buffer in case of FRAME_NO_DATA or SID frames */

    IF( EQ_16( st_fx->L_frame, L_FRAME ) )

    {

#ifdef FIX_1818_WRONG_PIT_INIT

        set16_fx( pitch_buf, L_SUBFR << 6, NB_SUBFR );

#else

        set16_fx( pitch_buf, L_SUBFR, NB_SUBFR );

#endif

    }

    ELSE /* st->L_frame == L_FRAME16k */

    {

#ifdef FIX_1818_WRONG_PIT_INIT

        set16_fx( pitch_buf, L_SUBFR16k << 6, NB_SUBFR16k );

#else

        set16_fx( pitch_buf, L_SUBFR16k, NB_SUBFR16k );

#endif

    }



    set16_fx( voice_factors, 1, NB_SUBFR16k );