Commit 8161c5c6 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch 'main' to '777-render-config-reader-fails-to-read-combined-config-file'

parents 037b546b 48244454

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -1225,9 +1225,7 @@ enum 
#define MASA_BIT_REDUCT_PARAM                   10

#define MASA_MAXIMUM_TWO_DIR_BANDS              24

#define NBITS_HR_COH                            4

#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS

#define OMASA_TDREND_MATCHING_GAIN              0.7943f

#endif



#define MASA_JBM_RINGBUFFER_FRAMES              3

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ 








/* #################### End BE switches ################################## */



/* #################### Start NON-BE switches ############################ */

lib_com/prot.h

+0 −2
Original line number Diff line number Diff line
@@ -132,12 +132,10 @@ float inv_sqrt( 
    const float x /* i  : input value                                     */

);



#ifdef NONBE_FIX_567_DOUBLE_STEREO_DMX

/*! r: inverse square root of input value (float) */

float inv_sqrtf(

    const float x /* i  : input value                                     */

);

#endif



/*! r: output random value */

int16_t own_random(

lib_com/tools.c

+0 −2
Original line number Diff line number Diff line
@@ -768,7 +768,6 @@ float inv_sqrt( 
    return (float) ( 1.0 / sqrt( x ) );

}



#ifdef NONBE_FIX_567_DOUBLE_STEREO_DMX

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

 * inv_sqrtf()

 *
@@ -782,7 +781,6 @@ float inv_sqrtf( 
{

    return ( 1.0f / sqrtf( x ) );

}

#endif



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

 * conv()

lib_dec/ivas_ism_renderer.c

+0 −10
Original line number Diff line number Diff line
@@ -523,16 +523,6 @@ void ivas_omasa_separate_object_render_jbm( 


    for ( obj = 0; obj < num_objects; obj++ )

    {

#ifndef NONBE_FIX_982_OMASA_DELAY_COMP_5MS

        /* Delay the signal to match CLDFB delay. Delay the whole buffer with the first rendering call of the stretched buffer. */

        if ( slots_rendered == 0 )

        {

            int16_t tcBufferSize;



            tcBufferSize = hSpatParamRendCom->num_slots * hSpatParamRendCom->slot_size;

            delay_signal( input_f[obj], tcBufferSize, st_ivas->hMasaIsmData->delayBuffer[obj], st_ivas->hMasaIsmData->delayBuffer_size );

        }

#endif

        offsetSamples = 0;



        for ( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ )