Commit 18edbd41 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix wrong defines

parent 70fe0d18

lib_dec/ivas_jbm_dec_fx.c

+0 −5
Original line number Diff line number Diff line
@@ -2230,13 +2230,8 @@ 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_1849_OBJ_EDITING_API



#ifdef NONBE_1894_OSBA_SCALING

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

#else

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

#endif

#else

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

                {

lib_dec/ivas_osba_dec_fx.c

+3 −6
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ ivas_error ivas_osba_render_sf_fx( 
}





#ifdef FIX_1849_OBJ_EDITING_API

#ifdef NONBE_1894_OSBA_SCALING

/*-------------------------------------------------------------------------*

 * ivas_osba_stereo_add_channels()

 *
@@ -361,15 +361,12 @@ void ivas_osba_stereo_add_channels_fx( 
    const Word16 gain,      /* i  : gain bed value                    */

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

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

#ifndef NONBE_1894_OSBA_SCALING

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

#endif

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

)

{

    int16_t n;



#ifndef NONBE_1894_OSBA_SCALING

#if 0

    if ( ism_mode == ISM_SBA_MODE_DISC )

    {

#endif
@@ -384,7 +381,7 @@ void ivas_osba_stereo_add_channels_fx( 
                v_add_fixed_no_hdrm( output_fx[n], tc_fx[n + nchan_ism], output_fx[n], n_samples_to_render );

            }

        }

#ifndef NONBE_1894_OSBA_SCALING

#if 0

    }

    else

    {