Commit a240a14a authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge conflict resolution

parent 7fc393b2

apps/renderer.c

+0 −6
Original line number Diff line number Diff line
@@ -1907,12 +1907,6 @@ static IVAS_REND_AudioConfig parseAudioConfig( 
    {

        return IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM;

    }

#ifdef COMMAND_LINE_OPTION_LATE_REVERB

    if ( strcmp( charBuf, "BINAURAL_REVERB" ) == 0 )

    {

        return IVAS_REND_AUDIO_CONFIG_BINAURAL_REVERB;

    }

#endif

    if ( strcmp( charBuf, "BINAURAL" ) == 0 )

    {

        return IVAS_REND_AUDIO_CONFIG_BINAURAL;

lib_rend/lib_rend.c

+0 −7
Original line number Diff line number Diff line
@@ -1235,11 +1235,7 @@ static ivas_error setRendInputActiveIsm( 
            return error;

        }

    }

#ifdef COMMAND_LINE_OPTION_LATE_REVERB

    else if ( ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) || ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_REVERB ) )

#else

    else if ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM )

#endif

    {

        if ( hRendCfg != NULL && hRendCfg->roomAcoustics.use_brir == 0 && hRendCfg->roomAcoustics.late_reverb_on )

        {
@@ -5342,9 +5338,6 @@ static ivas_error renderInputIsm( 
                    break;

#else

                case IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM:

#ifdef COMMAND_LINE_OPTION_LATE_REVERB

                case IVAS_REND_AUDIO_CONFIG_BINAURAL_REVERB:

#endif

                    error = renderIsmToBinauralRoom( ismInput, outAudio );

                    break;

#endif

scripts/config/self_test.prm

+8 −9
Original line number Diff line number Diff line
@@ -924,36 +924,35 @@ 
../IVAS_cod -mc 5_1 256000 48 testv/stv51MC48c.wav bit

../IVAS_dec testv/ls_setup_16ch_8+4+4.txt 48 bit testv/stv51MC48c.wav_MC51_256000_48-48_MC_custom_setup.tst



// Multi-channel 5_1 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_REVERB out Config renderer

// Multi-channel 5_1 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out Config renderer

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

../IVAS_dec -render_config testv/rend_config_renderer.cfg BINAURAL_REVERB 48 bit testv/stv51MC48c.wav_MC51_512000_48-48_MC_Config_renderer.tst

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



// Multi-channel 5_1 at 512 kbps, 48kHz in, 32kHz out, BINAURAL_REVERB out Config renderer

// Multi-channel 5_1 at 512 kbps, 48kHz in, 32kHz out, BINAURAL_ROOM out Config renderer

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

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



// Multi-channel 5_1 at 512 kbps, 48kHz in, 16kHz out, BINAURAL_REVERB out Config renderer

// Multi-channel 5_1 at 512 kbps, 48kHz in, 16kHz out, BINAURAL_ROOM out Config renderer

../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_REVERB out Config hospital_patientroom

// Multi-channel 5_1 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out Config hospital_patientroom

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

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



// Multi-channel 5_1 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_REVERB out Config recreation

// Multi-channel 5_1 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out Config recreation

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

../IVAS_dec -render_config testv/rend_config_recreation.cfg BINAURAL_ROOM_REVERB 48 bit testv/stv51MC48c.wav_MC51_512000_48-48_MC_Config_recreation.tst



// Multi-channel 5_1_2 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_REVERB out Config renderer

// Multi-channel 5_1_2 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out Config renderer

../IVAS_cod -mc 5_1_2 512000 48 testv/stv512MC48c.wav bit

../IVAS_dec -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 48 bit testv/stv512MC48c.wav_MC512_512000_48-48_MC_Config_renderer.tst



// Multi-channel 5_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_REVERB out Config renderer

// Multi-channel 5_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out Config renderer

../IVAS_cod -mc 5_1_4 512000 48 testv/stv514MC48c.wav bit

../IVAS_dec -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 48 bit testv/stv514MC48c.wav_MC514_512000_48-48_MC_Config_renderer.tst



// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_REVERB out Config renderer

// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM out Config renderer

../IVAS_cod -mc 7_1_4 512000 48 testv/stv714MC48c.wav bit

../IVAS_dec -render_config testv/rend_config_renderer.cfg BINAURAL_ROOM_REVERB 48 bit testv/stv714MC48c.wav_MC714_512000_48-48_MC_Config_renderer.tst

scripts/testv/config_directivity.cfg

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

directivity = [0.0, 360.0, 0.2512];

tests/renderer/test_renderer.py

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ def test_ambisonics_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file): 
        trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"),

    )





# Test compares rendering with just a trajectory file against rendering with a trajectory file + a zero ref rotation.

# These should be binary equivalent.

@pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST)