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

Merge branch 'main' into 905-running-self-test-without-debugging-macro

parents aa904489 bb7289a8

lib_com/options.h

100644 → 100755
+3 −1
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ 
#define FIX_881_REMOVE_LFE_ADDITION_IN_ISM              /* VA: issue 881: remove LFE addition in ISM format */

#define FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO              /* VA: Fix the definition of buffers/arrays in DFT and MDCT stereo to satisfy gcc v 11.4.0 */

#define FIX_891_PARAMUPMIX_CLEANUP                      /* Dlb: issue 891: remove unneeded code from ParamUpmix */

#define FIX_917_LCLD_WARNINGS                           /* Dlb: issue 917 and 918: fix LCLD codec warnings*/

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



/* #################### End BE switches ################################## */
@@ -176,7 +178,7 @@ 
#define NONBE_FIX_862_UBSAN_SPAR_DEC_BR_SW_PLC                /* DLB: issue 862 : UBSAN: out-of-bound error in SPAR for OSBA bitrate switching with PLC*/

#define NONBE_FIX_DISCRETE_ISM_NOISE_SEED_HANDLING            /* FhG: fix handling of common and differing noise seeds in SCEs for ISM DTX */

#define NONBE_FIX_913_OMASA_BITBUDGET_VIOLATION               /* VA/Nok: issue 913: Resolve "Crash in OMASA encoder - DFT-Stereo bit-budget violated" */



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



/* ##################### End NON-BE switches ########################### */

lib_com/prot.h

+4 −1
Original line number Diff line number Diff line
@@ -6760,6 +6760,9 @@ float correlation_shift( 
void init_coder_ace_plus(

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

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

#ifdef FIX_920_IGF_INIT_ERROR

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

#endif

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

);

lib_dec/ivas_jbm_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1706,7 +1706,7 @@ ivas_error ivas_jbm_dec_flush_renderer( 
        hTcBuffer->n_samples_buffered = hTcBuffer->n_samples_granularity + n_samples_still_available;

        hTcBuffer->n_samples_available = 0;

        hTcBuffer->n_samples_flushed = n_samples_to_render;

#ifdef CR_FIX_JBM_FLUSH_OFFSET

#ifdef NONBE_FIX_855_JBM_FLUSH_OFFSET

        hTcBuffer->n_samples_rendered = 0;

#else

        hTcBuffer->n_samples_rendered = hTcBuffer->n_samples_granularity;
@@ -1865,7 +1865,7 @@ ivas_error ivas_jbm_dec_flush_renderer( 
        {

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

        }

#ifdef CR_FIX_JBM_FLUSH_OFFSET

#ifdef NONBE_FIX_855_JBM_FLUSH_OFFSET

        hTcBuffer->n_samples_rendered = hTcBuffer->n_samples_granularity;

#endif

    }

lib_enc/core_enc_init.c

100755 → 100644
+8 −1
Original line number Diff line number Diff line
@@ -64,6 +64,9 @@ static void init_modes( Encoder_State *st, const int32_t last_total_brate ); 
void init_coder_ace_plus(

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

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

#ifdef FIX_920_IGF_INIT_ERROR

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

#endif

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

)

{
@@ -154,7 +157,11 @@ void init_coder_ace_plus( 


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

    {

#ifdef FIX_920_IGF_INIT_ERROR

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

#else

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

#endif

    }

    else if ( st->hIGFEnc != NULL )

    {

lib_enc/core_enc_switch.c

+4 −0
Original line number Diff line number Diff line
@@ -152,7 +152,11 @@ void core_coder_mode_switch( 
    else

    {

        st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode );

#ifdef FIX_920_IGF_INIT_ERROR

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

#else

        init_coder_ace_plus( st, last_total_brate, MCT_flag );

#endif

    }



    if ( st->igf && st->hBWE_TD != NULL )