Commit 1fffb78d authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' into 118-bitrate-range-for-dtx-support

parents c349af39 1722ae1c

.gitignore

+4 −0
Original line number Diff line number Diff line
@@ -51,6 +51,10 @@ tests/renderer/cut 
tests/renderer/ref

tests/dut

tests/ref

scripts/testv/*_cut*.pcm

# default reference binary name

IVAS_cod_ref

IVAS_dec_ref



# Python files that pop up when running scripts

__pycache__/

ci/run_scheduled_sanitizer_test.py

+0 −5
Original line number Diff line number Diff line
@@ -89,11 +89,6 @@ def get_modes(in_format: str) -> list: 
        in_format = "MC_" + in_format + "_b"

        mode_list = [m for m in mode_list if in_format in m]



    # TODO: remove once #185 is fixed

    # temporarily skip 24.4kbps SBA bitrate

    if in_format == "SBA":

        mode_list = [m for m in mode_list if not "b24_4" in m]



    return mode_list

lib_com/ivas_rom_com.c

+2 −2
Original line number Diff line number Diff line
@@ -938,7 +938,7 @@ const ivas_spar_br_table_t ivas_spar_br_table_consts[IVAS_SPAR_BR_TABLE_LEN] = 
    { 256000, 0, SBA_HOA3_ORDER, FB, 24000, 4, WYXZ, 0, 0,{ { 76300, 73550, 112000 },{ 59350, 57200, 56000 },{ 42400, 40850, 48000 },{ 25450, 24500, 40000 } },

    { { 31, 11, 11, 1 },{ 1, 1, 1, 1 },{ 31, 1, 1, 1 } }, 1, 2, 0 },



    { 384000, 0, 1, FB, 24000, 4, WYXZ, 0, 0,{ { 128000, 128000, 128000 },{ 100000, 100000, 128000 },{ 79850, 79850, 104000 },{ 66600, 66600, 104000 } },   // not yet optimized

    { 384000, 0, SBA_FOA_ORDER, FB, 24000, 4, WYXZ, 0, 0,{ { 128000, 128000, 128000 },{ 100000, 100000, 128000 },{ 79850, 79850, 104000 },{ 66600, 66600, 104000 } },   // not yet optimized

    { { 31, 1, 1, 1 },{ 1, 1, 1, 1 },{ 1, 1, 1, 1 } }, 1, 2, 0 },



    { 384000, 0, SBA_HOA2_ORDER, FB, 24000, 4, WYXZ, 0, 0,{ { 128000, 128000, 128000 },{ 105350, 103300, 112000 },{ 75200, 73750, 96000 },{ 45100, 44250, 48000 } }, // just added as a place holder, not necessarily operational
@@ -947,7 +947,7 @@ const ivas_spar_br_table_t ivas_spar_br_table_consts[IVAS_SPAR_BR_TABLE_LEN] = 
    { 384000, 0, SBA_HOA3_ORDER, FB, 24000, 4, WYXZ, 0, 0,{ { 124300, 121550, 128000 },{ 96700, 94550, 112000 },{ 69050, 67500, 96000 },{ 41450, 40500, 48000 } },  // just added as a place holder, not necessarily operational

    { { 31, 11, 11, 1 },{ 1, 1, 1, 1 },{ 1, 1, 1, 1 } }, 1, 2, 0 },



    { 512000, 0, 1, FB, 24000, 4, WYXZ, 0, 0,{ { 128000, 128000, 128000 },{ 128000, 128000, 128000 },{ 128000, 128000, 128000 }, {118450, 118450, 128000 } }, // not yet optimized

    { 512000, 0, SBA_FOA_ORDER, FB, 24000, 4, WYXZ, 0, 0,{ { 128000, 128000, 128000 },{ 128000, 128000, 128000 },{ 128000, 128000, 128000 }, {118450, 118450, 128000 } }, // not yet optimized

    { { 31, 1, 1, 1 },{ 1, 1, 1, 1 },{ 1, 1, 1, 1 } }, 1, 2, 0 },



    { 512000, 0, SBA_HOA2_ORDER, FB, 24000, 4, WYXZ, 0, 0,{ { 128000, 128000, 128000 },{ 128000, 128000, 128000 },{ 128000, 128000, 128000 },{ 97700, 93300, 128000 } }, // not yet optimized

lib_com/ivas_stat_com.h

+2 −0
Original line number Diff line number Diff line
@@ -315,7 +315,9 @@ typedef struct ivas_huff_coeffs_t 
/* AGC structures */

typedef struct ivas_agc_chan_data_t

{

#ifndef CLEANUP_185_NO_AGC_EXCEPTION

    int16_t gainException;

#endif

    int16_t absGainExp;

    int16_t absGainExpCurr;

lib_com/options.h

+4 −0
Original line number Diff line number Diff line
@@ -164,6 +164,10 @@ 
#define BRATE_SWITCHING_FRAMEWORK                       /* Bitrate switching changes related to the general framework  */

#define BRATE_SWITCHING_RENDERING                       /* Bitrate switching changes related to the renderers */

#define FIX_185_REDUCE_MD_BITS                          /* Issue 185: Crash in SBA encoder for 24.4 kbps HOA3 input with longer testvector */

#ifdef FIX_185_REDUCE_MD_BITS

#define CLEANUP_185_NO_AGC_EXCEPTION                    /* Issue 185: Cleanup AGC EXCEPTION code */

#endif

#define FIX_I220_PARAMMC_CPROTO                         /* Issue 220: sanitizer error in the svd due to NaNs coming from negative energies in Cproto */

#define FIX_DTX_RANGE                                   /* Issue 118: fix the DTX usage: default DTX up to 64 kbps, otherwise only in silence */