new BeatDetect implementation #312
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
revmischa
approved these changes
Jan 27, 2020
Member
revmischa
left a comment
revmischa
left a comment
There was a problem hiding this comment.
Thanks I'll give it a go!
PCM sample rate can vary wildly.
| this->vol_history=0; | ||
| this->vol_instant=0; | ||
| this->vol_history=0; | ||
| for (unsigned y=0;y<80;y++) |
Collaborator
Author
There was a problem hiding this comment.
That's from the previous code. Would be better as a constant (like I did for FFT_LENGTH)
src/libprojectM/PCM.hpp
Outdated
|
|
||
|
|
||
| // 1024 is more computationally intensive, but maybe better at detecting lower bass | ||
| #define FFT_LENGTH 512 |
Member
There was a problem hiding this comment.
would be cool if this was variable, based on the current audio input sample rate some day
| vol=0; | ||
|
|
||
| // TODO: get sample rate from PCM? Assume 44100 | ||
| getBeatVals(44100.0f, FFT_LENGTH, pcm->pcmdataL, pcm->pcmdataR); |
Member
There was a problem hiding this comment.
don't assume this, it can be anything (8k 22k 48k 96k)
| unsigned *ranges = fft_length==1024 ? ranges1024 : ranges512; | ||
|
|
||
| bass_instant = 0; | ||
| for (unsigned i=ranges[0]+1 ; i<=ranges[1] ; i++) |
Member
There was a problem hiding this comment.
comments on these calculations and magic numbers would be nice to have
| //work0around | ||
| #endif /** WIN32 */ | ||
| return 0.5f / std::max(0.0001f,sqrtf(vol_history)); | ||
| return 4.0f / std::max(0.0001f,sqrtf(vol_history)); |
| float vol_history; | ||
| float vol_instant; | ||
|
|
||
| // /** Vars */ |
Member
There was a problem hiding this comment.
delete this unless some reason to keep it
revmischa
approved these changes
Jan 28, 2020
Closed
revmischa
reviewed
Feb 6, 2021
|
|
||
| { | ||
| // NOTE some presets set bSpectrum=1 and samples!=2^n, not sure what rdft() does with that | ||
| assert(samples <= 1024); |
Member
There was a problem hiding this comment.
I'm hitting this assert on linux. What to do about it?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a proposed fix for #309
I think this simpler implementation does what it says it does. At least it makes more sense to me. It doesn't really seem to have that much noticeable affect how the presets render. I wrote a new test preset so you can more directly evaluate the output.
https://github.com/projectM-visualizer/projectm/blob/master/presets/tests/300-beatdetect-bassmidtreb.milk
It would be great if the regular contributors could
a) review the code change carefully (not that big)
b) verify your favorite presets
c) if you like, play with various parameters (e.g. freq cutoffs) and see if the current version seems best.