Commit 110c0977 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/ivas-float-update' into... 

Merge remote-tracking branch 'origin/ivas-float-update' into 1878_ref_port_mr_1770_mcmasa_indexing_bug
parents 8b4f81d6 d029b583

lib_com/bits_alloc.c

+10 −4
Original line number Diff line number Diff line
@@ -552,7 +552,9 @@ ivas_error config_acelp1( 
    const int16_t tdm_lp_reuse_flag,        /* i  : LPC reuse flag (can be 1 only with secondary channel */

    const int16_t tdm_low_rate_mode,        /* i  : secondary channel low rate mode flag */

    const int16_t idchan,                   /* i  : stereo channel ID               */

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

    const int16_t active_cnt, /* i  : Active frame counter            */

#endif

    const int16_t tdm_Pitch_reuse_flag, /* i  : primary channel pitch reuse flag*/

    const int16_t tdm_LRTD_flag,        /* i  : LRTD stereo mode flag           */

    const int16_t GSC_IVAS_mode         /* i  : GSC IVAS mode                   */
@@ -770,7 +772,11 @@ ivas_error config_acelp1( 


            bits -= acelp_cfg->mid_lsf_bits;

        }

#ifdef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

        else if ( tdm_lp_reuse_flag == 1 && idchan == 1 )

#else

        else if ( tdm_lp_reuse_flag == 1 && idchan == 1 && active_cnt != 1 )

#endif

        {

            bits -= TDM_IC_LSF_PRED_BITS;

        }

lib_com/ivas_dirac_com.c

+0 −4
Original line number Diff line number Diff line
@@ -346,11 +346,7 @@ void ivas_get_dirac_sba_max_md_bits( 
        /* OSBA needs an additional 2-bits safety margin to avoid acelp crashes */

        if ( ivas_format == SBA_ISM_FORMAT )

        {

#ifdef NONBE_FIX_SBA_SIGNALING_BITS_B

            ( *metadata_max_bits ) -= 7;

#else

            ( *metadata_max_bits ) -= 3;

#endif

        }

    }

    else if ( sba_total_brate <= IVAS_32k )

lib_com/ivas_prot.h

+2 −0
Original line number Diff line number Diff line
@@ -2111,7 +2111,9 @@ void td_stereo_param_updt( 
    const float lsp_old_PCh[],                                  /* i  : primary channel old LSPs                */

    const float lsf_old_PCh[],                                  /* i  : primary channel old LSFs                */

    const float pitch_buf_PCh[],                                /* i  : primary channel pitch buffer            */

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

    float tdm_lspQ_PCh[],                                       /* o  : Q LSPs for primary channel              */

#endif

    float tdm_lsfQ_PCh[],                                       /* o  : Q LSFs for primary channel              */

    float tdm_Pri_pitch_buf[],                                  /* o  : pitch values for primary channel        */

    const int16_t flag_ACELP16k,                                /* i  : ACELP@16kHz flag                        */

lib_com/ivas_stereo_td_bit_alloc.c

+44 −4
Original line number Diff line number Diff line
@@ -443,7 +443,9 @@ void td_stereo_param_updt( 
    const float lsp_old_PCh[],   /* i  : primary channel old LSPs            */

    const float lsf_old_PCh[],   /* i  : primary channel old LSFs            */

    const float pitch_buf_PCh[], /* i  : primary channel pitch buffer        */

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

    float tdm_lspQ_PCh[], /* o  : Q LSPs for primary channel          */

#endif

    float tdm_lsfQ_PCh[],              /* o  : Q LSFs for primary channel          */

    float tdm_Pri_pitch_buf[],         /* o  : pitch values for primary channel    */

    const int16_t flag_ACELP16k,       /* i  : ACELP@16kHz flag                    */
@@ -456,17 +458,55 @@ void td_stereo_param_updt( 
    if ( tdm_use_IAWB_Ave_lpc == 1 )

    {

        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 )

        {

            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 );

        }

        else

        {

#endif

            float lsp_temp[M];

            mvr2r( lsp_old_PCh, lsp_temp, M );

            lsp_convert_poly( lsp_temp, L_FRAME, 0 );

            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

+10 −5
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ 


#ifdef DEBUG_MODE_MDCT

#define DEBUG_PLOT_BITS

#define DEBUG_OSBA_MD_BITS

#endif



#define ENABLE_BITRATE_VERIFICATION             /* Enable bitrate verification - use when playing with bit budget */
@@ -183,21 +184,25 @@ 
#define LC3PLUS_LEA_COMPAT_BITRATES_48_6                /* FhG: treat split-rendering 256kbps lc3plus 10ms 0dof bitrate as sentinel value for LEA compatible 48_6 bitrate (124 kbps per channel)  */

#define NONBE_FIX_1091_PMC_LOW_SIGNAL_BURSTS            /* FhG: fix for #1091, fix limit calculation for the regularized inverse of Kx to avoid bursts in very low signals  */

#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */

#define NONBE_FIX_SBA_SIGNALING_BITS_B                  /* FhG: issue 1061: option B: signal sba order additionally in OSBA */

#define NONBE_FIX_ISM_XOVER_BR                          /* FhG: issue 1072: select OSBA coding method depending on number of object and bitrate */

#define NONBE_FIX_984_OMASA_EXT_OUTPUT                  /* Nok: issue 1497 - porting OMASA EXT MR   */

#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP               /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */

#define CONF_DISTATT                                    /* Eri: Make distance attenuation configurable */

#define FIX_1052_EXT_OUTPUT                             /* VA: issue 1052: define EXT decoder output configuration for stereo and MC formats */ 



#define NONBE_1215_FIX_JBM_MAX_SCALING                  /* FhG: issue 1215: Fix assert hit in a specific VoIP decoder config. Caused by integer overflow in max scaling calculation. */

#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT   /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/



#define FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR          /* issue 1068 : Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching*/

#define NONBE_FIX_MC_LFE_LPF                                  /* Dlb: Adding the LFE LPF filter back for MC content. */

#define NONBE_FIX_1052_SBA_EXT                          /* Dlb: SBA external output support */

#define FIX_1082_INSTRUM_FAILED_LC3PLUS                 /* VoiceAge: issue 1082: fix ambiguous syntax in LC3Plus code leading to fails of instrumented builds */

#define NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR            /* Nok: issue 1074 fixing number of objects signaling in OMASA low rate */

#define FIX_1222_OMASA_DEC_CHANNEL_BUFFERS              /* VA: issue 1222: Reduction of the number of channel buffers in OMASA decoder */

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

#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 */

#define NONBE_1329_FIX_OSBA_CRASH                       /* FhG: issue 1329: prevent assert when bit budget is low*/

#define NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER            /* FhG: issue 1128: set output ambisonics order to input order for EXT output  */

#define FIX_1138_SBA_EXT_ERROR_PRINTOUT                 /* VA: issue 1138: Fix SBA EXT output call of audioCfg2channels() */

#define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART             /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */

#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */



/* #################### End BASOP porting switches ############################ */