Commit 5d3f606e authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into ci/ssnr

parents b0817ab4 b42586ad

ci/complexity_measurements/check_for_changes.py

0 → 100644
+45 −0
Original line number Diff line number Diff line 
import argparse

import csv

import sys

import numpy as np





THRESH = 0.01

COLS = [

    [3, 5, 7, 9], # wmops_all

    [3,5,7,8,10,12,13,15,17], # ram_all

    [3,5,7,9,11,13,15,17,19], # rom_all

]





def main(args):

    linewise_logfiles = [args.wmops_logfile, args.ram_logfile, args.rom_logfile]

    changes_found_linewise = any([check_linewise_logfile(f, c) for f, c in zip(linewise_logfiles, COLS)])



    if changes_found_linewise:

        print("Global max of WMOPS, RAM or ROM changed")



    return int(changes_found_linewise)





def check_linewise_logfile(filepath, cols):

    with open(filepath) as f:

        contents = [line for line in csv.reader(f, delimiter=" ")]



    curr = contents[-1]

    prev = contents[-2]



    change_ratios = [abs(float(curr[i]) / float(prev[i]) - 1) > THRESH for i in cols]

    changes_found = any(change_ratios)



    return changes_found





if __name__ == "__main__":

    parser = argparse.ArgumentParser()

    parser.add_argument("wmops_logfile")

    parser.add_argument("ram_logfile")

    parser.add_argument("rom_logfile")

    args = parser.parse_args()



    sys.exit(main(args))

ci/complexity_measurements/getWmops.sh

+6 −1
Original line number Diff line number Diff line
@@ -86,4 +86,9 @@ ${scriptDir}/parseNewsletterRom.py ${wmopsFilenameFlc}_PROM.csv ${wmopsFilenameF 
# generate java script from database

tcsh ${scriptDir}/genWebpageData_Rom.csh ${destDir}/wmops/log_rom_all.txt ${destDir}/wmops/graphs_rom_flc.js Graphs_ROM



python3 ${scriptDir}/check_for_changes.py ${destDir}/wmops/log_wmops_all.txt ${destDir}/wmops/log_ram_all.txt ${destDir}/wmops/log_rom_all.txt

if [ "$?" != "0" ]; then

    ret_val=1

fi



exit $ret_val

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