Commit d48fe9b5 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'float-pc' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop... 

Merge branch 'float-pc' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into 1616_ref_port_fl1422
parents ac011375 4809dfb1

.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

+4 −9
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ stages: 


.build-job-linux:

  stage: build

  timeout: "2 minutes"

  timeout: "20 minutes"

  needs: []

  tags:

    - ivas-basop-linux
@@ -1705,7 +1705,7 @@ codec-smoke-test: 
    # LTV update needed as ltv ISM metadata files are used

    - *update-ltv-repo

    - python3 scripts/smoketest-basop-filter.py scripts/config/ivas_modes.json --inline

    - bash ci/smoke_test.sh

    - bash ci/smoke_test.sh || true

    - tar cJf logs.tar.xz out/logs/

    - ls -al logs.tar.*

    ### analyze for failures
@@ -2122,13 +2122,11 @@ ivas-interop-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
@@ -2141,8 +2139,6 @@ ivas-interop-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
@@ -2151,7 +2147,6 @@ ivas-interop-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:

apps/encoder.c

+6 −1
Original line number Diff line number Diff line
@@ -789,7 +789,12 @@ int main( 
        }



        /* *** Encode one frame *** */

        if ( ( error = IVAS_ENC_EncodeFrameToSerial( hIvasEnc, pcmBuf, pcmBufSize, bitStream, &numBits ) ) != IVAS_ERR_OK )

        if ( ( error = IVAS_ENC_EncodeFrameToSerial( hIvasEnc, pcmBuf, pcmBufSize, bitStream, &numBits

#ifdef DBG_BITSTREAM_ANALYSIS

                                                     ,

                                                     frame

#endif

                                                     ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nencodeFrame failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );

            goto cleanup;

enum-helper.c

0 → 100644
+382 −0

File added.

Preview size limit exceeded, changes collapsed.

lib_com/ari_hm.c

+9 −1
Original line number Diff line number Diff line
@@ -205,7 +205,11 @@ int16_t CountIndexBits( 
 *-------------------------------------------------------------------*/



int16_t tcx_hm_render(

#ifdef FIX_1001_ARI_HM_OVERFLOW

    const int32_t lag, /* i  : pitch lag                             */

#else

    const int16_t lag, /* i  : pitch lag                             */

#endif

    const int16_t fract_res, /* i  : fractional resolution of the lag      */

    Word16 p[]               /* o  : harmonic model (Q13)                  */

)
@@ -265,7 +269,11 @@ int16_t tcx_hm_render( 


void tcx_hm_modify_envelope(

    const Word16 gain, /* i  : HM gain (Q11)                         */

#ifdef FIX_1001_ARI_HM_OVERFLOW

    const int32_t lag,

#else

    const int16_t lag,

#endif

    const int16_t fract_res,

    const Word16 p[],     /* i  : harmonic model (Q13)                  */

    Word32 env[],         /* i/o: envelope (Q16)                        */