Commit 534afb84 authored by Sumeyra Demir Kanik's avatar Sumeyra Demir Kanik
Browse files

Merging from main

parents e64eef08 0ec6c4d1

.gitlab-ci.yml

+15 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ variables: 
  EXIT_CODE_FAIL: 1

  PROCESSING_SCRIPTS_BIN_DIR: "/test-bin"

  TESTS_DIR_CODEC_BE_ON_MR: "tests/codec_be_on_mr_nonselection"

  IVAS_PIPELINE_NAME: ''

  MANUAL_PIPELINE_TYPE:

    description: "Type for the manual pipeline run. Use 'test-be-release' to run BE test against release codec."

    value: 'default'
@@ -25,14 +26,26 @@ default: 


# This sets when pipelines are created. Jobs have more specific rules to restrict them.

workflow:

  name: '$IVAS_PIPELINE_NAME'

  rules:

    # see https://docs.gitlab.com/ee/ci/yaml/workflow.html#switch-between-branch-pipelines-and-merge-request-pipelines

    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"

      when: never

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

      variables:

        IVAS_PIPELINE_NAME: 'MR pipeline: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME'

    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Pushes to main

      variables:

        IVAS_PIPELINE_NAME: 'Push pipeline: $CI_COMMIT_BRANCH'

    - if: $CI_PIPELINE_SOURCE == 'schedule' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Scheduled in main

    - if: $CI_PIPELINE_SOURCE == 'web' # for testing

      variables:

        IVAS_PIPELINE_NAME: 'Scheduled pipeline: $CI_COMMIT_BRANCH'

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'default' # for testing

      variables:

        IVAS_PIPELINE_NAME: 'Web run pipeline: $CI_COMMIT_BRANCH'

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'test-be-release'

      variables:

        IVAS_PIPELINE_NAME: 'Test BE to release pipeline: $CI_COMMIT_BRANCH'

    - if: $CI_PIPELINE_SOURCE == 'trigger'



stages:
@@ -353,7 +366,7 @@ codec-smoke-test: 
  extends:

    - .test-job-linux-needs-testv-dir

    - .rules-merge-request

  timeout: "10 minutes"

  timeout: "15 minutes"

  stage: test

  needs: ["build-codec-linux-cmake", "build-codec-linux-make", "build-codec-instrumented-linux", "build-codec-sanitizers-linux"]

  script:

apps/decoder.c

+8 −0
Original line number Diff line number Diff line
@@ -2531,10 +2531,18 @@ static ivas_error decodeG192( 
        if ( vec_pos_update == 0 )

        {

            update_wmops();

#ifdef FIX_RAM_COUNTING_5MS_RENDERING

            update_mem();

#ifdef MEM_COUNT_DETAILS

            export_mem( "mem_analysis.csv" );

#endif

#endif

        }

#ifndef FIX_RAM_COUNTING_5MS_RENDERING

#ifdef MEM_COUNT_DETAILS

        export_mem( "mem_analysis.csv" );

#endif

#endif

#endif

    }

lib_com/bits_alloc.c

+14 −7
Original line number Diff line number Diff line
@@ -476,6 +476,10 @@ static ivas_error acelp_FCB_allocator( 
        }



        /* try to increase the FCB of the first subframe in cases when the next step is lower than the current step */

#ifdef NONBE_FIX_694_OMASA_ACELP

        if ( fixed_cdk_index[sfr] < ACELP_FIXED_CDK_NB - 1 )

        {

#endif

            step = fcb_table( fixed_cdk_index[sfr] + 1, L_subfr ) - fcb_table( fixed_cdk_index[sfr], L_subfr );

            if ( *nBits >= step && cdbk >= 0 )

            {
@@ -489,6 +493,9 @@ static ivas_error acelp_FCB_allocator( 
                    *nBits -= step;

                }

            }

#ifdef NONBE_FIX_694_OMASA_ACELP

        }

#endif

    }

    /* TRANSITION coding: allocate highest FCBQ bit-budget to the subframe with the glottal-shape codebook */

    if ( tc_subfr >= L_SUBFR )

lib_com/bitstream.c

+4 −0
Original line number Diff line number Diff line
@@ -2740,7 +2740,11 @@ ivas_error preview_indices( 
            /* Read SBA planar flag and SBA order */

            st_ivas->sba_planar = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + IVAS_COMBINED_FORMAT_SIGNALLING_BITS] == 1 );



#ifdef NONBE_FIX_752_OSBA_MISCONFIG_MCT

            if ( total_brate >= IVAS_256k )

#else

            if ( total_brate > IVAS_256k )

#endif

            {

                st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + IVAS_COMBINED_FORMAT_SIGNALLING_BITS + 2] == 1 );

                st_ivas->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + IVAS_COMBINED_FORMAT_SIGNALLING_BITS + 1] == 1 );

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -1187,7 +1187,11 @@ enum 


#define QMETADATA_MAXBIT_REQ_MASA               900                         /* max bit-bit/direction for avoiding requantization in MASA path */

#define QMETADATA_MAXBIT_REQ_SBA                400                         /* max bit-bit/direction for avoiding requantization in SBA path */

#ifdef NONBE_FIX_760_COHERENCE_MASA

#define MASA_COH_LIMIT_2IDX                     96                          /* limit for sum of values across components for having two joint indexes */

#else

#define MASA_COH_LIMIT_2IDX                     144                         /* limit for sum of values across components for having two joint indexes */

#endif

#define QMETADATA_MAX_NO_DIRECTIONS             2

#define MASA_MAX_BITS                           1300                        /* max. bit-budget for MASA metadata */