Commit 204607c3 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into 1052-sba-decoder-confused-with-ext-output

parents dfaf9e2c 99397abc

ci/run_scheduled_sanitizer_test.py

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ N_FRAMES_DLY_PROFILE = 7500 
GENPATT_CMD = f"gen-patt -tailstat -fer -g192 -gamma 0 -rate 0.15 -tol 0.001 -reset -n {N_FRAMES_DLY_PROFILE} {EP_FILE}"

MC_MODES = ["5_1", "5_1_2", "5_1_4", "7_1", "7_1_4"]

AMBISONICS_MODES = ["HOA3", "HOA2", "FOA", "PlanarHOA3", "PlanarHOA2", "PlanarFOA"]

# timeout of 15 minutes per en/decoding to safeguard against endless loops

TIMEOUT = 60 * 20

# timeout of 25 minutes per en/decoding to safeguard against endless loops

TIMEOUT = 60 * 25

HEAD_TRAJ_FILE = str(pathlib.Path("./head_rot_traj.csv").resolve())

EXOF_TRAJ_FILE = str(pathlib.Path("./exof_traj.csv").resolve())

scripts/parse_commands.py

+5 −4
Original line number Diff line number Diff line
@@ -149,10 +149,11 @@ if __name__ == '__main__': 
                    diff_cmds.append('$DIFF_BIN '+output.replace(CUT_PATH + r'/dut',REF_PATH + r'/ref')+' '+output+' >> $LOG_FILE 2>&1')

                outfile.write(('; ').join(diff_cmds))

            if isar_out and "cut" in isar_out.group(1):

                outfile.write('$DIFF_BIN '+isar_out.group(1).replace(CUT_PATH + r'/split_rendering/cut',REF_PATH + r'/split_rendering/ref')+' '+isar_out.group(1)+' >> $LOG_FILE 2>&1\n')   

                outfile.write('$DIFF_BIN '+isar_out.group(1).replace(CUT_PATH + r'/split_rendering/cut',REF_PATH + r'/split_rendering/ref')+' '+isar_out.group(1)+' >> $LOG_FILE 2>&1')

                if isar_md_out and "cut" in isar_md_out.group(1):

                outfile.write('$DIFF_BIN '+isar_md_out.group(1).replace(CUT_PATH + r'/split_rendering/cut',REF_PATH + r'/split_rendering/ref')+' '+isar_md_out.group(1)+' >> $LOG_FILE 2>&1\n')              

                

                    outfile.write('; $DIFF_BIN '+isar_md_out.group(1).replace(CUT_PATH + r'/split_rendering/cut',REF_PATH + r'/split_rendering/ref')+' '+isar_md_out.group(1)+' >> $LOG_FILE 2>&1\n')

                else:

                    outfile.write('\n')

            outfile.write('\n\n')

        with open('scripts/script_footer.txt','r') as footer:

            outfile_dec.write(footer.read())

scripts/pyaudio3dtools/audioarray.py

+2 −2
Original line number Diff line number Diff line
@@ -334,8 +334,8 @@ def compare( 
                for i in range(nchannels):

                    tmpfile_ref = Path(tmpdir).joinpath(f"ref_ch{i+1}.wav")

                    tmpfile_test = Path(tmpdir).joinpath(f"test_ch{i+1}.wav")

                    r48 = resample(ref[:, i].astype(float), fs, 48000).astype(np.dtype('int16')) # Convert to float for resample, then to int16 for wavfile.write

                    t48 = resample(test[:, i].astype(float), fs, 48000).astype(np.dtype('int16'))

                    r48 = np.clip( resample(ref[:, i].astype(float), fs, 48000), -32768, 32767 ).astype(np.int16) # Convert to float for resample, then to int16 for wavfile.write

                    t48 = np.clip( resample(test[:, i].astype(float), fs, 48000), -32768, 32767 ).astype(np.int16)

                    wavfile.write(str(tmpfile_ref), 48000, r48)

                    wavfile.write(str(tmpfile_test), 48000, t48)

                    out = subprocess.check_output([mld, tmpfile_ref, tmpfile_test])