Commit f636d270 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Fixed testing of multiple MR

parent 14834742

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ variables: 
  TESTV_DIR: "/usr/local/testv"

  LTV_DIR: "/usr/local/ltv"

  EVS_BE_TEST_DIR_BASOP: "/usr/local/be_2_evs_basop"

  REFERENCE_BRANCH: "ivas-float-update"

  REFERENCE_BRANCH: "float_ref_testing"

  BUILD_OUTPUT: "build_output.txt"

  SCRIPTS_DIR: "/usr/local/scripts"

  EXIT_CODE_NON_BE: 123
@@ -1218,8 +1218,8 @@ voip-be-on-merge-request: 
  - rm artifacts.zip

  - rm -rf $public_dir



  ### 1.5.part: get the corresponding measurement from ivas-float-update

  - job_id=$(python3 ci/get_id_of_last_job_occurence.py ivas-float-update $CI_JOB_NAME $CI_PROJECT_ID)

  ### 1.5.part: get the corresponding measurement from float_ref_testing

  - job_id=$(python3 ci/get_id_of_last_job_occurence.py float_ref_testing $CI_JOB_NAME $CI_PROJECT_ID)

  - echo $job_id

  - curl --request GET "https://forge.3gpp.org/rep/api/v4/projects/$CI_PROJECT_ID/jobs/$job_id/artifacts" --output artifacts_ref.zip

  - unzip -j artifacts_ref.zip "*latest_WMOPS.csv" || true

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -135,4 +135,5 @@ 
#define FIX_1010_OPT_NORM_NOSAT                 /* FhG: SVD complexity optimizations (non-be) */

#define FIX_1010_OPT_SEC_SINGLE_RESCALE         /* FhG: SVD complexity optimizations (non-be) */

#define NONBE_1211_DTX_BR_SWITCHING             /* VA: port float issue 1211: fix crash in MASA DTX bitrate switching */

#define FIX_1189_GSC_IVAS_OMASA                 /* VA: Fix for issue 1189: Bitstream desynchornization due to reading/writing of the GSC_IVAS_mode parameter */

#endif

lib_dec/acelp_core_dec_ivas_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -611,7 +611,11 @@ ivas_error acelp_core_dec_ivas_fx( 
        {

            test();

            test();

#ifdef FIX_1189_GSC_IVAS_OMASA

            IF( EQ_16( st->coder_type, AUDIO ) || ( EQ_16( st->coder_type, INACTIVE ) && EQ_16( st->inactive_coder_type_flag, 1 ) ) )

#else

            IF( EQ_16( st->coder_type, AUDIO ) || ( st->coder_type == INACTIVE && LE_32( st->total_brate, MAX_GSC_INACTIVE_BRATE ) ) )

#endif

            {

                st->GSC_IVAS_mode = get_next_indice_fx( st, 2 );

                move16();