From 42381e2a704850cca13c74110813fa865727cef8 Mon Sep 17 00:00:00 2001 From: John Glover Date: Fri, 25 Jan 2013 12:32:58 +0100 Subject: [sms] Fix bug in SMSPeakDetection.find_peaks. Memory for frame audio arrays should be managed by the Frame object. --- src/simpl/peak_detection.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/simpl/peak_detection.cpp b/src/simpl/peak_detection.cpp index 41d395d..ba73fd8 100644 --- a/src/simpl/peak_detection.cpp +++ b/src/simpl/peak_detection.cpp @@ -329,24 +329,27 @@ Peaks SMSPeakDetection::find_peaks_in_frame(Frame* frame) { // peaks returned for each frame. Frames SMSPeakDetection::find_peaks(int audio_size, sample* audio) { clear(); + unsigned int pos = 0; + bool alloc_memory_in_frame = true; _analysis_params.iSizeSound = audio_size; - unsigned int pos = 0; while(pos <= audio_size - _hop_size) { - // get the next frame size if(!_static_frame_size) { _frame_size = next_frame_size(); } - // get the next frame - Frame* f = new Frame(_frame_size); - f->audio(&audio[pos]); + Frame* f = new Frame(_frame_size, alloc_memory_in_frame); f->max_peaks(_max_peaks); - // find peaks - find_peaks_in_frame(f); + if((int)pos <= (audio_size - _frame_size)) { + f->audio(&(audio[pos]), _frame_size); + } + else { + f->audio(&(audio[pos]), audio_size - pos); + } + find_peaks_in_frame(f); _frames.push_back(f); if(!_static_frame_size) { -- cgit v1.2.3