Commit 1063f1dc authored by Manuel Jander's avatar Manuel Jander
Browse files

Merge remote-tracking branch 'origin' into... 

Merge remote-tracking branch 'origin' into 2206-assert-in-stereo_switching_enc_fx-for-omasa-rate-switching-input-new-stv
parents 0786a396 456733ef

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -114,6 +114,9 @@ 
#define FIX_BASOP_2491_MDCT_JBM_CLICK                   /* FhG: BASOP #2491: Fix Q_synth after TCX concealment (using ACELP concealment) */

#define FIX_1563_FIX_STEREO_SW                          /* VA: float issue 1563: fix clicks in stereo switching */

#define FIX_1562_DTX_CRASH_DECODER                      /* VA: float issue 1562: fix crash in stereo decoding in DTX and bitrate switching */

#define FIX_BASOP_2498_LOGIC_IN_ENC_DTX_DECISION_MTX    /* Nokia: BASOP 2498: Fix the logic */

#define FIX_BASOP_2497_MCMASA_LFE_WRONG_SF_INDEX        /* Nokia: BASOP 2497: Fix wrong subframe index in McMASA LFE synth. */

#define FIX_BASOP_2496_OMASA_OBJ_EDIT_WRONG_ASSIGN      /* Nokia: BASOP 2496: Fix wrong assignment in OMASA object edit code */



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

lib_enc/ivas_decision_matrix_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -107,7 +107,11 @@ void ivas_decision_matrix_enc_fx( 
        move16();



        test();

#ifdef FIX_BASOP_2498_LOGIC_IN_ENC_DTX_DECISION_MTX

        if ( GE_32( st->input_Fs, 32000 ) && GE_16( st->bwidth, SWB ) )

#else

        if ( GE_32( st->input_Fs, 32000 ) || GE_16( st->bwidth, SWB ) )

#endif

        {

            st->extl = SWB_CNG;

            move16();

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -5956,7 +5956,11 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects_fx( 
                ELSE

                {

                    newRatios[0] = L_shr( newRatios[0], 6 ); // Q = 30 + 9 + 1 - 16 = 24

#ifdef FIX_BASOP_2496_OMASA_OBJ_EDIT_WRONG_ASSIGN

                    newRatios[1] = L_shr( newRatios[1], 6 );

#else

                    newRatios[1] = L_shr( newRatios[0], 6 );

#endif

                    move32();

                    move32();

                }

lib_rend/ivas_dirac_output_synthesis_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -3454,7 +3454,11 @@ void ivas_lfe_synth_with_filters_fx( 
    slotSize = shr_r( output_frame, 4 ); // output_frame / CLDFB_NO_COL_MAX

    FOR( slot_index = 0; slot_index < CLDFB_NO_COL_MAX; slot_index++ )

    {

#ifdef FIX_BASOP_2497_MCMASA_LFE_WRONG_SF_INDEX

        subframe_index = shr( slot_index, 2 );

#else

        subframe_index = shr( slot_index, 4 );

#endif



        mrange[0] = i_mult( slot_index, slotSize );

        move16();