removed more calls to logamplitude

librosa/core/harmonic.py

@@ -71,8 +71,8 @@ def salience(S, freqs, h_range, weights=None, aggregate=None,
     (1025, 646)
     >>> import matplotlib.pyplot as plt
     >>> plt.figure()
-    >>> librosa.display.specshow(librosa.logamplitude(S_sal**2,
-    ...                                               ref=S_sal.max()**2),
+    >>> librosa.display.specshow(librosa.amplitude_to_db(S_sal,
+    ...                                                  ref=np.max),
     ...                          sr=sr, y_axis='log')
     >>> plt.tight_layout()
     """
@@ -185,8 +185,8 @@ def interp_harmonics(x, freqs, h_range, kind='linear', fill_value=0, axis=0):
     >>> plt.figure()
     >>> for i, _sh in enumerate(S_harm, 1):
     ...     plt.subplot(3, 2, i)
-    ...     librosa.display.specshow(librosa.logamplitude(_sh**2,
-    ...                                                   ref=S.max()**2),
+    ...     librosa.display.specshow(librosa.amplitude_to_db(_sh,
+    ...                                                      ref=S.max()),
     ...                              sr=sr, y_axis='log')
     ...     plt.title('h={:.3g}'.format(h_range[i-1]))
     ...     plt.yticks([])
@@ -292,8 +292,8 @@ def harmonics_1d(harmonic_out, x, freqs, h_range, kind='linear',
     >>> plt.figure()
     >>> for i, _sh in enumerate(S_harm, 1):
     ...     plt.subplot(3,2,i)
-    ...     librosa.display.specshow(librosa.logamplitude(_sh**2,
-    ...                                                   ref=S.max()**2),
+    ...     librosa.display.specshow(librosa.amplitude_to_db(_sh,
+    ...                                                      ref=S.max()),
     ...                              sr=sr, y_axis='log')
     ...     plt.title('h={:.3g}'.format(h_range[i-1]))
     ...     plt.yticks([])

librosa/feature/spectral.py

@@ -13,7 +13,7 @@
 
 from ..core.time_frequency import fft_frequencies
 from ..core.audio import zero_crossings, to_mono
-from ..core.spectrum import logamplitude, power_to_db, _spectrogram
+from ..core.spectrum import power_to_db, _spectrogram
 from ..core.constantq import cqt, hybrid_cqt
 from ..core.pitch import estimate_tuning
 
@@ -391,7 +391,7 @@ def spectral_contrast(y=None, sr=22050, S=None, n_fft=2048, hop_length=512,
     if linear:
         return peak - valley
     else:
-        return logamplitude(peak) - logamplitude(valley)
+        return power_to_db(peak) - power_to_db(valley)
 
 
 def spectral_rolloff(y=None, sr=22050, S=None, n_fft=2048, hop_length=512,

librosa/onset.py

@@ -419,7 +419,7 @@ def onset_strength_multi(y=None, sr=22050, S=None, lag=1, max_size=1,
         S = np.abs(feature(y=y, sr=sr, **kwargs))
 
         # Convert to dBs
-        S = core.logamplitude(S)
+        S = core.power_to_db(S)
 
     # Retrieve the n_fft and hop_length,
     # or default values for onsets if not provided