Commit 1732bc57 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'warnings_fixes' into 'main' 

Warnings fixes for MSVS and Linux

See merge request !316
parents 1f19268f 70e802e1

apps/decoder.c

+10 −2
Original line number Diff line number Diff line
@@ -1518,7 +1518,11 @@ static ivas_error decodeG192( 
    bool needNewFrame;

    int16_t nSamplesRendered, nSamplesRendered_loop, nSamplesToRender;

    IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS];

    IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } };

#ifdef IVAS_FLOAT_FIXED

    IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0,0 }, { 0, 0, 0, 0, 0, 0, 0 } };

#else

    IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0 }, { 0, 0, 0,  }, { 0, 0,0 }, { 0, 0, 0 } };

#endif

    int16_t vec_pos_update, vec_pos_len;
@@ -2085,7 +2089,11 @@ static ivas_error decodeVoIP( 


    IVAS_DEC_BS_FORMAT bsFormat = IVAS_DEC_BS_UNKOWN;

    IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS];

    IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } };

#ifdef IVAS_FLOAT_FIXED

    IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0,0 }, { 0, 0, 0, 0, 0, 0, 0 } };

#else

    IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0 }, { 0, 0, 0,  }, { 0, 0,0 }, { 0, 0, 0 } };

#endif

    int16_t vec_pos_update, vec_pos_len;

    int16_t nOutSamples = 0;

lib_com/basop32.c

+1 −1
Original line number Diff line number Diff line
@@ -3685,7 +3685,7 @@ Word16 i_mult_o(Word16 a, Word16 b, Flag* Overflow) { 
#ifdef ORIGINAL_G7231

  return a * b;

#else

  Word32 register c = a * b;

  register Word32 c = a * b;

  return saturate_o(c, Overflow);

#endif

}

lib_com/basop32.h

+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ Word16 norm_s( Word16 var1 ); /* 
Word16 div_s( Word16 var1, Word16 var2 );                                    /* Short division,       18  */

Word32 div_w(Word32 L_num, Word32 L_den);

Word16 norm_l( Word32 L_var1 );                                              /* Long norm,             1  */

Word32 L_sat(Word32 L_var1);                                                 /* Long saturation,       4  */

#endif                                    /* BASOP_NOGLOB */

lib_com/bits_alloc_fx.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include "options.h"

#include "prot_fx1.h"

#include "prot_fx2.h"

#include "ivas_prot_fx.h"

#include "basop_util.h"

#include "rom_com.h"

lib_com/bitstream_fx.c

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include "options.h"

#include "ivas_cnst.h"        /* Common constants                       */

#include "prot_fx2.h"        /* Function prototypes                    */

#include "ivas_prot_fx.h"

#include "basop_util.h"

#include "rom_com.h"

#include "mime.h"