Skip to content

Commit

Permalink
refactor hist_buffer to base tempo estimator class
Browse files Browse the repository at this point in the history
  • Loading branch information
Sebastian Böck committed Aug 18, 2017
1 parent 9c842d0 commit 37e83bb
Showing 1 changed file with 30 additions and 25 deletions.
55 changes: 30 additions & 25 deletions madmom/features/tempo.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,8 @@ class BaseTempoEstimationProcessor(OnlineProcessor):
Smooth the activation function over `act_smooth` seconds.
hist_smooth : int
Smooth the tempo histogram over `hist_smooth` bins.
hist_buffer : float
Aggregate the tempo histogram over `hist_buffer` seconds.
fps : float, optional
Frames per second.
Expand All @@ -266,18 +268,21 @@ class BaseTempoEstimationProcessor(OnlineProcessor):
"""

def __init__(self, min_bpm, max_bpm, act_smooth, hist_smooth, fps=None,
online=False, **kwargs):
def __init__(self, min_bpm, max_bpm, act_smooth, hist_smooth,
hist_buffer=None, fps=None, online=False, **kwargs):
# pylint: disable=unused-argument
super(BaseTempoEstimationProcessor, self).__init__(online=online)
# save variables
self.min_bpm = min_bpm
self.max_bpm = max_bpm
self.act_smooth = act_smooth
self.hist_smooth = hist_smooth
self.hist_buffer = hist_buffer
self.fps = fps
if self.online:
self.visualize = kwargs.get('verbose', False)
self._hist_buffer = BufferProcessor((int(hist_buffer * self.fps),
len(self.intervals)))

@property
def min_interval(self):
Expand All @@ -294,6 +299,10 @@ def intervals(self):
"""Beat intervals [frames]."""
return np.arange(self.min_interval, self.max_interval + 1)

def reset(self):
"""Reset the tempo estimator."""
self._hist_buffer.reset()

def process_offline(self, activations, **kwargs):
"""
Detect the tempi from the (beat) activations.
Expand Down Expand Up @@ -492,8 +501,8 @@ class TempoEstimationProcessor(BaseTempoEstimationProcessor):
METHOD = 'comb'
MIN_BPM = 40.
MAX_BPM = 250.
HIST_SMOOTH = 9
ACT_SMOOTH = 0.14
HIST_SMOOTH = 9
ALPHA = 0.79

def __init__(self, method=METHOD, min_bpm=MIN_BPM, max_bpm=MAX_BPM,
Expand Down Expand Up @@ -650,30 +659,29 @@ class CombFilterTempoEstimationProcessor(BaseTempoEstimationProcessor):
# default values for tempo estimation
MIN_BPM = 40.
MAX_BPM = 250.
HIST_SMOOTH = 9
ACT_SMOOTH = 0.14
ALPHA = 0.79
BUFFER_SIZE = 10.
ACT_SMOOTH = 0.14
HIST_SMOOTH = 9
HIST_BUFFER = 10.

def __init__(self, min_bpm=MIN_BPM, max_bpm=MAX_BPM, act_smooth=ACT_SMOOTH,
hist_smooth=HIST_SMOOTH, alpha=ALPHA, buffer_size=BUFFER_SIZE,
hist_smooth=HIST_SMOOTH, alpha=ALPHA, hist_buffer=HIST_BUFFER,
fps=None, online=False, **kwargs):
# pylint: disable=unused-argument
super(CombFilterTempoEstimationProcessor, self).__init__(
min_bpm=min_bpm, max_bpm=max_bpm, act_smooth=act_smooth,
hist_smooth=hist_smooth, fps=fps, online=online, **kwargs)
hist_smooth=hist_smooth, hist_buffer=hist_buffer, fps=fps,
online=online, **kwargs)
# save additional variables
self.alpha = alpha
if self.online:
self._comb_buffer = BufferProcessor((np.max(self.intervals) + 1,
len(self.intervals)))
self._hist_buffer = BufferProcessor((int(buffer_size * self.fps),
len(self.intervals)))

def reset(self):
"""Reset the CombFilterTempoEstimationProcessor."""
super(CombFilterTempoEstimationProcessor, self).reset()
self._comb_buffer.reset()
self._hist_buffer.reset()

def interval_histogram(self, activations):
"""
Expand Down Expand Up @@ -827,26 +835,25 @@ class ACFTempoEstimationProcessor(BaseTempoEstimationProcessor):
# default values for tempo estimation
MIN_BPM = 40.
MAX_BPM = 250.
HIST_SMOOTH = 9
ACT_SMOOTH = 0.14
BUFFER_SIZE = 10.
HIST_SMOOTH = 9
HIST_BUFFER = 10.

def __init__(self, min_bpm=MIN_BPM, max_bpm=MAX_BPM, act_smooth=ACT_SMOOTH,
hist_smooth=HIST_SMOOTH, buffer_size=BUFFER_SIZE, fps=None,
hist_smooth=HIST_SMOOTH, hist_buffer=HIST_BUFFER, fps=None,
online=False, **kwargs):
# pylint: disable=unused-argument
super(ACFTempoEstimationProcessor, self).__init__(
min_bpm=min_bpm, max_bpm=max_bpm, act_smooth=act_smooth,
hist_smooth=hist_smooth, fps=fps, online=online, **kwargs)
hist_smooth=hist_smooth, hist_buffer=hist_buffer, fps=fps,
online=online, **kwargs)
if self.online:
self._act_buffer = BufferProcessor((np.max(self.intervals) + 1, 1))
self._hist_buffer = BufferProcessor((int(buffer_size * self.fps),
len(self.intervals)))

def reset(self):
"""Reset the ACFTempoEstimationProcessor."""
super(ACFTempoEstimationProcessor, self).reset()
self._act_buffer.reset()
self._hist_buffer.reset()

def interval_histogram(self, activations):
"""
Expand Down Expand Up @@ -950,28 +957,26 @@ class DBNTempoEstimationProcessor(BaseTempoEstimationProcessor):
MAX_BPM = 250.
HIST_SMOOTH = 9
ACT_SMOOTH = 0.
BUFFER_SIZE = 10.
HIST_BUFFER = 10.

def __init__(self, min_bpm=MIN_BPM, max_bpm=MAX_BPM, act_smooth=ACT_SMOOTH,
hist_smooth=HIST_SMOOTH, buffer_size=BUFFER_SIZE, fps=None,
hist_smooth=HIST_SMOOTH, hist_buffer=HIST_BUFFER, fps=None,
online=False, **kwargs):
# pylint: disable=unused-argument
super(DBNTempoEstimationProcessor, self).__init__(
min_bpm=min_bpm, max_bpm=max_bpm, act_smooth=act_smooth,
hist_smooth=hist_smooth, fps=fps, online=online, **kwargs)
hist_smooth=hist_smooth, hist_buffer=hist_buffer, fps=fps,
online=online, **kwargs)
# save additional variables
from .beats import DBNBeatTrackingProcessor
self.dbn = DBNBeatTrackingProcessor(min_bpm=self.min_bpm,
max_bpm=self.max_bpm,
fps=self.fps, **kwargs)
if self.online:
self._hist_buffer = BufferProcessor((int(buffer_size * self.fps),
len(self.intervals)))

def reset(self):
"""Reset the DBNTempoEstimationProcessor."""
super(DBNTempoEstimationProcessor, self).reset()
self.dbn.hmm.reset()
self._hist_buffer.reset()

def interval_histogram(self, activations):
"""
Expand Down

0 comments on commit 37e83bb

Please sign in to comment.