Commit d2bfb310 authored by Shikha Shetgeri's avatar Shikha Shetgeri
Browse files

Merge branch 'main' into FIX_331_ALL_BRS

parents 16ba1be2 49653d6f
Loading
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ codec-smoke-test:
    - *print-common-info
    - bash ci/smoke_test.sh
    ### analyze for failures
    - cat out/logs/stv1MASA2TC48c_MASA_2TC_1DIR_b96_fb_cbr.enc.txt
    - if cat smoke_test_output.txt | grep -c "failed"; then echo "Smoke test without PLC failed"; exit 1; fi
    - if cat smoke_test_output_plc.txt | grep -c "failed"; then echo "Smoke test with PLC failed"; exit 1; fi
    - if cat smoke_test_output_jbm_noEXT.txt | grep -c "failed"; then echo "Smoke test JBM part failed"; exit 1; fi
+18 −3
Original line number Diff line number Diff line
@@ -63,8 +63,7 @@ def main(args):

    assert all([t in SUPPORTED_TESTS for t in tests])

    modes = get_modes(in_format)
    returncode = run_check(modes, out_formats, tests, run_fec=run_fec)
    returncode = run_check(in_format, out_formats, tests, run_fec=run_fec)

    collect_for_sanitizer_test(CONSOLE_OUT_FILE)

@@ -92,7 +91,22 @@ def get_modes(in_format: str) -> list:
    return mode_list


def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True):
def get_md_file_command(in_format: str) -> list:

    cmd = list()
    if in_format.startswith("ISM"):
        cmd.append("--metadata_files")
        md_filename = "/usr/local/ltv/ltvISM{}.csv"
        n = int(in_format[-1])
        cmd.extend([md_filename.format(i) for i in range(1, n + 1)])

    return cmd


def run_check(in_format: str, out_formats: list, tests: list, run_fec: bool = True):

    modes = get_modes(in_format)
    md_file_command = get_md_file_command(in_format)

    ### always run encoder and decoder with no frameloss
    cmd_no_fec = [
@@ -107,6 +121,7 @@ def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True)
        *modes,
        "--oc",
        *out_formats,
        *md_file_command,
    ]

    print(
+6 −1
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ fi

cfg=./scripts/config/ci_linux.json
dly_profile=./scripts/dly_error_profiles/dly_error_profile_10.dat
ism_md_cmd="--metadata_files /usr/local/testv/stvISM1.csv /usr/local/testv/stvISM2.csv /usr/local/testv/stvISM3.csv /usr/local/testv/stvISM4.csv"

if [ $BUILD -eq 1 ];then
	# Enable memory macros to find unbalanced memory allocations/deallocations
@@ -74,7 +75,11 @@ if [ $BUILD -eq 1 ];then
fi

# run all modes vanilla-fashion
./scripts/runIvasCodec.py -p $cfg -U 1 $WORKERS | tee smoke_test_output.txt
# treat ISM modes separately because passing the metadata files to MASA modes causes crashes
ism_modes=$(./scripts/runIvasCodec.py -l | grep ISM)
non_ism_modes=$(./scripts/runIvasCodec.py -l | grep -v ISM)
./scripts/runIvasCodec.py -m $non_ism_modes -p $cfg -U 1 $WORKERS | tee smoke_test_output.txt
./scripts/runIvasCodec.py -m $ism_modes -p $cfg -U 1 $WORKERS $ism_md_cmd | tee smoke_test_output.txt
# run the decoding again, but with 15% frame loss
./scripts/runIvasCodec.py -p $cfg -U 1 $WORKERS -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt

+2 −1
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@
#define FIX_103_RA_PARAMS_PARAM_BIN_REND                /* Issue 103: Digest room acoustics parameters for Parametric Binaural Renderer*/
/*#define SBA_HPF_TUNING_DEC*/
#define SMOOTH_WITH_TRANS_DET
//#define FIX_331_ALL_BRS                                 /*Enable the fix_331 across all the bitrates and sba modes*/
#define FIX_331_ALL_BRS                                 /*Enable the fix_331 across all the bitrates and sba modes*/
#define FIX_ISM_DTX_CNG_BWIDTH_ALT                      /* VA: issue 396 - alternative fix for bw changes on CNG frames in ISM DTX for objects that use the decoder-side noise estimation */

#define FIX_398_MASA_DIRECTION_ALIGNMENT                /* Nokia: Issue 398: in 2dir MASA, dynamically adjust directions to be consistent */
#define REND_DEBUGGING_REVISION                         /* VA: encapsulate rendering debugging options with DEBUGGING */
+4 −0
Original line number Diff line number Diff line
@@ -4500,6 +4500,10 @@ ivas_error acelp_core_dec(
    const int16_t flag_sec_CNA,          /* i  : CNA flag for secondary channel      */
    const int16_t nchan_out,             /* i  : number of output channels           */
    STEREO_CNG_DEC_HANDLE hStereoCng     /* i  :  stereo CNG handle                  */
#ifdef FIX_ISM_DTX_CNG_BWIDTH_ALT
    ,
    const int16_t read_sid_info /* i  : read SID info flag                  */
#endif
);

void bass_psfilter_init(
Loading