Commit e6a0c800 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1111_TDM_LSP_BUFFER

parent 30441cb3

lib_com/ivas_stereo_td_bit_alloc.c

+0 −14
Original line number Diff line number Diff line
@@ -457,18 +457,13 @@ void td_stereo_param_updt( 
    {

        mvr2r( IAWB_Ave, tdm_lsfQ_PCh, M );



#ifdef FIX_1111_TDM_LSP_BUFFER

        if ( tdm_lspQ_PCh != NULL )

        {

            lsf2lsp( tdm_lsfQ_PCh, tdm_lspQ_PCh, M, INT_FS_12k8 );

        }

#else

        lsf2lsp( tdm_lsfQ_PCh, tdm_lspQ_PCh, M, INT_FS_12k8 );

#endif

    }

    else if ( flag_ACELP16k == 1 )

    {

#ifdef FIX_1111_TDM_LSP_BUFFER

        if ( tdm_lspQ_PCh != NULL )

        {

            mvr2r( lsp_old_PCh, tdm_lspQ_PCh, M );
@@ -482,22 +477,13 @@ void td_stereo_param_updt( 
            lsp_convert_poly( lsp_temp, L_FRAME, 0 );

            lsp2lsf( lsp_temp, tdm_lsfQ_PCh, M, INT_FS_12k8 );

        }

#else

        mvr2r( lsp_old_PCh, tdm_lspQ_PCh, M );

        lsp_convert_poly( tdm_lspQ_PCh, L_FRAME, 0 );

        lsp2lsf( tdm_lspQ_PCh, tdm_lsfQ_PCh, M, INT_FS_12k8 );

#endif

    }

    else

    {

#ifdef FIX_1111_TDM_LSP_BUFFER

        if ( tdm_lspQ_PCh != NULL )

        {

            mvr2r( lsp_old_PCh, tdm_lspQ_PCh, M );

        }

#else

        mvr2r( lsp_old_PCh, tdm_lspQ_PCh, M );

#endif

        mvr2r( lsf_old_PCh, tdm_lsfQ_PCh, M );

    }

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ 
#define FLOAT_FIX_POINT_HRTF_FILE_FORMAT                /* allows reading floation or fix point hrtf binary file format */





#define FIX_1111_TDM_LSP_BUFFER                         /* VA: issue 1111: remove unused buffer `tdm_lspQ_PCh[]' */

#define FIX_1101_CLEANING_JBM_CALL                      /* VA: issue 1101: remove obsolete call of ivas_jbm_dec_tc_buffer_open() */

#define FIX_1053_AEID_FILE_TEST                         /* Philips: Tests for the -aeid file and fix for memory error */

lib_enc/ivas_core_enc.c

+0 −8
Original line number Diff line number Diff line
@@ -99,11 +99,7 @@ ivas_error ivas_core_enc( 
    int16_t Voicing_flag[CPE_CHANNELS];

    float pitch_buf[CPE_CHANNELS][NB_SUBFR16k];

    int16_t unbits[CPE_CHANNELS];

#ifdef FIX_1111_TDM_LSP_BUFFER

    float tdm_lsfQ_PCh[M];

#else

    float tdm_lspQ_PCh[M], tdm_lsfQ_PCh[M];

#endif

    int16_t last_element_mode, tdm_Pitch_reuse_flag;

    int32_t element_brate, last_element_brate, input_Fs;

    int16_t diff_nBits;
@@ -274,11 +270,7 @@ ivas_error ivas_core_enc( 


        if ( st->element_mode == IVAS_CPE_TD && n == 0 )

        {

#ifdef FIX_1111_TDM_LSP_BUFFER

            td_stereo_param_updt( st->lsp_old, st->lsf_old, pitch_buf[0], NULL, tdm_lsfQ_PCh, hStereoTD->tdm_Pri_pitch_buf, st->flag_ACELP16k, hStereoTD->tdm_use_IAWB_Ave_lpc );

#else

            td_stereo_param_updt( st->lsp_old, st->lsf_old, pitch_buf[0], tdm_lspQ_PCh, tdm_lsfQ_PCh, hStereoTD->tdm_Pri_pitch_buf, st->flag_ACELP16k, hStereoTD->tdm_use_IAWB_Ave_lpc );

#endif

        }

    }