diff --git a/Galaxy Collapse.mp3 b/Galaxy Collapse.mp3 new file mode 100644 index 0000000..716b9ac Binary files /dev/null and b/Galaxy Collapse.mp3 differ diff --git a/Night of Knights.mp3 b/Night of Knights.mp3 new file mode 100644 index 0000000..ee71864 Binary files /dev/null and b/Night of Knights.mp3 differ diff --git a/Zcleaned_song.wav b/Zcleaned_song.wav new file mode 100644 index 0000000..24c65f5 Binary files /dev/null and b/Zcleaned_song.wav differ diff --git a/Zoutput_song.wav b/Zoutput_song.wav new file mode 100644 index 0000000..efdb290 Binary files /dev/null and b/Zoutput_song.wav differ diff --git a/Zvoided_song.wav b/Zvoided_song.wav new file mode 100644 index 0000000..dd205d2 Binary files /dev/null and b/Zvoided_song.wav differ diff --git a/audio.wav b/audio.wav new file mode 100644 index 0000000..b70bfc0 Binary files /dev/null and b/audio.wav differ diff --git a/cleaned_sp.py b/cleaned_sp.py index 208d9c6..17a70d7 100644 --- a/cleaned_sp.py +++ b/cleaned_sp.py @@ -271,10 +271,10 @@ def localize_frequencies(song_name, offset, songlen, segsize, output_name): let_ring_currentLength = 0 let_ring_freq = -200 - let_ring_freqLeniency = 37 + let_ring_freqLeniency = 50 let_ring_leniencySecond = 0.07 - let_ring_lengthLeniency = 2 + let_ring_lengthLeniency = 1 # remove # i = time, j = freq @@ -565,7 +565,7 @@ def parse_after_filter(song_name, offset, songlen, segsize, dt0): print("\n\nSegSize :", segsize, "\nFFT :", len(fft_list), "\nFFT[0] :", len(fft_list[0]), "\npfreq :", len(pfreq), "\n\n") timing_points = [] - prev_append = 2 + prev_append = 1 for i in range(len(fft_list)): # retrieve dominant freq @@ -651,23 +651,29 @@ void_freq_clean(convert_to_wav("ctype.mp3"), 0.042, 5, 1/(149.3/60)/8, 100, 3000 localize_frequencies(convert_to_wav("ctype_void.mp3"), 0, 5, 1/(149.3/60)/12, "ctype_filtered.mp3") retrieve_all_from_song("ctype_filtered.mp3", 0, 5, 149.3, dta=1/(149.3/60)/128, dtf=1/(149.3/60)/8) ''' +#OFFSET = 0.042 +#BPM = 149.3 + SONG_LEN = 5 -OFFSET = 0.042 -SEGSIZE = 1/(149.3/60) +OFFSET = 117.790 +BPM = 150 +SEGSIZE = 1/(BPM/60) + +wavved_song = convert_to_wav("Galaxy Collapse.mp3") # remove high/low frequencies (often noise) -void_freq_clean(convert_to_wav("tetris_2.wav"), OFFSET, SONG_LEN, SEGSIZE/8, 100, 3000, 0.05, "tetris_2_void.wav") +#void_freq_clean(wavved_song, OFFSET, SONG_LEN, SEGSIZE/8, 100, 3000, 0.05, "Zvoided_song.wav") # crops any part with let ring -localize_frequencies(convert_to_wav("tetris_2_void.wav"), 0, SONG_LEN-0.01, SEGSIZE/16, "tetris_2_f.wav") +localize_frequencies(convert_to_wav("Zvoided_song.wav"), 0, SONG_LEN-0.1, SEGSIZE/8, "Zcleaned_song.wav") # find timings -tp = parse_after_filter("tetris_2_f.wav", 0, SONG_LEN-0.01, SEGSIZE/16, OFFSET) +tp = parse_after_filter("Zcleaned_song.wav", 0, SONG_LEN-0.1, SEGSIZE/8, OFFSET) # write -write_result("tetris_2.wav", OFFSET, SONG_LEN-0.01, SEGSIZE/16, tp, "tetris_2_result.wav") +write_result(wavved_song, OFFSET, SONG_LEN-0.1, SEGSIZE/8, tp, "Zoutput_song.wav") -#retrieve_all_from_song("tetris_2_f.wav", 0, 5, 149.3, dtf=1/(149.3/60)/8) +#retrieve_all_from_song("Zcleaned_song.wav", 0, 5, 149.3, dtf=1/(149.3/60)/8) print("yipee") diff --git a/no.mp3 b/no.mp3 new file mode 100644 index 0000000..66a714d Binary files /dev/null and b/no.mp3 differ diff --git a/tetris_2_f.wav b/tetris_2_f.wav deleted file mode 100644 index a3222ed..0000000 Binary files a/tetris_2_f.wav and /dev/null differ diff --git a/tetris_2_result.wav b/tetris_2_result.wav deleted file mode 100644 index 27a02d2..0000000 Binary files a/tetris_2_result.wav and /dev/null differ diff --git a/tetris_2_void.wav b/tetris_2_void.wav deleted file mode 100644 index 1ca5474..0000000 Binary files a/tetris_2_void.wav and /dev/null differ