Skip to content

Commit

Permalink
Merge 6d711cf into 9c1ee5d
Browse files Browse the repository at this point in the history
  • Loading branch information
bmcfee committed Nov 21, 2016
2 parents 9c1ee5d + 6d711cf commit d550ff6
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions librosa/core/constantq.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
'''Pitch-tracking and tuning estimation'''
'''Constant-Q transforms'''
from __future__ import division

import numpy as np
Expand All @@ -20,7 +20,7 @@

@cache(level=20)
def cqt(y, sr=22050, hop_length=512, fmin=None, n_bins=84,
bins_per_octave=12, tuning=None, filter_scale=1,
bins_per_octave=12, tuning=0.0, filter_scale=1,
norm=1, sparsity=0.01, window='hann',
scale=True,
real=util.Deprecated()):
Expand Down Expand Up @@ -56,7 +56,7 @@ def cqt(y, sr=22050, hop_length=512, fmin=None, n_bins=84,
tuning : None or float in `[-0.5, 0.5)`
Tuning offset in fractions of a bin (cents).
If `None`, tuning will be automatically estimated.
If `None`, tuning will be automatically estimated from the signal.
filter_scale : float > 0
Filter scale factor. Small values (<1) use shorter windows
Expand Down Expand Up @@ -263,7 +263,7 @@ def cqt(y, sr=22050, hop_length=512, fmin=None, n_bins=84,

@cache(level=20)
def hybrid_cqt(y, sr=22050, hop_length=512, fmin=None, n_bins=84,
bins_per_octave=12, tuning=None, filter_scale=1,
bins_per_octave=12, tuning=0.0, filter_scale=1,
norm=1, sparsity=0.01, window='hann', scale=True):
'''Compute the hybrid constant-Q transform of an audio signal.
Expand Down Expand Up @@ -294,7 +294,7 @@ def hybrid_cqt(y, sr=22050, hop_length=512, fmin=None, n_bins=84,
tuning : None or float in `[-0.5, 0.5)`
Tuning offset in fractions of a bin (cents).
If `None`, tuning will be automatically estimated.
If `None`, tuning will be automatically estimated from the signal.
filter_scale : float > 0
Filter filter_scale factor. Larger values use longer windows.
Expand Down Expand Up @@ -396,7 +396,7 @@ def hybrid_cqt(y, sr=22050, hop_length=512, fmin=None, n_bins=84,

@cache(level=20)
def pseudo_cqt(y, sr=22050, hop_length=512, fmin=None, n_bins=84,
bins_per_octave=12, tuning=None, filter_scale=1,
bins_per_octave=12, tuning=0.0, filter_scale=1,
norm=1, sparsity=0.01, window='hann', scale=True):
'''Compute the pseudo constant-Q transform of an audio signal.
Expand Down Expand Up @@ -429,7 +429,7 @@ def pseudo_cqt(y, sr=22050, hop_length=512, fmin=None, n_bins=84,
tuning : None or float in `[-0.5, 0.5)`
Tuning offset in fractions of a bin (cents).
If `None`, tuning will be automatically estimated.
If `None`, tuning will be automatically estimated from the signal.
filter_scale : float > 0
Filter filter_scale factor. Larger values use longer windows.
Expand Down

0 comments on commit d550ff6

Please sign in to comment.