Commit 071e2c7f authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '1610_ref_port_fl1412' into 'float-pc' 

Port MR 1412 into float-pc

See merge request !1654
parents a50ad2a3 a92109e2

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -1216,9 +1216,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 −11
Original line number Diff line number Diff line
@@ -194,20 +194,9 @@ 
#define FIX_INV_DIFFUSE_WEIGHT                          /* Orange : Fix error in energy compensation in late binaural */

#endif



#define BE_FIX_567_DOUBLE_STEREO_DMX                          /* NTT: Fix formal issues */   

#define NONBE_FIX_567_DOUBLE_STEREO_DMX                       /* Orange: Double-precision replaced by single-precision */  

#define NONBE_FIX_947_STEREO_DMX_EVS_POC                      /* Orange: Fix clicks on POC */

#ifdef NONBE_FIX_947_STEREO_DMX_EVS_POC

#define NONBE_FIX_947_STEREO_DMX_ROMOPT                       /* Orange: ROM optimisation for POC*/  

#endif

#define NONBE_FIX_947_STEREO_DMX_EVS_PHA                      /* Orange: Fix issues on PHA */

#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA

#define NONBE_FIX_947_STEREO_DMX_FADOPT                       /* Orange: Fading optimisation */  

#endif 





#define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI          /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */

#define NONBE_FIX_982_OMASA_DELAY_COMP_5MS              /* FhG : issue #982 : 5ms and 20ms output different for OMASA */

#define FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO       /* VA: issue 994: remove an obsolete call of function ivas_ls_setup_conversion() in stereo */



#define NONBE_FIX_978_MC_TDREND_REVERB                  /* Eri : activate reverb for TDREND with headtracking */

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 −9
Original line number Diff line number Diff line
@@ -524,15 +524,6 @@ void ivas_omasa_separate_object_render_jbm( 
    for ( obj = 0; obj < num_objects; obj++ )

    {

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

#ifndef NONBE_FIX_982_OMASA_DELAY_COMP_5MS

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