Commit 25027747 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1111_TDM_LSP_BUFFER

parent b90708f4

lib_com/ivas_stereo_td_bit_alloc_fx.c

+0 −14
Original line number Diff line number Diff line
@@ -576,19 +576,14 @@ void td_stereo_param_updt_fx( 
        Copy( IAWB_Ave_fx, tdm_lsfQ_PCh_fx, M ); /*Qlog2(2.56)*/

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC



#ifdef FIX_1111_TDM_LSP_BUFFER

        IF( tdm_lspQ_PCh_fx != NULL )

        {

            lsf2lsp_fx( tdm_lsfQ_PCh_fx, tdm_lspQ_PCh_fx, M, INT_FS_12k8 );

        }

#else

        lsf2lsp_fx( tdm_lsfQ_PCh_fx, tdm_lspQ_PCh_fx, M, INT_FS_12k8 );

#endif

#endif

    }

    ELSE IF( EQ_16( flag_ACELP16k, 1 ) )

    {

#ifdef FIX_1111_TDM_LSP_BUFFER

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

        IF( tdm_lspQ_PCh_fx != NULL )

        {
@@ -605,24 +600,15 @@ void td_stereo_param_updt_fx( 
            lsp2lsf_fx( lsp_temp, tdm_lsfQ_PCh_fx, M, INT_FS_12k8 );

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

        }

#endif

#else

        Copy( lsp_old_PCh_fx, tdm_lspQ_PCh_fx, M ); /*Q15*/

        lsp_convert_poly_fx( tdm_lspQ_PCh_fx, L_FRAME, 0 );

        lsp2lsf_fx( tdm_lspQ_PCh_fx, tdm_lsfQ_PCh_fx, M, INT_FS_12k8 );

#endif

    }

    ELSE

    {

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

#ifdef FIX_1111_TDM_LSP_BUFFER

        IF( tdm_lspQ_PCh_fx != NULL )

        {

            Copy( lsp_old_PCh_fx, tdm_lspQ_PCh_fx, M ); /*Q15*/

        }

#else

        Copy( lsp_old_PCh_fx, tdm_lspQ_PCh_fx, M ); /*Q15*/

#endif

#endif

        Copy( lsf_old_PCh_fx, tdm_lsfQ_PCh_fx, M ); /*Qlog2(2.56)*/

    }

lib_com/options.h

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


/* #################### Start BASOP porting switches ############################ */



#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_1329_FIX_OSBA_CRASH                       /* FhG: issue 1329: prevent assert when bit budget is low*/

lib_enc/ivas_core_enc_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -114,11 +114,7 @@ ivas_error ivas_core_enc_fx( 
    Word16 Voicing_flag[CPE_CHANNELS];

    Word16 pitch_buf_fx[CPE_CHANNELS][NB_SUBFR16k]; /* Q6 */

    Word16 unbits[CPE_CHANNELS];

#ifdef FIX_1111_TDM_LSP_BUFFER

    Word16 tdm_lsfQ_PCh_fx[M]; /* Q2.56 */

#else

    Word16 tdm_lspQ_PCh_fx[M], tdm_lsfQ_PCh_fx[M]; /* 1 : Q15, 2 : Q2.56 */

#endif

    Word16 last_element_mode, tdm_Pitch_reuse_flag;

    Word32 element_brate, last_element_brate, input_Fs;

    Word16 diff_nBits;
@@ -431,14 +427,10 @@ ivas_error ivas_core_enc_fx( 
        test();

        IF( EQ_16( 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_fx( st->lsp_old_fx, st->lsf_old_fx, pitch_buf_fx[0], tdm_lsfQ_PCh_fx, hStereoTD->tdm_Pri_pitch_buf_fx, st->flag_ACELP16k, hStereoTD->tdm_use_IAWB_Ave_lpc );

#else

            td_stereo_param_updt_fx( st->lsp_old_fx, st->lsf_old_fx, pitch_buf_fx[0], NULL, tdm_lsfQ_PCh_fx, hStereoTD->tdm_Pri_pitch_buf_fx, st->flag_ACELP16k, hStereoTD->tdm_use_IAWB_Ave_lpc );

#endif

#else

            td_stereo_param_updt_fx( st->lsp_old_fx, st->lsf_old_fx, pitch_buf_fx[0], tdm_lspQ_PCh_fx, tdm_lsfQ_PCh_fx, hStereoTD->tdm_Pri_pitch_buf_fx, st->flag_ACELP16k, hStereoTD->tdm_use_IAWB_Ave_lpc );

#endif

        }

    }