Commit bb1414dc authored by multrus's avatar multrus
Browse files

fix compilation warnings

parent f0133098

lib_dec/ivas_mc_paramupmix_dec.c

+5 −5
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static void ps_pred_process( MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix, float qmf_m 
#ifdef JBM_PARAMUPMIX

static void ps_pred_process_sf( MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix, DECODER_TC_BUFFER_HANDLE hTcBuffer, float qmf_mod_re[JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float qmf_mod_im[JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float qmf_side_re[JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float qmf_side_im[JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float *param_interpol, const int16_t ch, const int16_t slots_rendered );



#ifdef PARAMUPMIX_BINAURAL_UPDATES

#if defined( PARAMUPMIX_BINAURAL_UPDATES ) && defined( SPLIT_REND_WITH_HEAD_ROT )

static void ivas_mc_paramupmix_dec_sf( Decoder_Struct *st_ivas, float *output_f[MAX_OUTPUT_CHANNELS], int16_t slot_index_start );

#else

static void ivas_mc_paramupmix_dec_sf( Decoder_Struct *st_ivas, float *output_f[MAX_OUTPUT_CHANNELS] );
@@ -528,7 +528,7 @@ void ivas_mc_paramupmix_dec_render( 
    int16_t slots_to_render, first_sf, last_sf, subframe_idx;

    uint16_t slot_size, ch;

    float *output_f_local[MAX_OUTPUT_CHANNELS];

#ifdef PARAMUPMIX_BINAURAL_UPDATES

#if defined( PARAMUPMIX_BINAURAL_UPDATES ) && defined( SPLIT_REND_WITH_HEAD_ROT )

    int16_t slot_index_start;

#endif

    MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix;
@@ -580,14 +580,14 @@ void ivas_mc_paramupmix_dec_render( 
            mvr2r( hMCParamUpmix->beta_prev[ch], hMCParamUpmix->beta_sf[ch], IVAS_MAX_NUM_BANDS );

        }



#ifdef PARAMUPMIX_BINAURAL_UPDATES

#if defined( PARAMUPMIX_BINAURAL_UPDATES ) && defined( SPLIT_REND_WITH_HEAD_ROT )

        slot_index_start = 0;

#endif

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

        {

            int16_t n_samples_sf = slot_size * st_ivas->hTcBuffer->subframe_nbslots[subframe_idx];



#ifdef PARAMUPMIX_BINAURAL_UPDATES

#if defined( PARAMUPMIX_BINAURAL_UPDATES ) && defined( SPLIT_REND_WITH_HEAD_ROT )

            ivas_mc_paramupmix_dec_sf( st_ivas, output_f_local, slot_index_start );

            slot_index_start += st_ivas->hTcBuffer->subframe_nbslots[subframe_idx];

#else
@@ -1012,7 +1012,7 @@ static void ps_pred_process_sf( 
static void ivas_mc_paramupmix_dec_sf(

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

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

#ifdef PARAMUPMIX_BINAURAL_UPDATES

#if defined( PARAMUPMIX_BINAURAL_UPDATES ) && defined( SPLIT_REND_WITH_HEAD_ROT )

    ,

    int16_t slot_index_start

#endif

lib_rend/ivas_dirac_dec_binaural_functions.c

+14 −0
Original line number Diff line number Diff line
@@ -104,7 +104,11 @@ typedef struct parambin_rend_config_data 
 * Local function prototypes

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



#ifdef SPLIT_REND_WITH_HEAD_ROT_PARAMBIN

static void ivas_dirac_dec_binaural_internal( Decoder_Struct *st_ivas, COMBINED_ORIENTATION_HANDLE hCombinedOrientationData, float *output_f[], const int16_t nchan_transport, const int16_t subframe );

#else

static void ivas_dirac_dec_binaural_internal( Decoder_Struct *st_ivas, COMBINED_ORIENTATION_HANDLE hCombinedOrientationData, const int16_t nchan_transport, const int16_t subframe );

#endif



static void ivas_dirac_dec_decorrelate_slot( DIRAC_DEC_BIN_HANDLE hDiracDecBin, const int16_t num_freq_bands, const int16_t slot, float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], float decRe[][CLDFB_NO_CHANNELS_MAX], float decIm[][CLDFB_NO_CHANNELS_MAX] );
@@ -527,7 +531,11 @@ void ivas_dirac_dec_binaural_render( 
    for ( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ )

    {

        int16_t n_samples_sf = slot_size * hSpatParamRendCom->subframe_nbslots[subframe_idx];

#ifdef SPLIT_REND_WITH_HEAD_ROT_PARAMBIN

        ivas_dirac_dec_binaural_internal( st_ivas, st_ivas->hCombinedOrientationData, output_f_local, nchan_transport, subframe_idx );

#else

        ivas_dirac_dec_binaural_internal( st_ivas, st_ivas->hCombinedOrientationData, nchan_transport, subframe_idx );

#endif



        for ( ch = 0; ch < nchan_out; ch++ )

        {
@@ -673,7 +681,11 @@ void ivas_dirac_dec_binaural( 
    {

        int16_t n_samples_sf = slot_size * hSpatParamRendCom->subframe_nbslots[subframe];



#ifdef SPLIT_REND_WITH_HEAD_ROT_PARAMBIN

        ivas_dirac_dec_binaural_internal( st_ivas, hCombinedOrientationData, p_output, nchan_transport, subframe );

#else

        ivas_dirac_dec_binaural_internal( st_ivas, hCombinedOrientationData, nchan_transport, subframe );

#endif



        for ( ch = 0; ch < 2 * BINAURAL_CHANNELS; ch++ )

        {
@@ -698,7 +710,9 @@ void ivas_dirac_dec_binaural( 
static void ivas_dirac_dec_binaural_internal(

    Decoder_Struct *st_ivas,

    COMBINED_ORIENTATION_HANDLE hCombinedOrientationData,

#ifdef SPLIT_REND_WITH_HEAD_ROT_PARAMBIN

    float *output_f[],

#endif

    const int16_t nchan_transport,

    const int16_t subframe )

{