Commit eab6aafc authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec

parents 3cc818e1 f8a48b18

ci/basop-pages/create_report_pages.py

+19 −6
Original line number Diff line number Diff line
@@ -92,11 +92,12 @@ ARROW_DOWN = '<span class="arrowdown">&#11010;</span>' 


# expected columns. actual columns are filtered from the incoming data later, this

# is mainly for controlling the order in the output table

COLUMNS = ["testcase", "Result", "MLD", "MAXIMUM ABS DIFF"]

COLUMNS = ["testcase", "Result", "MLD", "MAXIMUM ABS DIFF", "MIN_SSNR"]

COLUMNS_GLOBAL = COLUMNS[:1]

COLUMNS_DIFFERENTIAL = COLUMNS[1:]

COLUMNS_DIFFERENTIAL_NOT_MLD = COLUMNS_DIFFERENTIAL[2:]





def create_subpage(

    html_out,

    csv_out,
@@ -111,11 +112,18 @@ def create_subpage( 
    )

    write_out_csv(merged_reports, merged_reports[0].keys(), csv_out)



    table_header_a = "".join([TH_TMPL_GLOBAL.format(c) for c in COLUMNS_GLOBAL] + [TH_TMPL_DIFFERENTIAL.format(c) for c in COLUMNS_DIFFERENTIAL])

    table_header_a = "".join(

        [TH_TMPL_GLOBAL.format(c) for c in COLUMNS_GLOBAL]

        + [TH_TMPL_DIFFERENTIAL.format(c) for c in COLUMNS_DIFFERENTIAL]

    )

    table_header_b = list()

    for c in COLUMNS_DIFFERENTIAL:

        table_header_b.append(TH_TMPL_SECOND_ROW.format(f"Previous Run<br>ID: {id_previous}"))

        table_header_b.append(TH_TMPL_SECOND_ROW.format(f"Current Run<br>ID: {id_current}"))

        table_header_b.append(

            TH_TMPL_SECOND_ROW.format(f"Previous Run<br>ID: {id_previous}")

        )

        table_header_b.append(

            TH_TMPL_SECOND_ROW.format(f"Current Run<br>ID: {id_current}")

        )

    table_header_b = "".join(table_header_b)

    table_body = "\n".join(

        tr_from_row(row, id_current, id_previous) for row in merged_reports
@@ -241,8 +249,13 @@ def merge_and_cleanup_mld_reports( 


        return diff



    other_col_pairs = [(f"{col}-{id_previous}", f"{col}-{id_current}") for col in COLUMNS_DIFFERENTIAL_NOT_MLD]

    merged = sorted(merged, key=partial(sort_func, other_col_pairs=other_col_pairs), reverse=True)

    other_col_pairs = [

        (f"{col}-{id_previous}", f"{col}-{id_current}")

        for col in COLUMNS_DIFFERENTIAL_NOT_MLD

    ]

    merged = sorted(

        merged, key=partial(sort_func, other_col_pairs=other_col_pairs), reverse=True

    )



    # remove the unecessary whole path from the testcase names

    for row in merged:

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ 
#define FIX_1099_JBM_MD_HANDLE_ALLOC                    /* VA: issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA only */

#define FIX_1111_TDM_LSP_BUFFER                         /* VA: issue 1111: remove unused buffer `tdm_lspQ_PCh[]' */

#define FIX_1101_CLEANING_JBM_CALL                      /* VA: issue 1101: remove obsolete call of ivas_jbm_dec_tc_buffer_open() */

#define FIX_1053_AEID_FILE_TEST                         /* Philips: Tests for the -aeid file and fix for memory error */



/* #################### End BE switches ################################## */

lib_dec/lib_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -2084,6 +2084,9 @@ static ivas_error copyRendererConfigStruct( 
    mvr2r( hRCin->roomAcoustics.pAcoustic_rt60, hRCout->roomAcoustics.pAcoustic_rt60, CLDFB_NO_CHANNELS_MAX );

    mvr2r( hRCin->roomAcoustics.pAcoustic_dsr, hRCout->roomAcoustics.pAcoustic_dsr, CLDFB_NO_CHANNELS_MAX );

    mvr2r( hRCin->directivity, hRCout->directivity, 3 * MAX_NUM_OBJECTS );

#ifdef FIX_1053_AEID_FILE_TEST

    mvr2r( hRCin->distAtt, hRCout->distAtt, 3 );

#endif



    hRCout->split_rend_config = hRCin->split_rend_config;

scripts/config/self_test.prm

+12 −0
Original line number Diff line number Diff line
@@ -1320,6 +1320,18 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_cod -mc 5_1 512000 48 testv/stv51MC48c.wav bit

../IVAS_dec -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 16 bit testv/stv51MC48c.wav_MC51_512000_48-16_MC_Config_renderer.tst



// Multi-channel 5_1 at 512 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB out custom acoustic environment with a sequence (CREND)

../IVAS_cod -mc 5_1 512000 48 testv/stv51MC48c.wav bit

../IVAS_dec -render_config testv/rend_config_combined.cfg -aeid testv/aeid1.txt BINAURAL_ROOM_REVERB 48 bit testv/stv51MC48c.wav_MC51_512000_48-48_MC_reverb_sequence.tst



// Multi-channel 5_1 at 64 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB out custom acoustic environment with a sequence (FastConv)

../IVAS_cod -mc 5_1 64000 48 testv/stv51MC48c.wav bit

../IVAS_dec -render_config testv/rend_config_combined.cfg -aeid testv/aeid2.txt BINAURAL_ROOM_REVERB 48 bit testv/stv51MC48c.wav_MC51_64000_48-48_MC_reverb_sequence.tst



// Multi-channel 5_1 at 32 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB out custom acoustic environment with a sequence (ParamBin)

../IVAS_cod -mc 5_1 32000 48 testv/stv51MC48c.wav bit

../IVAS_dec -render_config testv/rend_config_combined.cfg -aeid testv/aeid3.txt BINAURAL_ROOM_REVERB 48 bit testv/stv51MC48c.wav_MC51_32000_48-48_MC_reverb_sequence.tst



// Multi-channel 5_1 at 32 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out Config hospital_patientroom

../IVAS_cod -mc 5_1 32000 48 testv/stv51MC48c.wav bit

../IVAS_dec -render_config testv/rend_config_hospital_patientroom.cfg BINAURAL_ROOM_REVERB 48 bit testv/stv51MC48c.wav_MC51_32000_48-48_MC_Config_hospital_patientroom.tst

scripts/config/self_test_ltv.prm

+12 −0
Original line number Diff line number Diff line
@@ -1320,6 +1320,18 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_cod -mc 5_1 512000 48 testv/ltv48_MC51.wav bit

../IVAS_dec -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 16 bit testv/ltv48_MC51.wav_MC51_512000_48-16_MC_Config_renderer.tst



// Multi-channel 5_1 at 512 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB out custom acoustic environment with a sequence (CREND)

../IVAS_cod -mc 5_1 512000 48 testv/ltv51MC48c.wav bit

../IVAS_dec -render_config testv/rend_config_combined.cfg -aeid testv/aeid1.txt BINAURAL_ROOM_REVERB 48 bit testv/ltv51MC48c.wav_MC51_512000_48-48_MC_reverb_sequence.tst



// Multi-channel 5_1 at 64 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB out custom acoustic environment with a sequence (FastConv)

../IVAS_cod -mc 5_1 64000 48 testv/ltv51MC48c.wav bit

../IVAS_dec -render_config testv/rend_config_combined.cfg -aeid testv/aeid2.txt BINAURAL_ROOM_REVERB 48 bit testv/ltv51MC48c.wav_MC51_64000_48-48_MC_reverb_sequence.tst



// Multi-channel 5_1 at 32 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB out custom acoustic environment with a sequence (ParamBin)

../IVAS_cod -mc 5_1 32000 48 testv/ltv51MC48c.wav bit

../IVAS_dec -render_config testv/rend_config_combined.cfg -aeid testv/aeid3.txt BINAURAL_ROOM_REVERB 48 bit testv/ltv51MC48c.wav_MC51_32000_48-48_MC_reverb_sequence.tst



// Multi-channel 5_1 at 32 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out Config hospital_patientroom

../IVAS_cod -mc 5_1 32000 48 testv/ltv48_MC51.wav bit

../IVAS_dec -render_config testv/rend_config_hospital_patientroom.cfg BINAURAL_ROOM_REVERB 48 bit testv/ltv48_MC51.wav_MC51_80000_48-48_MC_Config_hospital_patientroom.tst