Commit ee0cb489 authored by Jan Brouwer's avatar Jan Brouwer
Browse files

reverb configuration no longer required in render configuration file; 

test_ambisonics_binaural_headrotation_defaultrenderconfig() removed (defaults can not be achieved bit-exact via reverb configuration; does not change code coverage)
parent 99226f8b

apps/decoder.c

+8 −5
Original line number Diff line number Diff line
@@ -512,16 +512,19 @@ int main( 
        }



#ifdef CONTROL_METADATA_REVERB

        if ( RenderConfigReader_getAcousticEnvironment( renderConfigReader, ACOUSTIC_ENVIRONMENT_ID, &renderConfig.room_acoustics ) != IVAS_ERR_OK )

        if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, ACOUSTIC_ENVIRONMENT_ID, &renderConfig.room_acoustics ) ) == IVAS_ERR_OK )

        {

            fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", ACOUSTIC_ENVIRONMENT_ID );

            goto cleanup;

        }

            if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "Invalid reverberation configuration parameters\n\n" );

                goto cleanup;

            }

        }

        else if ( error != IVAS_ERR_ACOUSTIC_ENVIRONMENT_MISSING )

        {

            fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", ACOUSTIC_ENVIRONMENT_ID );

            goto cleanup;

        }



#ifdef COMMAND_LINE_OPTION_LATE_REVERB

        if ( arg.outputFormat == IVAS_DEC_OUTPUT_BINAURAL_REVERB )

apps/renderer.c

+8 −5
Original line number Diff line number Diff line
@@ -738,16 +738,19 @@ int main( 
        }



#ifdef CONTROL_METADATA_REVERB

        if ( RenderConfigReader_getAcousticEnvironment( renderConfigReader, ACOUSTIC_ENVIRONMENT_ID, &renderConfig.room_acoustics ) != IVAS_ERR_OK )

        if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, ACOUSTIC_ENVIRONMENT_ID, &renderConfig.room_acoustics ) ) == IVAS_ERR_OK )

        {

            fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", ACOUSTIC_ENVIRONMENT_ID );

            exit( -1 );

        }

            if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "Invalid reverberation configuration parameters\n\n" );

                exit( -1 );

            }

        }

        else if ( error != IVAS_ERR_ACOUSTIC_ENVIRONMENT_MISSING )

        {

            fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", ACOUSTIC_ENVIRONMENT_ID );

            exit( -1 );

        }

#ifdef COMMAND_LINE_OPTION_LATE_REVERB

        if ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_REVERB )

        {

scripts/testv/config_directivity.cfg

+0 −1
Original line number Diff line number Diff line 
[general]

directivity = [0.0, 360.0, 0.2512];
 
reverbFile = rend_config_renderer.dat;

scripts/testv/just_reverb.cfg

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
[roomAcoustics]

reverb = true;                          # Reverb switch, in case BRIR is undefined or false, reverb flag is inherited from the room flag

tests/renderer/constants.py

+0 −4
Original line number Diff line number Diff line
@@ -193,10 +193,6 @@ HR_TRAJECTORIES_TO_TEST = [ 
    "rotate_yaw_pitch_roll1",

]



CONFIG_FILES_TO_TEST = [

    "just_reverb"

]



""" Per-testcase xfail SNR thresholds (dB) """

pass_snr = dict()  # not relevant for tests anymore, should be deprecated soon

_pass_snr = {