Commit 27353653 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '1278_basop_switch_cleanup' into 'main-pc' 

1278 basop switch cleanup

See merge request !1302
parents 1da16fd6 d633b4d4

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ 
#define FIX_881_HILBERT_FILTER                  /* VA: improve the precision of the Hilbert filter to remove 2kHz unwanted tone */

#define FIX_ISSUE_1245                          /* Ittiam: Fix for issue 1245: Basop Encoder: Audible noise for silent Stereo input DTX on @24.4 kbps, @32 kbps*/

#define FIX_ISSUE_1291                          /* Ittiam: Wrong use of imult1616() in ACELP rescaling */

#define FIX_920_IGF_INIT_ERROR                  /* FhG: issue 920: fix bitrate mismatch in initial IGF config to avoid error message in same cases */

#define FIX_MINOR_SVD_WMOPS_MR1010X             /* FhG: Minor WMOPS tuning, bit-exact to previous version, saves about 8.2 WMOPS for MR1010 */

#define FIX_USAN_ISSUES                         /* Ittiam: Fix issues reported by USAN */

#define SVD_WMOPS_OPT                           /* Ittiam : SVD related optimizations */
@@ -181,7 +180,6 @@ 
#define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */

#define FIX_1372_ISAR_POST_REND

#endif

#define NONBE_FIX_855_JBM_FLUSH_OFFSET                  /* FhG: issue #855: add missing switch here for the code in JBM flushing                 */

#define FIX_923_EXTERNAL_REND_COMMAND_LINE              /* VA: issue 923: enable external renderer command-line options in UPPER case letters */

#define FIX_921_OMASA_DELAY_PRINTOUT                    /* VA: issue 921: correct OMASA decoder delay printout */

#define NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA           /* FhG: issue 926: crash in OSBA decoding with planar FOA */

lib_com/prot_fx.h

+2 −4
Original line number Diff line number Diff line
@@ -11084,9 +11084,7 @@ void calculate_hangover_attenuation_gain_ivas_fx( 
void init_coder_ace_plus_ivas_fx(

    Encoder_State *st,             /* i  : Encoder state                          */

    const Word32 last_total_brate, /* i  : last total bitrate                     */

#ifdef FIX_920_IGF_INIT_ERROR

    const Word32 igf_brate,        /* i  : IGF configuration bitrate           */

#endif

    const Word16 MCT_flag          /* i  : hMCT handle allocated (1) or not (0)   */

);

























lib_dec/ivas_jbm_dec_fx.c



+0
−6




























Original line number
Diff line number
Diff line








@@ -2789,11 +2789,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx(













        hTcBuffer->n_samples_buffered = add( hTcBuffer->n_samples_granularity, n_samples_still_available );















        hTcBuffer->n_samples_available = 0;















        hTcBuffer->n_samples_flushed = n_samples_to_render;













#ifdef NONBE_FIX_855_JBM_FLUSH_OFFSET















        hTcBuffer->n_samples_rendered = 0;













#else













        hTcBuffer->n_samples_rendered = hTcBuffer->n_samples_granularity;













#endif















        move16();















        move16();















        move16();










@@ -2994,9 +2990,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx(













        {















            return IVAS_ERROR( IVAS_ERR_WRONG_MODE, "Wrong IVAS format in VoIP renderer flushing!" );















        }













#ifdef NONBE_FIX_855_JBM_FLUSH_OFFSET















        hTcBuffer->n_samples_rendered = hTcBuffer->n_samples_granularity;













#endif















    }































    /* update global combined orientation start index */

































lib_enc/core_enc_init_fx.c



+2
−8




























Original line number
Diff line number
Diff line








@@ -945,9 +945,7 @@ static void init_modes_fx(













void init_coder_ace_plus_ivas_fx(















    Encoder_State *st,             /* i  : Encoder state                          */















    const Word32 last_total_brate, /* i  : last total bitrate                     */













#ifdef FIX_920_IGF_INIT_ERROR















    const Word32 igf_brate,        /* i  : IGF configuration bitrate           */













#endif















    const Word16 MCT_flag          /* i  : hMCT handle allocated (1) or not (0)   */















)















{










@@ -1080,11 +1078,7 @@ void init_coder_ace_plus_ivas_fx(













    test();















    IF( st->igf && st->hIGFEnc != NULL )















    {













#ifdef FIX_920_IGF_INIT_ERROR















        IGFEncSetMode_ivas_fx( st->hIGFEnc, igf_brate, st->bwidth, st->element_mode, st->rf_mode );













#else













        IGFEncSetMode_ivas_fx( st->hIGFEnc, st->total_brate, st->bwidth, st->element_mode, st->rf_mode );













#endif















    }















    ELSE IF( st->hIGFEnc != NULL )















    {

































lib_enc/core_enc_switch_fx.c



+0
−4




























Original line number
Diff line number
Diff line








@@ -408,11 +408,7 @@ void core_coder_mode_switch_ivas_fx(













        Scale_sig( st->old_inp_12k8_fx, L_INP_MEM, shift );















        st->exp_old_inp_12k8 = sub( st->exp_old_inp_12k8, shift );















        move16();













#ifdef FIX_920_IGF_INIT_ERROR















        init_coder_ace_plus_ivas_fx( st, last_total_brate, st->total_brate, MCT_flag );













#else













        init_coder_ace_plus_ivas_fx( st, last_total_brate, MCT_flag );













#endif















        if ( st->hLPDmem != NULL )















        {















            st->hLPDmem->q_lpd_old_exc = st->prev_Q_new;