Commit 6f9c7587 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_BASOP_2358_SCALING_OOB

parent 4ed6739a

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ 
#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_1904_HARM_GSC_ENC                           /* VA: #1904 Harmonization of EVS and IVAS GSC code */

#define FIX_BASOP_2358_SCALING_OOB                      /* Eri: Basip issue 2358: Clang-18 reports OOB access where scaling is applied to L_FRAME48k instead of output_frame */

#define FIX_BASOP_2350_HARM_0B_BWE_2                    /* VA: basop issue 2350: Simplify calling of hf_synth_fx() */

#define FIX_2364_HARM_MULT_HARM                         /* VA: basop issue 2364 : harmonizing multi_harm_fx function */

#define FIX_2363_FIND_WSP                               /* VA: basop issue 2363 : harmonizing find_wsp function */

lib_rend/ivas_objectRenderer_fx.c

+0 −16
Original line number Diff line number Diff line
@@ -434,17 +434,9 @@ ivas_error ivas_td_binaural_renderer_unwrap_fx( 
        {

            Word16 i;



#ifdef FIX_BASOP_2358_SCALING_OOB

            FOR( i = 0; i < num_src; ++i )

#else

            FOR( i = 0; i < MAX_OUTPUT_CHANNELS; ++i )

#endif

            {

#ifdef FIX_BASOP_2358_SCALING_OOB

                scale_sig32( output_fx[i], output_frame, -4 ); // Q11 - 4 = Q7

#else

                scale_sig32( output_fx[i], L_FRAME48k, -4 ); // Q11 - 4 = Q7

#endif

            }



            IF( NE_32( ( error = ivas_reverb_process_fx( hReverb, transport_config, 0, output_fx, p_reverb_signal_fx, subframe_idx ) ), IVAS_ERR_OK ) ) // Q p_reverb_signal_fx = Q output_fx - 2 = 5
@@ -452,17 +444,9 @@ ivas_error ivas_td_binaural_renderer_unwrap_fx( 
                return error;

            }



#ifdef FIX_BASOP_2358_SCALING_OOB

            FOR( i = 0; i < num_src; ++i )

#else

            FOR( i = 0; i < MAX_OUTPUT_CHANNELS; ++i )

#endif

            {

#ifdef FIX_BASOP_2358_SCALING_OOB

                scale_sig32( output_fx[i], output_frame, 4 ); // Q7 + 4 = Q11

#else

                scale_sig32( output_fx[i], L_FRAME48k, 4 ); // Q7 + 4 = Q11

#endif

            }



            FOR( i = 0; i < BINAURAL_CHANNELS; ++i )