Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update librosa calls to fix argument errors. #14

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update librosa calls to fix argument errors. #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion timbral_models/Timbral_Hardness.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def timbral_hardness(fname, fs=0, dev_output=False, phase_correction=False, clip

# calculate the onsets
original_onsets = timbral_util.calculate_onsets(audio_samples, envelope, fs, nperseg=nperseg)
onset_strength = librosa.onset.onset_strength(audio_samples, fs)
onset_strength = librosa.onset.onset_strength(y=audio_samples, sr=fs)
# If onsets don't exist, set it to time zero
if not original_onsets:
original_onsets = [0]
Expand Down
4 changes: 2 additions & 2 deletions timbral_models/timbral_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ def calculate_onsets(audio_samples, envelope_samples, fs, look_back_time=20, hys
value of [0] is also possible during normal opperation.
"""
# get onsets with librosa estimation
onsets = librosa.onset.onset_detect(audio_samples, fs, backtrack=True, units='samples')
onsets = librosa.onset.onset_detect(y=audio_samples, sr=fs, backtrack=True, units='samples')

# set values for return_loop method
time_thresh = int(look_back_time * 0.001 * fs) # 10 ms default look-back time, in samples
Expand Down Expand Up @@ -747,7 +747,7 @@ def calculate_onsets(audio_samples, envelope_samples, fs, look_back_time=20, hys
thd_corrected_onsets = []

# get the onset strength
onset_strength = librosa.onset.onset_strength(audio_samples, fs)
onset_strength = librosa.onset.onset_strength(y=audio_samples, sr=fs)

strength_onset_times = np.array(np.array(corrected_onsets) / 512).astype('int')
strength_onset_times.clip(min=0)
Expand Down