Commit 336e9640 authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/main' into... 

- Merge remote-tracking branch 'remotes/origin/main' into 1324-tsm-memory-lost-in-jbm-bitrate-switching
parents f40ad00b ff5b2e79

.gitlab-ci.yml

+7 −0
Original line number Diff line number Diff line
@@ -352,6 +352,13 @@ build-codec-instrumented-linux: 
    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh

    - ./scripts/prepare_instrumentation.sh

    - make -j -C scripts/c-code_instrument

  artifacts:

    when: always

    access: all

    expire_in: "30 days"

    paths:

      - wmc_tool_output.txt





# make sure that the codec builds with msan, asan and usan

build-codec-sanitizers-linux:

ci/remove_unsupported_testcases.py

+7 −2
Original line number Diff line number Diff line
@@ -104,8 +104,9 @@ TESTCASES_MAIN_PC = [ 
    "Multi-channel 5_1 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 16kHz out, BINAURAL_ROOM_REVERB out",

    "OSBA 2OA 2ISM bitrate switching, 32kHz in, 48kHz out, BINAURAL_ROOM_REVERB out, JBM Prof 5",

]





TESTCASES_MAIN_PC_REENABLE = [

    "4 ISM with extended metadata at 128 kbps, 48 kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out, rendconf dir w id",

]

def remove_testcases(cfg: Path, testcases: list):

    """

    Go through file line by line and copy all testcases except the given ones
@@ -136,7 +137,11 @@ if __name__ == "__main__": 


    testcases = TESTCASES_MAIN

    if args.use_main_pc_set:

        # Add further unsupported test cases

        testcases.extend(TESTCASES_MAIN_PC)

        # Re-enable test cases that are now supported

        for case in TESTCASES_MAIN_PC_REENABLE:

            testcases.remove(case)



    for f in args.cfg_files:

        remove_testcases(f, testcases)

lib_com/bits_alloc.c

+3 −10
Original line number Diff line number Diff line
@@ -552,9 +552,6 @@ ivas_error config_acelp1( 
    const int16_t tdm_lp_reuse_flag,        /* i  : LPC reuse flag (can be 1 only with secondary channel */

    const int16_t tdm_low_rate_mode,        /* i  : secondary channel low rate mode flag */

    const int16_t idchan,                   /* i  : stereo channel ID               */

#ifndef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

    const int16_t active_cnt, /* i  : Active frame counter            */

#endif

    const int16_t tdm_Pitch_reuse_flag,     /* i  : primary channel pitch reuse flag*/

    const int16_t tdm_LRTD_flag,            /* i  : LRTD stereo mode flag           */

    const int16_t GSC_IVAS_mode             /* i  : GSC IVAS mode                   */
@@ -772,11 +769,7 @@ ivas_error config_acelp1( 


            bits -= acelp_cfg->mid_lsf_bits;

        }

#ifdef NONBE_1325_TD_STEREO_QUANT_LSF_SEC

        else if ( tdm_lp_reuse_flag == 1 && idchan == 1 )

#else

        else if ( tdm_lp_reuse_flag == 1 && idchan == 1 && active_cnt != 1 )

#endif

        {

            bits -= TDM_IC_LSF_PRED_BITS;

        }

lib_com/cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -524,9 +524,7 @@ 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 −5
Original line number Diff line number Diff line
@@ -172,13 +172,8 @@ typedef enum 
#define JBM_CLDFB_SLOTS_IN_SUBFRAME             4

#define MAX_JBM_CLDFB_TIMESLOTS                 32

#define DEFAULT_JBM_CLDFB_TIMESLOTS             16

#ifdef JBM_MEMORY_OPT

#define MAX_JBM_L_FRAME48k                      ( IVAS_MAX_FRAME_SIZE * 2 ) /* 1920:  max. time-scaled frame buffer length (per channel) in samples */

#define MAX_JBM_L_FRAME_NS                      40000000L                   /* 40 ms: time-scaled frame size in ns, proportional to MAX_JBM_L_FRAME48k  */

#else

#define MAX_JBM_L_FRAME48k                      1920

#define MAX_JBM_L_FRAME_NS                      40000000L

#endif

#define MAX_SPAR_INTERNAL_CHANNELS              IVAS_SPAR_MAX_CH

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