Commit e018eadc authored by norvell's avatar norvell
Browse files

Merge branch 'main' into ci/enforce-warning-free-builds

parents 85fb973d fac56a47

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ stages: 
    - make clean

    - make -j CLANG=$CLANG_NUM

    - if [[ $CLANG_NUM == 3 ]]; then export UBSAN_OPTIONS="suppressions=scripts/ubsan.supp,report_error_type=1"; fi

    - testcase_timeout=TESTCASE_TIMEOUT_STV

    - testcase_timeout=$TESTCASE_TIMEOUT_STV

    - python3 -m pytest $SHORT_TEST_SUITE -v --tb=no --update_ref 1 -m create_ref --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout $testcase_timeout --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec

  artifacts:

    name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"

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/arith_coder_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -274,7 +274,11 @@ void tcx_arith_scale_envelope( 


    tmp2 = BASOP_Util_Add_MantExp(negate(b), b_e, tmp, tmp2, &scale);

    scale = BASOP_Util_Divide1616_Scale(scale, round_fx(a), &tmp);

#ifdef BASOP_NOGLOB

    scale = shl_o(scale, sub(sub(add(tmp, tmp2), a_e), 1), &Overflow); /* Q15 */

#else

    scale = shl(scale, sub(sub(add(tmp, tmp2), a_e), 1)); /* Q15 */

#endif



    /* iscale = 1.0f / scale; */

    iscale_e = 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 */