Commit 9ad5c93b authored by vaclav's avatar vaclav
Browse files

Merge branch '1562_ref_PortFlpMR1437' into 'float-pc' 

Port float MR1437 to float-pc

See merge request !1544
parents 35a16b12 4aa495a3

lib_com/ivas_prot.h

+2 −1
Original line number Diff line number Diff line
@@ -1109,11 +1109,12 @@ void ivas_param_ism_dec_close( 
    const AUDIO_CONFIG output_config                            /* i  : output audio configuration                  */

);



#ifndef FIX_1022_REMOVE_PARAMISM_DEC

void ivas_param_ism_dec(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                      */

    float *output_f[]                                           /* i/o: synthesized core-coder transport channels/DirAC output  */

);



#endif

void ivas_ism_dec_digest_tc(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                      */

);

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ 
#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM

#define NONBE_FIX_AVG_IAC_CLDFB_REVERB

#endif

#define FIX_1022_REMOVE_PARAMISM_DEC                    /* VA: issue 1022: remove unused function ivas_param_ism_dec() */



#define USE_NEW_HRTF_BINARY_FILE_FORMAT                 /* Orange: to activate when decided to change the hrtf binary file format */

//#define NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES       /* Philips: Use pre-computed HRTF average L/R energies and IAC in all renderers	*/

lib_dec/ivas_ism_param_dec.c

+5 −5
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ static void ivas_param_ism_render_slot( 
    return;

}





#ifndef FIX_1022_REMOVE_PARAMISM_DEC

static void ivas_param_ism_rendering(

    PARAM_ISM_DEC_HANDLE hParamIsmDec,

    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom,
@@ -361,7 +361,7 @@ static void ivas_param_ism_rendering( 


    return;

}



#endif



static ivas_error ivas_param_ism_rendering_init(

    PARAM_ISM_RENDERING_HANDLE hParamIsmRendering,
@@ -716,7 +716,7 @@ void ivas_param_ism_dec_close( 
    return;

}





#ifndef FIX_1022_REMOVE_PARAMISM_DEC

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

 * ivas_param_ism_dec()

 *
@@ -960,7 +960,7 @@ void ivas_param_ism_dec( 


    return;

}



#endif



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

 * ivas_ism_dec_digest_tc()
@@ -1108,7 +1108,7 @@ void ivas_param_ism_dec_digest_tc( 
        nchan_out_woLFE = st_ivas->hIntSetup.nchan_out_woLFE;

    }



    push_wmops( "ivas_param_ism_dec" );

    push_wmops( "ivas_param_ism_dec_digest_tc" );



    /* general setup */

    ivas_jbm_dec_get_adapted_linear_interpolator( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbSlots, hParamIsmDec->hParamIsmRendering->interpolator );