rm different blastbeat strategy

Author: linomp

.gitignore

@@ -5,5 +5,5 @@ venv
 *.mp3
 *.pkl
 output/*
-cache.json
+download_cache.json
 *.csv

downloading.py

@@ -5,7 +5,7 @@
 
 from yt_dlp import YoutubeDL
 
-CACHE_FILE = Path(__file__).parent / "cache.json"
+CACHE_FILE = Path(__file__).parent / "download_cache.json"
 
 
 def download_from_youtube_as_mp3(url: str) -> tuple[bool, Path | None]:

processing.py

@@ -103,8 +103,7 @@ def get_sections_labeled_by_percussion_content_from_audio(
     return results
 
 
-def identify_hammer_blast(sections: list[LabeledSection]) -> list[tuple[int, int]]:
-    # TODO:  name doesn't really capture what this does, because it captures more than just hammer blasts
+def identify_blastbeats(sections: list[LabeledSection]) -> list[tuple[int, int]]:
     min_hits = 8  # primitive approach: 4 snares+bass in a series at least
     start_idx = 0
     hits = 0
@@ -123,32 +122,6 @@ def identify_hammer_blast(sections: list[LabeledSection]) -> list[tuple[int, int
     return results
 
 
-def identify_traditional_blast(sections: list[LabeledSection]) -> list[tuple[int, int]]:
-    # TODO:  too many false positives in real songs
-    min_hits = 4
-    start_idx = 0
-    hits = 0
-    seen_last_bass = False
-    seen_last_snare = False
-    results = []
-
-    for i, s in enumerate(sections):
-        if not (s.bass_drum_present or s.snare_present):
-            if hits >= min_hits:
-                results.append((sections[start_idx].start_idx, s.start_idx))
-            hits = 0
-        elif (s.bass_drum_present and not seen_last_bass) or (
-            s.snare_present and not seen_last_snare and seen_last_bass
-        ):
-            if hits == 0:
-                start_idx = i
-            hits += 1
-
-        seen_last_bass, seen_last_snare = s.bass_drum_present, s.snare_present
-
-    return results
-
-
 def identify_bass_and_snare_frequencies(
     audio_data: np.ndarray,
     sample_rate: float,
@@ -230,14 +203,7 @@ def process_song(
         peak_detection_band_width,
         peak_detection_min_area_threshold,
     )
-
-    blastbeat_intervals = list(
-        set(
-            identify_hammer_blast(labeled_sections)
-            # TODO: improve detection, then bring this back
-            # + identify_traditional_blast(labeled_sections)
-        )
-    )
+    blastbeat_intervals = identify_blastbeats(labeled_sections)
 
     print("Exporting result...")
     save_result(
@@ -279,7 +245,4 @@ def process_song(
 
 # TODO:
 # - experiment with compression of drum track before fft?
-# - improve blast beat detection algorithm (support bomb blasts, slow blasts etc.)
-# - investigate false positives in benighted song & calicuchima
-# - come up with f-score??
-# - for easier debugging, color blastbeats differently by type
+# - investigate false positives in all songs & tune parameters

test_processing.py

@@ -1,4 +1,4 @@
-from processing import LabeledSection, identify_hammer_blast, identify_traditional_blast
+from processing import LabeledSection, identify_blastbeats
 
 
 def test_identify_blasts_1():
@@ -15,7 +15,7 @@ def test_identify_blasts_1():
         LabeledSection(10, 11, False, False),
     ]
     expected = [(2, 10)]
-    actual = identify_hammer_blast(input)
+    actual = identify_blastbeats(input)
 
     assert actual == expected
 
@@ -32,25 +32,6 @@ def test_identify_blasts_2():
         LabeledSection(8, 9, True, True),
     ]
     expected = []
-    actual = identify_hammer_blast(input)
-
-    assert actual == expected
-
-
-def test_traditional_blast():
-    input: list[LabeledSection] = [
-        LabeledSection(1, 2, bass_drum_present=False, snare_present=False),
-        LabeledSection(2, 3, bass_drum_present=True, snare_present=False),
-        LabeledSection(3, 4, bass_drum_present=False, snare_present=True),
-        LabeledSection(4, 5, bass_drum_present=True, snare_present=False),
-        LabeledSection(5, 6, bass_drum_present=False, snare_present=True),
-        LabeledSection(6, 7, bass_drum_present=False, snare_present=False),
-        LabeledSection(7, 8, bass_drum_present=False, snare_present=False),
-        LabeledSection(8, 9, bass_drum_present=False, snare_present=False),
-    ]
-
-    expected = [(2, 6)]
-
-    actual = identify_traditional_blast(input)
+    actual = identify_blastbeats(input)
 
     assert actual == expected