ardour/livetrax
13
0
Fork 0
Code

Tidy up slightly; fix reads off the end of the data

Browse Source 
array (#4797).


git-svn-id: svn://localhost/ardour2/branches/3.0@11772 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2012-04-01 14:57:57 +00:00
parent 7f417fb44f
commit cc23c36961
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libs/ardour/transient_detector.cc
View File

@ -125,23 +125,17 @@ TransientDetector::cleanup_transients (AnalysisFeatureList& t, float sr, float g
void void
TransientDetector::update_positions (Readable* src, uint32_t channel, AnalysisFeatureList& positions) TransientDetector::update_positions (Readable* src, uint32_t channel, AnalysisFeatureList& positions)
{ {
Plugin::FeatureSet features; int const buff_size = 1024;
int const step_size = 64;
Sample* data = 0; Sample* data = new Sample[buff_size];
int buff_size = 1024;
int step_size = 64;
data = new Sample[buff_size];
AnalysisFeatureList::iterator i = positions.begin(); AnalysisFeatureList::iterator i = positions.begin();
while (i != positions.end()) { while (i != positions.end()) {
framecnt_t to_read;
/* read from source */ /* read from source */
to_read = buff_size; framecnt_t const to_read = buff_size;
if (src->read (data, (*i) - buff_size, to_read, channel) != to_read) { if (src->read (data, (*i) - buff_size, to_read, channel) != to_read) {
break; break;
@ -149,10 +143,10 @@ TransientDetector::update_positions (Readable* src, uint32_t channel, AnalysisFe
// Simple heuristic for locating approx correct cut position. // Simple heuristic for locating approx correct cut position.
for (int j = 0; j < buff_size;){ for (int j = 0; j < (buff_size - step_size); ) {
Sample s = abs (data[j]); Sample const s = abs (data[j]);
Sample s2 = abs (data[j + step_size]); Sample const s2 = abs (data[j + step_size]);
if ((s2 - s) > threshold) { if ((s2 - s) > threshold) {
//cerr << "Thresh exceeded. Moving pos from: " << (*i) << " to: " << (*i) - buff_size + (j + 16) << endl; //cerr << "Thresh exceeded. Moving pos from: " << (*i) << " to: " << (*i) - buff_size + (j + 16) << endl;
@ -160,7 +154,7 @@ TransientDetector::update_positions (Readable* src, uint32_t channel, AnalysisFe
break; break;
} }
j = j + step_size; j += step_size;
} }
++i; ++i;