Commit 5a7f4ea7 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into update-basop-ci-branch

parents 4114e2bc 6289c356

.gitlab-ci.yml

+6 −6
Original line number Diff line number Diff line 
variables:

  # note: GitLab cannot reference variables defined by users in the include ref:, we need to use a YAML anchor for this

  # see https://docs.gitlab.com/ci/yaml/includes/#use-variables-with-include for more information

  IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF 4eb4c0dfbdc845280a9994b5f7540f69c737537b

  IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF 44cb5638949b874ce0f5c3bf4359f9db860d88bc



include:

  - local: .gitlab-ci/variables.yml
@@ -1589,7 +1589,7 @@ ltv-msan: 
    - .sanitizer-selftest-anchor

  rules:

    - if: $SANITIZER_SCHEDULE_E

  timeout: 4 hours

  timeout: 5 hours

  tags:

    - ivas-linux-fast

  before_script:
@@ -1607,10 +1607,10 @@ ltv-asan: 
  rules:

    - if: $SANITIZER_SCHEDULE_E

      when: delayed

      start_in: 4 hours

      start_in: 5 hours

  tags:

    - ivas-linux-fast

  timeout: 4 hours

  timeout: 5 hours

  before_script:

    - !reference [.job-linux, before_script]

    - CLANG_NUM=2
@@ -1626,10 +1626,10 @@ ltv-usan: 
  rules:

    - if: $SANITIZER_SCHEDULE_E

      when: delayed

      start_in: 7 hours

      start_in: 8 hours

  tags:

    - ivas-linux-fast

  timeout: 4 hours

  timeout: 5 hours

  before_script:

    - !reference [.job-linux, before_script]

    - CLANG_NUM=3

apps/decoder.c

+0 −4
Original line number Diff line number Diff line
@@ -298,11 +298,7 @@ int main( 
    if ( arg.hrtfReaderEnabled )

    {

        /* sanity check */

#ifdef NONBE_1293_SR_HRTF

        if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

#else

        if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#endif

        {

            arg.hrtfReaderEnabled = false;

            fprintf( stderr, "\nError: HRTF binary file cannot be used in this output configuration.\n\n" );

ci/get_float_ref_branch_name.sh

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ fi 
# Replace only the first occurrence, as "basop" may be present in the later description

# If the format is correct, then before "_basop", only numbers can occur

float_ref_branchname="${branchname/basop/ref}"

git_result=$(git branch -av)

git_result=$(git branch -a)



# If the branch does not exist, default to "float-pc"

if [[ "$git_result" =~ "$float_ref_branchname" ]]; then

lib_com/cnst.h

+3 −0
Original line number Diff line number Diff line
@@ -524,6 +524,9 @@ enum 
#define ACELP_TCX_TRANS_NS                  1250000                             /* Duration of the ACELP->TCX overlap - 1.25 ms */

#define L_FRAME_MAX                         L_FRAME48k                          /* Max 20ms frame size @48kHz              */

#define L_FRAME_PLUS                        1200                                /* Max frame size (long TCX frame)            */

#ifdef FIX_1320_STACK_CPE_DECODER

#define L_FRAME_PLUS_INTERNAL               800                                 /* Max frame size (long TCX frame) at maximum internal sampling rate */

#endif

#define L_MDCT_OVLP_MAX                     NS2SA( 48000, ACELP_LOOK_NS )       /* = Max mdct overlap */

#define N_TCX10_MAX                         480                                 /* Max size of TCX10 MDCT spectrum */

#define BITS_TEC                            1                                   /* number of bits for TEC */

lib_com/ivas_cnst.h

+0 −4
Original line number Diff line number Diff line
@@ -175,11 +175,7 @@ typedef enum 
#define MAX_JBM_L_FRAME48k                      1920

#define MAX_JBM_L_FRAME_NS                      40000000L

#define MAX_SPAR_INTERNAL_CHANNELS              IVAS_SPAR_MAX_CH

#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

#define MAX_CLDFB_DIGEST_CHANNELS               3                           /* == maximum of ParamISM TCs and ParamMC TCs */

#else

#define MAX_CLDFB_DIGEST_CHANNELS               (FOA_CHANNELS + MAX_NUM_OBJECTS)

#endif



typedef enum

{