Commit 69ae666d authored by vaclav's avatar vaclav
Browse files

fix compilation warnings

parent 63056d90
Loading
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -531,7 +531,9 @@ 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 SPLIT_REND_WITH_HEAD_ROT
    int16_t slot_index_start;
#endif
    MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix;

    hMCParamUpmix = st_ivas->hMCParamUpmix;
@@ -573,17 +575,20 @@ void ivas_mc_paramupmix_dec_render(
            mvr2r( hMCParamUpmix->beta_prev[ch], hMCParamUpmix->beta_sf[ch], IVAS_MAX_NUM_BANDS );
        }

#ifdef 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 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
            ivas_mc_paramupmix_dec_sf( st_ivas, output_f_local );
#endif
            slot_index_start += st_ivas->hTcBuffer->subframe_nbslots[subframe_idx];
            for ( ch = 0; ch < MAX_OUTPUT_CHANNELS; ch++ )
            {
                output_f_local[ch] += n_samples_sf;
+0 −9
Original line number Diff line number Diff line
@@ -32,11 +32,6 @@
#ifndef _IVAS_TABLES_H_
#define _IVAS_TABLES_H_

#ifdef __cplusplus
extern "C"
{
#endif

#include "options.h"
#ifndef SPLIT_REND_WITH_HEAD_ROT
#pragma warning( disable : 4206 )
@@ -565,10 +560,6 @@ extern const uint32_t c_aaiRMSEnvHuffEnc[64][2];

extern const uint32_t c_aaiRMSEnvHuffDec[13][HUFF_DEC_TABLE_SIZE];

#ifdef __cplusplus
}
#endif

#endif

#endif /* _TABLES_H_ */