Commit 0053a764 authored by vaclav's avatar vaclav
Browse files

port FIX_1022_REMOVE_PARAMISM_DEC

parent f34818ef

lib_com/ivas_prot.h

+2 −1
Original line number Diff line number Diff line
@@ -1128,11 +1128,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
@@ -188,6 +188,7 @@ 
#define NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX      /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/

#define FIX_969_USAN_IGF_ARITH                          /* FhG: issue 969: fix USAN error in igf_sce_dec; same issue as #962 */

#define FIX_959_MASA_LINEAR_REND                        /* VA: issue 959: remove unused calling of ivas_sba_linear_renderer() in MASA rendering */

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



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_ism_param_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ void ivas_param_ism_dec_close( 
    return;

}





#ifndef FIX_1022_REMOVE_PARAMISM_DEC

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

 * ivas_param_ism_dec()

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


    return;

}



#endif



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

 * ivas_ism_dec_digest_tc()
@@ -1122,7 +1122,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 );