Commit bbf97be6 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'ivas-float-update' into ms_decision_float_ref

parents e2b0dd95 1bbe1956

.gitattributes

0 → 100644
+24 −0
Original line number Diff line number Diff line 
# Default behavior. Converts all text files to use LF in repository.

* text=auto



# List all known generic text files

*.c text

*.csv text

*.h text

*.json text

*.m text

*.md text

*.prm text

*.py text

*.txt text



# Set Windows specific text files to always use CRLF in working tree.

*.bat text eol=crlf

*.cmd text eol=crlf

*.sln text eol=crlf

*.vcxproj text eol=crlf

*.vcxproj.filters text eol=crlf



# Set Unix specific text files to always use LF (also covers Windows subsystem for Linux) in working tree

*.sh text eol=lf

.gitlab-ci.yml

+2 −7
Original line number Diff line number Diff line
@@ -1155,13 +1155,11 @@ voip-be-on-merge-request: 


  - job_id=$(python3 ci/get_id_of_last_job_occurence.py $CI_COMMIT_REF_NAME $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.zip

  - unzip artifacts.zip || true # this may fail on first run, when there are no artifacts there and the zip file is actually just "404"-html

  - ls

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

  - unzip -qq artifacts.zip || true # this may fail on first run, when there are no artifacts there and the zip file is actually just "404"-html

  - public_dir="$CI_JOB_NAME-public"

  # if is needed to catch case when no artifact is there (first run), similarly as above

  - if [[ -d $public_dir ]]; then mv $public_dir/* wmops/;  fi

  - ls wmops

  - rm artifacts.zip

  - rm -rf $public_dir
@@ -1174,8 +1172,6 @@ voip-be-on-merge-request: 
  - mkdir $public_dir/logs

  # first move logs

  - log_files=$(cat $public_dir/graphs*.js | grep logFile | sed "s/.*\(wmops_newsletter_.*\.csv\).*/\1/g")

  - 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
@@ -1184,7 +1180,6 @@ voip-be-on-merge-request: 
  - sed -i "s/IVAS FORMAT/IVAS $in_format to $out_format/g" ${public_dir}/index.html

  # do separately here to avoid overwrite complaints by mv

  - mv -f ci/complexity_measurements/style.css ${public_dir}/

  - ls $public_dir



.complexity-template:

  extends:

lib_dec/amr_wb_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ ivas_error amr_wb_dec( 


    error = IVAS_ERR_OK;



    push_wmops( "amr_wb_dec" );



    /*------------------------------------------------------------------*

     * Initialization

     *------------------------------------------------------------------*/
@@ -824,6 +826,8 @@ ivas_error amr_wb_dec( 
    dbgwrite( &st->bfi, sizeof( int16_t ), 1, output_frame, "res/bfi" );

#endif



    pop_wmops();



    return error;

}

lib_enc/amr_wb_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ void amr_wb_enc( 


    LPD_state_HANDLE hLPDmem = st->hLPDmem;



    push_wmops( "amr_wb_enc" );



    /*------------------------------------------------------------------*

     * Initialization

     *------------------------------------------------------------------*/
@@ -550,6 +552,8 @@ void amr_wb_enc( 
    dbgwrite( snr_[0], sizeof( float ), 320, 1, "res/snr" );

#endif



    pop_wmops();



    return;

}