Commit 29d1d548 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'ivas-float-update' into... 

Merge branch 'ivas-float-update' into 1066-ivas-float-update-enhance-the-mode-enforcement-functionality-force-to-include-support-for-read-write-operations
parents 65523a7e 00ba8bcd

.gitlab-ci.yml

+36 −47
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ stages: 
- git restore .

- git checkout $current_commit_sha





.build-reference-and-dut-binaries: &build-reference-and-dut-binaries

### build reference binaries

  - *build-reference-binaries
@@ -1166,21 +1165,11 @@ voip-be-on-merge-request: 
  - rm artifacts.zip

  - rm -rf $public_dir



  ### 2. part: setup specific for BASOP repo

  # hack for using the reference encoder -> need to build manually to make script use ref enc and BASOP dec

  - mkdir COMPLEXITY

  - cp IVAS_cod_ref COMPLEXITY/IVAS_cod

  # build branch code aain with instrumentation

  - make clean

  - bash scripts/prepare_instrumentation.sh -p BASOP -m MEM_ONLY

  - make -j -C $INSTR_DIR

  - cp $INSTR_DIR/IVAS_dec COMPLEXITY/IVAS_dec



.complexity-measurements-prepare-artifacts:

  &complexity-measurements-prepare-artifacts # prepare artifacts -> move to public directory

  - public_dir="$CI_JOB_NAME-public"

  - mkdir $public_dir

  - mv -f wmops/log_*_all.txt wmops/*.js ${public_dir}/

  - mv -f wmops/log_*_all.txt ./*.js ${public_dir}/

  # move logfiles for links

  - mkdir $public_dir/logs

  # first move logs
@@ -1188,6 +1177,7 @@ voip-be-on-merge-request: 
  - echo $log_files

  - ls wmops/logs

  - for f in $log_files; do [ -f wmops/logs/$f ] && mv wmops/logs/$f $public_dir/logs/$f; done

  - mv wmops/logs/latest_WMOPS.csv $public_dir/logs/

  # copy index page blueprint

  - cp ci/complexity_measurements/index_complexity.html ${public_dir}/index.html

  # patch the format in the title
@@ -1207,7 +1197,6 @@ voip-be-on-merge-request: 
    - *print-common-info

    - *update-scripts-repo

    - *update-ltv-repo

    - *build-reference-and-dut-binaries

    - *complexity-measurements-setup

    - which coan

  artifacts:
@@ -1225,7 +1214,7 @@ complexity-stereo-in-stereo-out: 
  script:

    - in_format=stereo

    - out_format=stereo

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1240,7 +1229,7 @@ complexity-ism-in-binaural-out: 
    - in_format=ISM

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" full basop || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1255,7 +1244,7 @@ complexity-ism-in-binaural_room_ir-out: 
    - in_format=ISM

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" full basop || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1265,12 +1254,12 @@ complexity-ism-in-ext-out: 
  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 3 hours 30 minutes

      start_in: 3 hours

  script:

    - in_format=ISM

    - out_format=EXT

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" full basop || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1280,12 +1269,12 @@ complexity-sba-hoa3-in-hoa3-out: 
  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 4 hours 30 minutes

      start_in: 4 hours

  script:

    - in_format=HOA3

    - out_format=HOA3

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1295,12 +1284,12 @@ complexity-sba-hoa3-in-binaural-out: 
  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 5 hours 30 minutes

      start_in: 5 hours

  script:

    - in_format=HOA3

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1310,12 +1299,12 @@ complexity-sba-hoa3-in-binaural_room_ir-out: 
  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 6 hours 30 minutes

      start_in: 6 hours

  script:

    - in_format=HOA3

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1325,12 +1314,12 @@ complexity-mc-in-7_1_4-out: 
  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 7 hours 30 minutes

      start_in: 7 hours

  script:

    - in_format=MC

    - out_format=7_1_4

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1340,12 +1329,12 @@ complexity-mc-in-binaural-out: 
  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 10 hours

      start_in: 8 hours

  script:

    - in_format=MC

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1355,12 +1344,12 @@ complexity-mc-in-binaural_room_ir-out: 
  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 12 hours 30 minutes

      start_in: 9 hours

  script:

    - in_format=MC

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1370,12 +1359,12 @@ complexity-masa-in-ext-out: 
  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 15 hours

      start_in: 10 hours

  script:

    - in_format=MASA

    - out_format=EXT

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1385,12 +1374,12 @@ complexity-masa-in-binaural-out: 
  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 16 hours

      start_in: 11 hours

  script:

    - in_format=MASA

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1400,12 +1389,12 @@ complexity-masa-in-hoa3-out: 
  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 17 hours

      start_in: 12 hours

  script:

    - in_format=MASA

    - out_format=HOA3

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1420,7 +1409,7 @@ complexity-masa-in-hoa3-out: 
#     - in_format=OMASA

#     - out_format=EXT

#     - ret_val=0

#     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

#     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop || ret_val=$?

#     - *complexity-measurements-prepare-artifacts

#     - exit $ret_val
@@ -1430,12 +1419,12 @@ complexity-omasa-in-binaural-out: 
  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 18 hours

      start_in: 14 hours

  script:

    - in_format=OMASA

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1445,12 +1434,12 @@ complexity-omasa-in-hoa3-out: 
  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 20 hours

      start_in: 15 hours

  script:

    - in_format=OMASA

    - out_format=HOA3

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1460,12 +1449,12 @@ complexity-StereoDmxEVS-stereo-in-mono-out: 
  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 22 hours

      start_in: 16 hours

  script:

    - in_format=StereoDmxEVS

    - out_format=mono

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" full basop || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1490,7 +1479,7 @@ complexity-osba-in-binaural-out: 
  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 22 hours 30 minutes

      start_in: 18 hours

  script:

    - in_format=OSBA

    - out_format=BINAURAL
@@ -1505,7 +1494,7 @@ complexity-osba-in-binaural_room_ir-out: 
  rules:

    - if: $MEASURE_COMPLEXITY_LINUX

      when: delayed

      start_in: 25 hours

      start_in: 19 hours

  script:

    - in_format=OSBA

    - out_format=BINAURAL_ROOM_IR
@@ -1526,7 +1515,7 @@ pages: 
    - *update-scripts-repo

    - python3 ci/setup_pages.py

    - ls

    - ls -lh public

    - ls public

  artifacts:

    paths:

      - public

lib_enc/ivas_cpe_enc.c

+15 −0
Original line number Diff line number Diff line
@@ -358,6 +358,21 @@ ivas_error ivas_cpe_enc( 
        {

#ifdef DEBUGGING

            hCPE->hStereoMdct->mdct_stereo_mode_cmdl = hEncoderConfig->mdct_stereo_mode_cmdl;

#ifdef DEBUG_FORCE_MDCT_STEREO_MODE

            /*set all other members to defined states */

            hCPE->hStereoMdct->fDualMono = 0;

            hCPE->hStereoMdct->fMSstereo = 0;



            if (  hCPE->hStereoMdct->mdct_stereo_mode_cmdl == SMDCT_FORCE_LR )

            {

                hCPE->hStereoMdct->fDualMono = 1;

            }

             else if (  hCPE->hStereoMdct->mdct_stereo_mode_cmdl == SMDCT_FORCE_MS )

            {

                hCPE->hStereoMdct->fMSstereo = 1;

            }

#endif



#endif

            initMdctStereoEncData( hCPE->hStereoMdct, ivas_format, hCPE->element_mode, hCPE->element_brate, max_bwidth, 0, NULL, 0 );

            hCPE->hStereoMdct->isSBAStereoMode = ( ( ivas_format == SBA_FORMAT || ivas_format == SBA_ISM_FORMAT ) && ( st_ivas->nchan_transport == 2 ) );

lib_enc/ivas_stereo_mdct_core_enc.c

+0 −8
Original line number Diff line number Diff line
@@ -189,15 +189,7 @@ void stereo_mdct_core_enc( 


    if ( hCPE->hCoreCoder[0]->igf )

    {

#ifdef DEBUGGING

        int16_t orig_mdct_stereo_mode_cmdl = hCPE->hStereoMdct->mdct_stereo_mode_cmdl;

        hCPE->hStereoMdct->mdct_stereo_mode_cmdl = SMDCT_MS_DECISION;

#endif

        initMdctStereoEncData( hCPE->hStereoMdct, STEREO_FORMAT, IVAS_CPE_MDCT, hCPE->element_brate, hCPE->hCoreCoder[0]->bwidth, hCPE->hCoreCoder[0]->igf, hCPE->hCoreCoder[0]->hIGFEnc->igfData.igfInfo.grid, 0 );

#ifdef DEBUGGING

        hCPE->hStereoMdct->mdct_stereo_mode_cmdl = orig_mdct_stereo_mode_cmdl;

#endif



        stereo_mdct_init_igf_start_band( &( hCPE->hStereoMdct->stbParamsTCX20 ), 1.0f, hCPE->hCoreCoder[0]->bwidth, hCPE->element_brate );

        stereo_mdct_init_igf_start_band( &( hCPE->hStereoMdct->stbParamsTCX10 ), 0.5f, hCPE->hCoreCoder[0]->bwidth, hCPE->element_brate );

        stereo_mdct_init_igf_start_band( &( hCPE->hStereoMdct->stbParamsTCX20afterACELP ), 1.25f, hCPE->hCoreCoder[0]->bwidth, hCPE->element_brate );

lib_enc/ivas_stereo_mdct_stereo_enc.c

+0 −15
Original line number Diff line number Diff line
@@ -1145,21 +1145,6 @@ void initMdctStereoEncData( 


    set_s( hStereoMdct->IGFStereoMode, -1, 2 );



#ifdef DEBUG_FORCE_MDCT_STEREO_MODE

    /*set all other members to defined states */

    hStereoMdct->fDualMono = 0;

    hStereoMdct->fMSstereo = 0;



    if ( hStereoMdct->mdct_stereo_mode_cmdl == SMDCT_FORCE_LR )

    {

        hStereoMdct->fDualMono = 1;

    }

    else if ( hStereoMdct->mdct_stereo_mode_cmdl == SMDCT_FORCE_MS )

    {

        hStereoMdct->fMSstereo = 1;

    }

#endif



    hStereoMdct->split_ratio = SMDCT_EQUAL_RATIO_RANGE;

    set_s( hStereoMdct->global_ild, SMDCT_ILD_RANGE >> 1, 2 );