Commit fb1524d9 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

remove unreachable code in ivas_osba_stereo_add_channels_fx

parent f344a5ab

lib_com/ivas_prot_fx.h

+2 −0
Original line number Diff line number Diff line
@@ -3894,7 +3894,9 @@ void ivas_osba_stereo_add_channels_fx( 
    const Word32 gain_bed_fx,                                   /* i  : gain bed value Q11                          */

    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

+2 −0
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ 


#define FIX_2184_EVS_STEREO_DMX_CHANNEL_DISAPPEARING         /* Orange: Fix for issue 2184 - to prevent one channel from becoming inaudible in the mono downmix output */

#define FIX_2148_OBJ_EDIT_ISSUE_WITH_OSBA                    /* Nokia: Add missing code to solve issue */

#define FIX_2196_UNREACHABLE_CODE_IN_OSBA_STEREO_OUTPUT      /* FhG: remove unreachable code in ivas_osba_stereo_add_channels */



/* ################### End FIXES switches ########################### */



/* #################### Start BASOP porting switches ############################ */

lib_dec/ivas_jbm_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -2051,7 +2051,11 @@ ivas_error ivas_jbm_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

+8 −0
Original line number Diff line number Diff line
@@ -377,14 +377,18 @@ void ivas_osba_stereo_add_channels_fx( 
    const Word32 gain_bed_fx,         /* i  : gain bed value                    */

    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 ) )

    {

#endif

        Word32 gain = gain_bed_fx;

        move32();
@@ -412,6 +416,7 @@ void ivas_osba_stereo_add_channels_fx( 
                }

            }

        }

#ifndef FIX_2196_UNREACHABLE_CODE_IN_OSBA_STEREO_OUTPUT

    }

    ELSE

    {
@@ -423,6 +428,9 @@ void ivas_osba_stereo_add_channels_fx( 
            }

        }

    }

#endif







    return;

}