Commit f6c55524 authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/main' into 1319-stack-size-in-sba-decoder

parents 6dfa00be 6baab0c6

.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
@@ -1585,7 +1585,7 @@ ltv-msan: 
    - .sanitizer-selftest-anchor

  rules:

    - if: $SANITIZER_SCHEDULE_E

  timeout: 4 hours

  timeout: 5 hours

  tags:

    - ivas-linux-fast

  before_script:
@@ -1603,10 +1603,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
@@ -1622,10 +1622,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" );

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

{

lib_com/ivas_prot.h

+0 −15
Original line number Diff line number Diff line
@@ -868,13 +868,6 @@ void ivas_jbm_dec_get_md_map( 
int16_t ivas_jbm_dec_get_num_tc_channels( 

    Decoder_Struct *st_ivas                                     /* i  : IVAS decoder handle                                         */

);

#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS

void ivas_jbm_dec_copy_tc_no_tsm( 

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                                         */

    float *tc[],                                                /* i  : transport channels                                          */

    const int16_t output_frame                                  /* i  : output frame size                                           */

);

#endif



void ivas_jbm_dec_get_md_map_even_spacing(

    const int16_t len,                                          /* i  : length of the modfied frames in metadata slots              */
@@ -1129,14 +1122,6 @@ void ivas_param_ism_dec_prepare_renderer( 
    const uint16_t nCldfbSlots                                  /* i  : number of CLDFB slots in transport channels */

);



#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS

void ivas_ism_param_dec_tc_gain_ajust(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                         */

    const uint16_t nSamples,                                    /* i  : number of samples to be compensate          */

    const uint16_t nFadeLength,                                 /* i  : length of the crossfade in samples          */

    float *p_data_f[]                                           /* i  : synthesized core-coder transport channels/DirAC output  */

);

#endif

void ivas_param_ism_dec_render(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                         */

    const uint16_t nSamplesAsked,                               /* i  : number of CLDFB slots requested             */