Skip to content

Commit 0d19d9b

Browse files
committed
Bug fixes
Fixed issue causing sample rate changes to not be applied in certain scenarios Fixed issue causing headphone selection to reset to first available headphone on start up in cases where active database was changed before closing the app Fixed issue causing changes in parameters to not be applied in cases where settings.ini file was manually swapped with another file. Apply selection & parameters buttons will now always start processing again from scratch when clicked. The button previously did nothing if it detected no change in parameters. Minor GUI clean up and logging improvements
1 parent f93963d commit 0d19d9b

11 files changed

Lines changed: 974 additions & 870 deletions

ash_toolset/__main__.py

Lines changed: 102 additions & 52 deletions
Large diffs are not rendered by default.

ash_toolset/air_processing.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1372,7 +1372,6 @@ def convert_airs_to_brirs(
13721372
# Compensation filter (smoothed)
13731373
comp_mag = hf.db2mag(hf.mag2db(brir_fft_target_mag) - hf.mag2db(brir_fft_avg_mag_sm))
13741374
#comp_mag = hf.smooth_fft_octaves(comp_mag, win_size_base = 7)
1375-
#comp_eq_fir = hf.mag_to_min_fir(comp_mag, crop=1)
13761375
comp_eq_fir = hf.build_min_phase_filter(comp_mag)
13771376

13781377
# Equalize both channels (loop still needed for convolution)
@@ -1977,7 +1976,6 @@ def raw_brirs_to_brir_set(ir_set='fw', df_comp=True, mag_comp=CN.MAG_COMP, lf_al
19771976
#invert response
19781977
brir_fft_avg_mag_inv = hf.db2mag(hf.mag2db(brir_fft_avg_mag_sm)*-1)
19791978
#create min phase FIR
1980-
#brir_df_inv_fir = hf.mag_to_min_fir(brir_fft_avg_mag_inv, crop=1)
19811979
brir_df_inv_fir = hf.build_min_phase_filter(brir_fft_avg_mag_inv)
19821980
df_eq = brir_df_inv_fir
19831981

@@ -2050,7 +2048,6 @@ def raw_brirs_to_brir_set(ir_set='fw', df_comp=True, mag_comp=CN.MAG_COMP, lf_al
20502048
comp_mag = hf.db2mag(np.subtract(hf.mag2db(brir_fft_target_mag),hf.mag2db(brir_fft_avg_mag_sm)))
20512049
comp_mag = hf.smooth_fft_octaves(data=comp_mag, win_size_base = 30)
20522050
#create min phase FIR
2053-
#comp_eq_fir = hf.mag_to_min_fir(comp_mag, crop=1)
20542051
comp_eq_fir = hf.build_min_phase_filter(comp_mag)
20552052

20562053
#equalise each brir with comp filter
@@ -2227,7 +2224,6 @@ def calc_avg_room_target_mag(gui_logger=None):
22272224
air_fft_avg_mag_sm = hf.smooth_fft_octaves(data=air_fft_avg_mag, n_fft=n_fft)
22282225

22292226
#create min phase FIR
2230-
#avg_room_min_fir = hf.mag_to_min_fir(air_fft_avg_mag_sm, crop=1)
22312227
#avg_room_min_fir = hf.build_min_phase_filter(air_fft_avg_mag_sm)
22322228

22332229
if CN.PLOT_ENABLE == True:
@@ -2711,7 +2707,6 @@ def calc_subrir(gui_logger=None):
27112707
#invert response
27122708
brir_fft_avg_mag_inv = hf.db2mag(hf.mag2db(brir_fft_avg_mag_sm)*-1)
27132709
#create min phase FIR
2714-
#brir_df_inv_fir = hf.mag_to_min_fir(brir_fft_avg_mag_inv, crop=1)
27152710
brir_df_inv_fir = hf.build_min_phase_filter(brir_fft_avg_mag_inv)
27162711
df_eq = brir_df_inv_fir
27172712
#convolve with inverse filter
@@ -3225,7 +3220,6 @@ def calc_subrir(gui_logger=None):
32253220
#invert response
32263221
brir_fft_avg_mag_inv = hf.db2mag(hf.mag2db(brir_fft_avg_mag_sm)*-1)
32273222
#create min phase FIR
3228-
#brir_df_inv_fir = hf.mag_to_min_fir(brir_fft_avg_mag_inv, crop=1)
32293223
brir_df_inv_fir = hf.build_min_phase_filter(brir_fft_avg_mag_inv)
32303224
df_eq = brir_df_inv_fir
32313225
#convolve with inverse filter
@@ -3445,7 +3439,6 @@ def calc_room_target_dataset(gui_logger=None):
34453439
room_target_mag_new = hf.level_spectrum_ends(room_target_mag, 20, 20000, smooth_win = 3)#150
34463440
room_target_mag_new_sm = hf.smooth_fft_octaves(data=room_target_mag_new, n_fft=n_fft,fund_freq=150,win_size_base = 3)
34473441
#create min phase FIR
3448-
#room_target_min_fir = hf.mag_to_min_fir(room_target_mag_new_sm, crop=1)
34493442
room_target_min_fir = hf.build_min_phase_filter(room_target_mag_new_sm)
34503443

34513444

@@ -3465,7 +3458,6 @@ def calc_room_target_dataset(gui_logger=None):
34653458
room_target_mag_new_sm = hf.smooth_fft(data=room_target_mag_new, n_fft=n_fft, crossover_f=2000, win_size_a = 3, win_size_b = 500)
34663459

34673460
#create min phase FIR
3468-
#room_target_min_fir = hf.mag_to_min_fir(room_target_mag_new_sm, crop=1)
34693461
room_target_min_fir = hf.build_min_phase_filter(room_target_mag_new_sm)
34703462

34713463
#store into numpy array
@@ -3490,7 +3482,6 @@ def calc_room_target_dataset(gui_logger=None):
34903482
room_target_mag_new_sm = hf.smooth_fft(data=room_target_mag_new, n_fft=n_fft, crossover_f=2000, win_size_a = 3, win_size_b = 500)
34913483

34923484
#create min phase FIR
3493-
#room_target_min_fir = hf.mag_to_min_fir(room_target_mag_new_sm, crop=1)
34943485
room_target_min_fir = hf.build_min_phase_filter(room_target_mag_new_sm)
34953486

34963487
#store into numpy array

ash_toolset/brir_export.py

Lines changed: 174 additions & 163 deletions
Large diffs are not rendered by default.

ash_toolset/brir_generation.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ def generate_integrated_brir(brir_name, spatial_res=1, report_progress=0, gui_l
179179
direction_matrix_post = brir_export.generate_direction_matrix(spatial_res=spatial_res, variant=1)
180180

181181

182-
log_string = 'Loading input filters'
182+
log_string = 'Loading filters'
183183
hf.log_with_timestamp(log_string, gui_logger)
184184
if report_progress > 0:
185185
progress = 1/100
@@ -412,7 +412,7 @@ def generate_integrated_brir(brir_name, spatial_res=1, report_progress=0, gui_l
412412

413413

414414

415-
log_string = 'Adjusting levels'
415+
log_string = 'Adjusting HRTF levels'
416416
hf.log_with_timestamp(log_string, gui_logger)
417417
if report_progress > 0:
418418
progress = 20/100
@@ -782,7 +782,6 @@ def generate_integrated_brir(brir_name, spatial_res=1, report_progress=0, gui_l
782782
#invert response
783783
brir_fft_avg_mag_inv = hf.db2mag(hf.mag2db(brir_fft_avg_mag_sm)*-1)
784784
#create min phase FIR
785-
#brir_df_inv_fir = hf.mag_to_min_fir(brir_fft_avg_mag_inv, crop=1, out_win_size=2048, n_fft=CN.N_FFT)
786785
brir_df_inv_fir = hf.build_min_phase_filter(smoothed_mag=brir_fft_avg_mag_inv, truncate_len=2048, n_fft=CN.N_FFT)#new method
787786

788787
if report_progress > 0:

0 commit comments

Comments
 (0)