Commit 439f4ec3 authored by vaclav's avatar vaclav
Browse files

Merge branch '1022-unused-function-ivas_param_ism_dec' into 'main' 

Resolve "Unused function ivas_param_ism_dec()"

See merge request !1437
parents ae7812db b71e423f

lib_com/ivas_prot.h

+2 −0
Original line number Diff line number Diff line
@@ -1095,11 +1095,13 @@ 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
@@ -159,6 +159,7 @@ 
#define FIX_1027_GSC_INT_OVERFLOW                       /* VA: issue 2207: overflow in GSC */

#define FIX_1024_REMOVE_PARAMMC_MIXING_MAT              /* VA: issue 1024: remove unused function ivas_param_mc_get_mono_stereo_mixing_matrices() */

#define FIX_1023_REMOVE_PARAMMC_DEC                     /* VA: issue 1023: remove unused function ivas_param_mc_dec() */

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



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

lib_dec/ivas_ism_param_dec.c

+9 −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,
@@ -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()
@@ -1121,7 +1121,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 );
@@ -1533,8 +1533,10 @@ void ivas_param_ism_params_to_masa_param_mapping( 
        st_ivas->hISMDTX.dtx_flag = 1;

    }



#ifndef FIX_1022_REMOVE_PARAMISM_DEC

    if ( st_ivas->nchan_ism > 1 )

    {

#endif

        if ( st_ivas->hISMDTX.dtx_flag )

        {

            float energy_ratio;
@@ -1598,6 +1600,7 @@ void ivas_param_ism_params_to_masa_param_mapping( 
                }

            }

        }

#ifndef FIX_1022_REMOVE_PARAMISM_DEC

    }

    else

    {
@@ -1617,6 +1620,7 @@ void ivas_param_ism_params_to_masa_param_mapping( 
            }

        }

    }

#endif



    return;

}