SquareGameLiberationFront/F.E.I.S
1
0
Fork 0
mirror of https://gitlab.com/square-game-liberation-front/F.E.I.S.git synced 2025-03-01 16:00:24 +01:00
Code Releases Wiki Activity

Loading status thingy

Browse Source
This commit is contained in:
Stepland 2023-07-07 14:13:17 +02:00
parent becf724733
commit 8219aad65a
2 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/editor_state.cpp
View File

@ -1178,12 +1178,25 @@ void EditorState::display_timing_menu() {
if (not music.has_value()) { if (not music.has_value()) {
ImGui::BeginDisabled(); ImGui::BeginDisabled();
} }
if (ImGui::Button("Detect Onsets")) { bool loading = tempo_candidates_loader.valid();
if (loading) {
ImGui::BeginDisabled();
}
if (ImGui::Button("Guess BPM")) {
const auto path = full_audio_path(); const auto path = full_audio_path();
if (path.has_value()) { if (path.has_value()) {
tempo_candidates_loader = std::async(std::launch::async, guess_tempo, *path); tempo_candidates_loader = std::async(std::launch::async, guess_tempo, *path);
} }
} }
if (loading) {
ImGui::EndDisabled();
ImGui::SameLine();
static std::size_t frame_counter = 0;
frame_counter += 1;
frame_counter %= 4*5;
ImGui::TextUnformatted(fmt::format("Loading{:.>{}}", "", frame_counter / 5).c_str());
}
if (tempo_candidates) { if (tempo_candidates) {
for (const auto& candidate: *tempo_candidates) { for (const auto& candidate: *tempo_candidates) {
ImGui::TextUnformatted(fmt::format( ImGui::TextUnformatted(fmt::format(

35
src/guess_tempo.cpp
View File

@ -29,13 +29,6 @@ std::vector<TempoCandidate> guess_tempo(const std::filesystem::path& audio) {
feis::InputSoundFile music; feis::InputSoundFile music;
music.open_from_path(audio); music.open_from_path(audio);
const auto onsets = detect_onsets(music); const auto onsets = detect_onsets(music);
{
std::ofstream onsets_dump("onsets.csv");
onsets_dump << "sample\n";
for (const auto& onset : onsets) {
onsets_dump << onset << "\n";
}
}
const auto bpm_candidates = estimate_bpm(onsets, music.getSampleRate()); const auto bpm_candidates = estimate_bpm(onsets, music.getSampleRate());
return estimate_offset(bpm_candidates, music); return estimate_offset(bpm_candidates, music);
} }
@ -73,21 +66,7 @@ std::set<std::size_t> detect_onsets(feis::InputSoundFile& music) {
std::vector<BPMFitness> estimate_bpm(const std::set<std::size_t>& onsets, const std::size_t sample_rate) { std::vector<BPMFitness> estimate_bpm(const std::set<std::size_t>& onsets, const std::size_t sample_rate) {
const auto broad_fitness = broad_interval_test(onsets, sample_rate); const auto broad_fitness = broad_interval_test(onsets, sample_rate);
{
std::ofstream broad_fitness_dump("broad_fitness.csv");
broad_fitness_dump << "interval,fitness\n";
for (const auto& [interval, fitness, _] : broad_fitness) {
broad_fitness_dump << interval << "," << fitness << "\n";
}
}
const auto corrected_fitness = correct_bias(broad_fitness); const auto corrected_fitness = correct_bias(broad_fitness);
{
std::ofstream corrected_fitness_dump("corrected_fitness.csv");
corrected_fitness_dump << "fitness\n";
for (const auto& fitness : corrected_fitness) {
corrected_fitness_dump << fitness << "\n";
}
}
auto interval_candidates = narrow_interval_test(broad_fitness, corrected_fitness, onsets, sample_rate); auto interval_candidates = narrow_interval_test(broad_fitness, corrected_fitness, onsets, sample_rate);
return select_bpm_candidates(interval_candidates, onsets, sample_rate); return select_bpm_candidates(interval_candidates, onsets, sample_rate);
} }
@ -212,21 +191,7 @@ Eigen::ArrayXf correct_bias(const std::vector<IntervalFitness>& fitness_results)
y_values.begin(), y_values.begin(),
[](const IntervalFitness& f){return f.fitness;} [](const IntervalFitness& f){return f.fitness;}
); );
{
std::ofstream yvalues_dump("yvalues.csv");
yvalues_dump << "value\n";
for (const auto& value : y_values) {
yvalues_dump << value << "\n";
}
}
const auto coeffs = polyfit(y_values, 3); const auto coeffs = polyfit(y_values, 3);
{
std::ofstream coeffs_dump("coeffs.csv");
coeffs_dump << "coeff\n";
for (const auto& coeff : coeffs) {
coeffs_dump << coeff << "\n";
}
}
Eigen::ArrayXf fitness(y_values.size()); Eigen::ArrayXf fitness(y_values.size());
std::copy(y_values.cbegin(), y_values.cend(), fitness.begin()); std::copy(y_values.cbegin(), y_values.cend(), fitness.begin());
auto indicies = Eigen::ArrayXf::LinSpaced(y_values.size(), 0, y_values.size() - 1); auto indicies = Eigen::ArrayXf::LinSpaced(y_values.size(), 0, y_values.size() - 1);