Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,26 @@ def _calculate_rms(self, y: np.ndarray, chromagram_len: int) -> np.ndarray:
rms = np.ones(chromagram_len)
return np.asarray(rms)

def _build_chord_segments(
self, similarity: np.ndarray, rms: np.ndarray, chromagram: np.ndarray, sr: int
) -> list[TrackedChord]:
"""Build chord segments from similarity matrix."""
# Find the best matching chord template for each frame
def _match_templates(self, chromagram: np.ndarray) -> tuple[np.ndarray, np.ndarray]:
"""Match chromagram to templates and return similarities and best match indices."""
# Compare chromagram frames to templates using dot product.
# chromagram shape: (12, n_frames)
# templates shape: (24, 12)
# similarity shape: (24, n_frames)
similarity = np.dot(self.templates, chromagram)
best_matches = np.argmax(similarity, axis=0)

# Convert frames to time segments
return similarity, best_matches

def _create_chord_segments(
self,
chromagram: np.ndarray,
similarity: np.ndarray,
best_matches: np.ndarray,
rms: np.ndarray,
sr: int,
) -> list[TrackedChord]:
"""Convert frame-level chord predictions into time segments."""
frames = librosa.frames_to_time(np.arange(chromagram.shape[1] + 1), sr=sr)

chords: list[TrackedChord] = []
current_chord = None
start_frame = 0
Expand Down Expand Up @@ -174,5 +184,6 @@ def recognize(self, y: np.ndarray, sr: int = 22050) -> list[TrackedChord]:
return []

rms = self._calculate_rms(y, chromagram.shape[1])
similarity = np.dot(self.templates, chromagram)
return self._build_chord_segments(similarity, rms, chromagram, sr)
similarity, best_matches = self._match_templates(chromagram)

return self._create_chord_segments(chromagram, similarity, best_matches, rms, sr)
Loading