Commit 328c347e authored by advasila's avatar advasila
Browse files

change initialization loop to max number of objects and fix comment in self_test

parent 68f1c714
Loading
Loading
Loading
Loading
Loading
+10 −3
Original line number Diff line number Diff line
@@ -79,14 +79,21 @@ ivas_error ivas_omasa_data_open(
    hMasaIsmData->objectsMoved = 0;
    hMasaIsmData->delayBuffer = NULL;

#ifdef FIX_657_REMOVE_EDITING
    for ( ch = 0; ch < MAX_NUM_OBJECTS; ch++ )
    {
        hMasaIsmData->ism_is_edited[ch] = 0;
        hMasaIsmData->q_elevation_old[ch] = 0.0f;
        hMasaIsmData->q_azimuth_old[ch] = 0.0f;
    }
#else
    for ( ch = 0; ch < st_ivas->nchan_ism; ch++ )
    {
        hMasaIsmData->q_elevation_old[ch] = 0.0f;
        hMasaIsmData->q_azimuth_old[ch] = 0.0f;
#ifdef FIX_657_REMOVE_EDITING
        hMasaIsmData->ism_is_edited[ch] = 0;
#endif
    }
#endif


    for ( obj_idx = 0; obj_idx < MAX_NUM_OBJECTS; obj_idx++ )
    {
+1 −1
Original line number Diff line number Diff line
@@ -1274,7 +1274,7 @@ networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit
../IVAS_dec BINAURAL_ROOM_IR 32 bit testv/stvOMASA_2ISM_1MASA2TC48c.wav_BINAURAL_ROOM_IR_256000_48-32.tst


// OMASA 2Dir1TC 3ISM at 24.4 kbps, 48kHz in, 16kHz out, FOA out, FEC at 1%
// OMASA 2Dir1TC 3ISM at 24.4 kbps, 48kHz in, 16kHz out, FOA out, FEC at 10%
../IVAS_cod -ism_masa 3 1 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stv2MASA1TC48c.met 24400 48 testv/stvOMASA_3ISM_2MASA1TC48c.wav bit
../IVAS_dec -fec 10 FOA 16 bit testv/stvOMASA_3ISM_2MASA1TC48c.wav_FOA_24400_48-16.tst