Commit 34fbaf41 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1111_TDM_LSP_BUFFER

parent 8d653774

lib_com/ivas_stereo_td_bit_alloc.c

+0 −14
Original line number Diff line number Diff line
@@ -459,19 +459,14 @@ void td_stereo_param_updt( 
    {

        mvr2r( IAWB_Ave, tdm_lsfQ_PCh, M );

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

#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

#endif

    }

    else if ( flag_ACELP16k == 1 )

    {

#ifdef FIX_1111_TDM_LSP_BUFFER

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

        if ( tdm_lspQ_PCh != NULL )

        {
@@ -488,24 +483,15 @@ void td_stereo_param_updt( 
            lsp2lsf( lsp_temp, tdm_lsfQ_PCh, M, INT_FS_12k8 );

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

        }

#endif

#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

    {

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

#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

#endif

        mvr2r( lsf_old_PCh, tdm_lsfQ_PCh, M );

    }

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ 
/* #################### Start BASOP porting switches ############################ */



#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */

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

#define FIX_1157_OBSOLETE_DMX_TABLE                     /* FhG: remove obsolte ParamMC DMX table ivas_param_mc_dmx_fac_CICP19_4tc[] */

#define NONBE_1325_TD_STEREO_QUANT_LSF_SEC              /* Nokia: issue 1325: fix for usage of active_cnt variable in TD stereo LSFQ */

#define NONBE_FIX_1130_DIV_ZERO_LEV_DUR                 /* VA: issue 1130: avoid div by zero in L-D by thresholding R[0] to a min value of 100.0 */

lib_enc/ivas_core_enc.c

+0 −8
Original line number Diff line number Diff line
@@ -104,11 +104,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;
@@ -280,14 +276,10 @@ ivas_error ivas_core_enc( 


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

        {

#ifdef FIX_1111_TDM_LSP_BUFFER

#ifdef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

            td_stereo_param_updt( st->lsp_old, st->lsf_old, pitch_buf[0], 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], NULL, tdm_lsfQ_PCh, hStereoTD->tdm_Pri_pitch_buf, st->flag_ACELP16k, hStereoTD->tdm_use_IAWB_Ave_lpc );

#endif

#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

        }

    }