def read_features(self, track_id):
filename = os.path.join(self.billboard_path, 'cqt-hpss', '%s.json' % track_id)
timed_cqt = read_timed_cqt(filename)
analysis = read_analysis(track_id, self.billboard_path)
beats = read_beats(analysis, self.half_beats)
aligned_cqt, beats = align(beats, timed_cqt, average=True)
return aligned_cqt, beats
def read_features(self, track_id):
timed_cqt = read_timed_cqt(cqt_path(track_id))
beats = read_beats(track_id, self.half_beats)
aligned_cqt, beats = align(beats, timed_cqt, average=True)
return aligned_cqt, beats
