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

Refactoring of binaural output configuration (cont.)

parent 046659dc

apps/renderer.c

+3 −0
Original line number Diff line number Diff line
@@ -1534,6 +1534,9 @@ static IVAS_REND_AudioConfig parseAudioConfig( 
        return IVAS_REND_AUDIO_CONFIG_BINAURAL_BRIR;

    }

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

    {

        return IVAS_REND_AUDIO_CONFIG_BINAURAL_HRIR_REVERB;

    }

#else

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

    {

lib_rend/ivas_crend.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static ivas_error ivas_rend_initCrend( 
    }



#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

    if ( outConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_HRIR && outConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_HRIR && outConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_HRIR_REVERB )

    if ( outConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_HRIR && outConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_BRIR && outConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_HRIR_REVERB )

#else

    if ( outConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL && outConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM )

#endif

lib_rend/lib_rend.c

+1 −1
Original line number Diff line number Diff line
@@ -1135,7 +1135,7 @@ static ivas_error setRendInputActiveIsm( 


    error = IVAS_ERR_OK;

#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

    if ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_BRIR )

    if ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_HRIR )

#else

    if ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL )

#endif

scripts/config/self_test.prm

+24 −24
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ 
../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 16400 48 testv/stv2ISM48s.wav bit

../IVAS_dec BINAURAL_HRIR 48 bit testv/stv2ISM48s.wav_16400_48-48_binaural.tst



// 1 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, BINAURAL_HRIR ROOM out

// 1 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, BINAURAL_BRIR out

../IVAS_cod -ism 1 testv/stvISM1.csv 16400 48 testv/stv1ISM48s.wav bit

../IVAS_dec BINAURAL_BRIR 48 bit testv/stv1ISM48s.wav_16400_48-48_binaural_room.tst
@@ -310,7 +310,7 @@ 
../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 32000 48 testv/stv2ISM48s.wav bit

../IVAS_dec EXT 48 bit testv/stv2ISM48s.wav_32000_48-48_external.tst



// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, BINAURAL_HRIR ROOM out, random FEC at 5%

// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, BINAURAL_BRIR out, random FEC at 5%

../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48s.wav bit

../IVAS_dec -fec 5 BINAURAL_BRIR 48 bit testv/stv4ISM48s.wav_32000_48-48_binaural_room_FEC5.tst
@@ -318,7 +318,7 @@ 
../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 48000 48 testv/stv3ISM48s.wav bit

../IVAS_dec MONO 48 bit testv/stv43ISM48s_48000_48-48_MONO.tst



// 4 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL_HRIR ROOM out, random FEC at 5%

// 4 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL_BRIR out, random FEC at 5%

../IVAS_cod -dtx -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 48000 48 testv/stv4ISM48n.wav bit

../IVAS_dec -fec 5 BINAURAL_BRIR 48 bit testv/stv4ISM48n.wav_48000_48-48_DTX_TD_binaural_room_FEC5.tst
@@ -326,11 +326,11 @@ 
../IVAS_cod -ism 2 testv/stvISM3.csv testv/stvISM4.csv 48000 48 testv/stv2ISM48s.wav bit

../IVAS_dec -fec 5 BINAURAL_HRIR 48 bit testv/stv2ISM48s.wav_48000_48-48_binaural_FEC5.tst



// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL_HRIR ROOM out, head rotation, random FEC at 5%

// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL_BRIR out, head rotation, random FEC at 5%

../IVAS_cod -ism 1 testv/stvISM1.csv 48000 48 testv/stv1ISM48s.wav bit

../IVAS_dec  -fec 5 -t testv/headrot_case00_3000_q.csv BINAURAL_BRIR 48 bit testv/stv1ISM48s.wav_64000_48-48_binaural_room_HR.tst



// 2 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, BINAURAL_HRIR ROOM out

// 2 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, BINAURAL_BRIR out

../IVAS_cod -ism 2 testv/stvISM3.csv testv/stvISM4.csv 64000 48 testv/stv2ISM48s.wav bit

../IVAS_dec BINAURAL_BRIR 48 bit testv/stv2ISM48s.wav_64000_48-48_binaural_room.tst
@@ -338,7 +338,7 @@ 
../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 64000 48 testv/stv2ISM48s.wav bit

../IVAS_dec 5_1 32 bit testv/stv2ISM48s.wav_64000_48-32_5_1.tst



// 4 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, BINAURAL_HRIR ROOM out

// 4 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, BINAURAL_BRIR out

../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 64000 48 testv/stv4ISM48s.wav bit

../IVAS_dec BINAURAL_BRIR 48 bit testv/stv4ISM48s.wav_64000_48-48_binaural_room.tst
@@ -496,27 +496,27 @@ 
../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit

../IVAS_dec STEREO 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_stereo.tst



// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL_HRIR ROOM out

// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL_BRIR out

../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit

../IVAS_dec BINAURAL_BRIR 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_BinauralRoom.tst



// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL_HRIR ROOM out

// SBA at 48 kbps, 32kHz in, 32kHz out,  BINAURAL_BRIR out

../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit

../IVAS_dec BINAURAL_BRIR 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_BinauralRoom_Subframe.tst



// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL_HRIR ROOM out, Headrotation

// SBA at 48 kbps, 32kHz in, 32kHz out,  BINAURAL_BRIR out, Headrotation

../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit

../IVAS_dec -t testv/headrot.csv BINAURAL_BRIR 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_BinauralRoom_Headrot.tst



// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL_HRIR ROOM out, Headrotation, Orientation tracking

// SBA at 48 kbps, 32kHz in, 32kHz out,  BINAURAL_BRIR out, Headrotation, Orientation tracking

../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit

../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_BRIR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_OtrAvg.tst



// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL_HRIR ROOM out, Headrotation, reference vector tracking

// SBA at 48 kbps, 32kHz in, 32kHz out,  BINAURAL_BRIR out, Headrotation, reference vector tracking

../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit

../IVAS_dec -t ../scripts/trajectories/full-circle-4s.csv -rvf ../scripts/trajectories/full-circle-4s-Vector3.csv -otr ref_vec BINAURAL_BRIR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_OtrRefPos.tst



// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL_HRIR ROOM out, Headrotation, reference vector tracking in level mode

// SBA at 48 kbps, 32kHz in, 32kHz out,  BINAURAL_BRIR out, Headrotation, reference vector tracking in level mode

../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit

../IVAS_dec -t ../scripts/trajectories/full-circle-with-up-and-down-4s.csv -rvf ../scripts/trajectories/full-circle-with-up-and-down-4s-Vector3.csv -otr ref_vec_lev BINAURAL_BRIR 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_OtrRefPosLev.tst
@@ -572,11 +572,11 @@ 
../IVAS_cod -sba 1 96000 48 testv/stvFOA48c.wav bit

../IVAS_dec FOA 48 bit testv/stvFOA48c.wav_SBA_96000_48-48_FOA.tst



// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL_HRIR ROOM out, Headrotation

// SBA at 128 kbps, 32kHz in, 32kHz out,  BINAURAL_BRIR out, Headrotation

../IVAS_cod -sba 3 128000 32 testv/stv3OA32c.wav bit

../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_BRIR 32 bit testv/stv3OA32c.wav_SBA_128000_32-32_Binaural_room_Headrot.tst



// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL_HRIR ROOM out, Headrotation, Orientation tracking

// SBA at 128 kbps, 32kHz in, 32kHz out,  BINAURAL_BRIR out, Headrotation, Orientation tracking

../IVAS_cod -sba 3 128000 32 testv/stv3OA32c.wav bit

../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_BRIR 32 bit testv/stv3OA32c.pcm_SBA_128000_32-32_Binaural_room_Headrot_OtrAvg.tst
@@ -658,15 +658,15 @@ 
../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 16400 48 testv/stv1MASA1TC48c.wav bit

../IVAS_dec -fec 5 HOA3 48 bit testv/stv1MASA1TC48c.wav_16400_48-48_HOA3_FEC5.tst



// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL_HRIR ROOM out

// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out,  BINAURAL_BRIR out

../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 24400 48 testv/stv1MASA1TC48c.wav bit

../IVAS_dec BINAURAL_BRIR 48 bit testv/stv1MASA1TC48c.wav_24400_48-48_BinauralRoom.tst



// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL_HRIR ROOM out

// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out,  BINAURAL_BRIR out

../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 24400 48 testv/stv1MASA1TC48c.wav bit

../IVAS_dec BINAURAL_BRIR 48 bit testv/stv1MASA1TC48c.wav_24400_48-48_BinauralRoom_Subframe.tst



// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out, BINAURAL_HRIR ROOM out, Headrotation

// MASA 1dir 1TC at 24.4 kbps, 48kHz in, 48kHz out,  BINAURAL_BRIR out, Headrotation

../IVAS_cod -masa 1 testv/stv1MASA1TC48c.met 24400 48 testv/stv1MASA1TC48c.wav bit

../IVAS_dec -t testv/headrot.csv BINAURAL_BRIR 48 bit testv/stv1MASA1TC48c.wav_24400_48-48_BinauralRoom_Headrot.tst
@@ -706,15 +706,15 @@ 
../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 24400 48 testv/stv1MASA2TC48c.wav bit

../IVAS_dec STEREO 48 bit testv/stv1MASA2TC48c.wav_24400_48-48_STEREO.tst



// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL_HRIR ROOM out

// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out,  BINAURAL_BRIR out

../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 32000 48 testv/stv1MASA2TC48c.wav bit

../IVAS_dec BINAURAL_BRIR 48 bit testv/stv1MASA2TC48c.wav_32000_48-48_BinauralRoom.tst



// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL_HRIR ROOM out, Headrotation

// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out,  BINAURAL_BRIR out, Headrotation

../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 32000 48 testv/stv1MASA2TC48c.wav bit

../IVAS_dec -t testv/headrot.csv BINAURAL_BRIR 48 bit testv/stv1MASA2TC48c.wav_32000_48-48_BinauralRoom_Headrot.tst



// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL_HRIR ROOM out, Headrotation, Orientation tracking

// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out,  BINAURAL_BRIR out, Headrotation, Orientation tracking

../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 32000 48 testv/stv1MASA2TC48c.wav bit

../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_BRIR 48 bit testv/stv_IVASMASA_1dir2TC.pcm_32000_48-48_BinauralRoom_Headrot_OtrAvg.tst
@@ -824,7 +824,7 @@ 
../IVAS_cod -mc 5_1 64000 48 testv/stv51MC48c.wav bit

../IVAS_dec -t testv/headrot.csv BINAURAL_HRIR 48 bit testv/stv51MC48c.wav_MC51_64000_48-48_Binaural_Headrot.tst



// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out, BINAURAL_HRIR ROOM out, Headrotation

// Multi-channel 5_1 at 64 kbps, 48kHz in, 48kHz out,  BINAURAL_BRIR out, Headrotation

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

../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_BRIR 48 bit testv/stv51MC48c.wav_MC51_64000_48-48_Binaural_room_Headrot.tst
@@ -844,7 +844,7 @@ 
../IVAS_cod -mc 5_1 256000 48 testv/stv51MC48c.wav bit

../IVAS_dec -fec 5 STEREO 48 bit testv/stv51MC48c.wav_MC51_256000_48-48_stereo_FEC5.tst



// Multi-channel 5_1 at 192 kbps, 48kHz in, 48kHz out, BINAURAL_HRIR ROOM out

// Multi-channel 5_1 at 192 kbps, 48kHz in, 48kHz out,  BINAURAL_BRIR out

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

../IVAS_dec BINAURAL_BRIR 48 bit testv/stv51MC48c.wav_MC51_192000_48-48_BinauralRoom.tst
@@ -852,11 +852,11 @@ 
../IVAS_cod -mc 5_1 256000 48 testv/stv51MC48c.wav bit

../IVAS_dec MONO 48 bit testv/stv51MC48c.wav_MC51_256000_48-48_mono.tst



// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL_HRIR ROOM out, head rotation

// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out,  BINAURAL_BRIR out, head rotation

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

../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_BRIR 48 bit testv/stv51MC48c.wav_MC51_256000_48-48_BinauralRoom_Headrot.tst



// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL_HRIR ROOM out, head rotation, Orientation tracking

// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out,  BINAURAL_BRIR out, head rotation, Orientation tracking

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

../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_BRIR 48 bit testv/stv51MC48c.pcm_MC51_256000_48-48_BinauralRoom_Headrot_OtrAvg.tst

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