Commit ad1c5787 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2196_UNREACHABLE_CODE_IN_OSBA_STEREO_OUTPUT

parent f5249812

lib_com/ivas_prot_fx.h

+0 −7
Original line number Diff line number Diff line
@@ -3755,16 +3755,9 @@ ivas_error ivas_osba_render_sf_fx( 
void ivas_osba_stereo_add_channels_fx(

    Word32 *tc_fx[],                                            /* i  : transport channels                          */

    Word32 *output_fx[],                                        /* i/o: output channels                             */

#ifdef FIX_2196_UNREACHABLE_CODE_IN_OSBA_STEREO_OUTPUT

    const Word32 gain,                                          /* i  : gain bed value Q11                          */

#else

    const Word32 gain_bed_fx,                                   /* i  : gain bed value Q11                          */

#endif

    const Word16 nchan_out,                                     /* i  : number of output channels                   */

    const Word16 nchan_ism,                                     /* i  : number of ISM channels                      */

#ifndef FIX_2196_UNREACHABLE_CODE_IN_OSBA_STEREO_OUTPUT

    const Word16 ism_mode,                                      /* i  : ISM mode                                    */

#endif

    const UWord16 n_samples_to_render                           /* i  : output frame length per channel             */

);

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ 
#define FIX_1990_SANITIZER_IN_REVERB_LOAD               /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure - keep until #2059 is addressed */

#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_2196_UNREACHABLE_CODE_IN_OSBA_STEREO_OUTPUT /* FhG: remove unreachable code in ivas_osba_stereo_add_channels */

#define FIX_OUTPUT_FRAME                                /* VA: harmonize "output_frame" parameter usage to correspond to FLP */

#define HARMONIZE_ISSUE_2435_WRITETNSDATA               /* FhG basop 2435: Harmonize WriteTnsData*_fx(), EncodeTnsData*_fx() */

#define HARM_2336_DOTP                                       /* VA: basop 2336; Harmonisation of some dot_product function + some BE optimisation */

lib_dec/ivas_dec_render_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -511,11 +511,7 @@ ivas_error ivas_dec_render_fx( 
                ivas_ism_render_sf_fx( st_ivas, st_ivas->renderer_type, p_output_fx, *nSamplesRendered );



                /* add already rendered SBA part */

#ifdef FIX_2196_UNREACHABLE_CODE_IN_OSBA_STEREO_OUTPUT

                ivas_osba_stereo_add_channels_fx( p_tc_fx, p_output_fx, st_ivas->hSbaIsmData->gain_bed_fx, nchan_out, st_ivas->nchan_ism, *nSamplesRendered );

#else

                ivas_osba_stereo_add_channels_fx( p_tc_fx, p_output_fx, st_ivas->hSbaIsmData->gain_bed_fx, nchan_out, st_ivas->nchan_ism, st_ivas->ism_mode, *nSamplesRendered );

#endif

            }

            ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_OSBA_AMBI ) || EQ_32( st_ivas->renderer_type, RENDERER_OSBA_LS ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )

            {

lib_dec/ivas_osba_dec_fx.c

+0 −26
Original line number Diff line number Diff line
@@ -321,27 +321,14 @@ ivas_error ivas_osba_render_sf_fx( 
void ivas_osba_stereo_add_channels_fx(

    Word32 *tc_fx[],     /* i  : transport channels                */

    Word32 *output_fx[], /* i/o: output channels                   */

#ifdef FIX_2196_UNREACHABLE_CODE_IN_OSBA_STEREO_OUTPUT

    const Word32 gain, /* i  : gain bed value                    */

#else

    const Word32 gain_bed_fx, /* i  : gain bed value                    */

#endif

    const Word16 nchan_out, /* i  : number of output channels         */

    const Word16 nchan_ism, /* i  : number of ISM channels            */

#ifndef FIX_2196_UNREACHABLE_CODE_IN_OSBA_STEREO_OUTPUT

    const Word16 ism_mode, /* i  : ISM mode                          */

#endif

    const UWord16 n_samples_to_render /* i  : output frame length per channel   */

)

{

    Word16 n, i;



#ifndef FIX_2196_UNREACHABLE_CODE_IN_OSBA_STEREO_OUTPUT

    IF( EQ_16( ism_mode, ISM_SBA_MODE_DISC ) )

    {

        Word32 gain = gain_bed_fx;

        move32();

#endif

        test();

        IF( NE_32( gain, ONE_IN_Q29 ) && GT_32( gain, 0 ) )

        {
@@ -366,19 +353,6 @@ void ivas_osba_stereo_add_channels_fx( 
                }

            }

        }

#ifndef FIX_2196_UNREACHABLE_CODE_IN_OSBA_STEREO_OUTPUT

    }

    ELSE

    {

        FOR( n = 0; n < nchan_out; n++ )

        {

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

            {

                output_fx[n][i] = L_add_sat( output_fx[n][i], tc_fx[n + nchan_ism][i] ); // Q11

            }

        }

    }

#endif





    return;