Commit 18e36be8 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

- fix a bug causing incorrectly named output files in tests 

- reorganise switches in options.h
parent d51a3d79

lib_com/options.h

+3 −3
Original line number Diff line number Diff line
@@ -150,6 +150,9 @@ 
#define FIX_ITD                                         /* Contribution 16: TD renderer ITD improvement and code cleanup */

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

#define FIX_ISM_DECODER_PRINTOUT                        /* Issue 229: fix ISM decoder printout */

#define FIX_REND_ISM_XFADE                              /* Issue 193: Crossfade inconsistencies in ISM between decoder and external renderer */

#define FIX_REND_ISM_POS_ROUNDING                       /* Issue 193: (Temporary solution until fix for #215) Align rounding of ISM position data in external renderer */

#define FIX_REND_ISM_STEREO_PANNING                     /* Issue 193: Use tangent panning for ISM to stereo in external renderer */

#define FIX_REND_ROUNDING                               /* Issue 195: Align float to int16 conversion in renderer with decoder */

#define FIX_REND_MONO_DMX                               /* Issue 195: Fix mono downmix coefficients in decoder and renderer */

#define FIX_REND_ROT_MC_BIN                             /* Issue 195: Fix wrong EFAP handle passed to renderer, resulting in no rotation for BINAURAL_ROOM output */
@@ -160,9 +163,6 @@ 


#define FIX_ITD_CNG                                     /* Eri: Fix for CNG ITD */



#define FIX_REND_ISM_XFADE                              /* Issue 193: Crossfade inconsistencies in ISM between decoder and external renderer */

#define FIX_REND_ISM_POS_ROUNDING                       /* Issue 193: (TEMPORARY! Pending fix for #215) Align rounding of ISM position data in external renderer */

#define FIX_REND_ISM_STEREO_PANNING                     /* Issue 193: Use tangent panning for ISM to stereo in external renderer */



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

tests/renderer/constants.py

+9 −1
Original line number Diff line number Diff line
@@ -435,6 +435,12 @@ pass_snr = { 
    "test_multichannel_binaural_headrotation[7_1-BINAURAL_ROOM-full_circle_in_15s]": 11,

    "test_multichannel_binaural_headrotation[7_1-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 9,

    "test_multichannel_binaural_headrotation[5_1_2-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 6,

    # Failure reason: mixed format, see above

    "Ftest_metadata[mixed_scene-5_1]": 47,

    "Ftest_metadata[mixed_scene-5_1_2]": 47,

    "test_metadata[mixed_scene-7_1]": 48,

    "test_metadata[mixed_scene-7_1_4]": 47,

    "test_metadata[mixed_scene-5_1_4]": 47,

    #####################################

    #

    # External vs Internal Renderer tests
@@ -467,7 +473,6 @@ pass_snr = { 
    "test_ism_binaural_static_vs_decoder[ISM4-BINAURAL_ROOM]": 12,

    "test_ism_binaural_static_vs_decoder[ISM3-BINAURAL]": 72,

    "test_ism_binaural_static_vs_decoder[ISM4-BINAURAL]": 71,

    # TODO harmonize panning to stereo

    # Failure reason: Decoder sets elevation for non-planar output layouts to 0

    "test_ism_vs_decoder[ISM1-5_1]": 27,

    "test_ism_vs_decoder[ISM1-7_1]": 27,
@@ -508,6 +513,7 @@ pass_snr = { 
    "test_ism_vs_decoder[ISM4-HOA2]": 30,

    "test_ism_vs_decoder[ISM4-HOA3]": 29,

    "test_ism_vs_decoder[ISM4-MONO]": 77,

    "test_ism_vs_decoder[ISM4-STEREO]": 31,

    # TODO needs investigation

    # Failure reason: headrotation and crossfade could have differences

    "test_multichannel_binaural_headrotation_vs_decoder[5_1_2-BINAURAL-full_circle_in_15s]": 4,
@@ -528,11 +534,13 @@ pass_snr = { 
    "test_multichannel_binaural_headrotation_vs_decoder[7_1_4-BINAURAL_ROOM-full_circle_in_15s]": 16,

    "test_multichannel_binaural_headrotation_vs_decoder[7_1_4-BINAURAL_ROOM-rotate_yaw_pitch_roll1]": 16,

    # Failure reason: Differences seem to be purely in late reverb part

    "test_multichannel_binaural_static_vs_decoder[5_1-BINAURAL_ROOM]": 18,

    "test_multichannel_binaural_static_vs_decoder[5_1_2-BINAURAL_ROOM]": 18,

    "test_multichannel_binaural_static_vs_decoder[5_1_4-BINAURAL]": 74,

    "test_multichannel_binaural_static_vs_decoder[5_1_4-BINAURAL_ROOM]": 18,

    "test_multichannel_binaural_static_vs_decoder[7_1-BINAURAL]": 74,

    "test_multichannel_binaural_static_vs_decoder[7_1-BINAURAL_ROOM]": 19,

    "test_multichannel_binaural_static_vs_decoder[7_1_4-BINAURAL_ROOM]": 18,

    # Failure reason: R channel in MONO output is delayed

    "test_multichannel_vs_decoder[5_1_2-MONO]": 1,

    "test_multichannel_vs_decoder[5_1_4-MONO]": 1,

tests/renderer/utils.py

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ def compare_renderer_vs_decoder(test_info, in_fmt, out_fmt, **kwargs): 
        if in_fmt in FORMAT_TO_METADATA_FILES.keys():

            tmp_fmt = "EXT"

            in_meta_files = [

                str(tmp_dir.joinpath(f"{in_fmt}_to_EXT.wav.{n}.csv"))

                str(tmp_dir.joinpath(f"{in_fmt}_to_EXT{trj_name}.wav.{n}.csv"))

                for n in range(int(in_fmt[-1]))

            ]

        else: