Changeset 1561 for trunk/src/org/apollo/gui/WaveFormRenderProccessingUnit.java

Timestamp:

05/19/21 09:01:33 (3 years ago)

Author:

davidb

Message:

A set of changes that spans three things: beat detection, time stretching; and a debug class motivated by the need to look at a canvas redraw issue most notable when a waveform widget is playing

File:

• trunk/src/org/apollo/gui/WaveFormRenderProccessingUnit.java (modified) (8 diffs)

trunk/src/org/apollo/gui/WaveFormRenderProccessingUnit.java

@@ -3 +3 @@
 import java.awt.Graphics2D;
 import java.util.LinkedList;
+import java.util.List;
 
 import javax.sound.sampled.AudioFormat;
@@ -269 +270 @@
                                                         for (int i = 0; i < amps.length; i+=2) {
                                                                 
+                                                                g.setColor(SwingConversions.toSwingColor(ApolloColorIndexedModels.WAVEFORM_COLOR));
+                                                                
                                                                 float peak = amps[i];
                                                                 float trough = amps[i + 1];
@@ -293 +296 @@
                                                                 }
                                                                 
+                                                                int frameSize = 4;
+                                                                int bi_start = (currentTask.startFrame + renderStart);
+                                                                int bi_end = bi_start + (renderLength);
+
+                                                                for (int bi = bi_start; bi<bi_end; bi++) {
+                                                                        if (currentTask.frameIsBeat[bi]) {
+                                                                                g.setColor(SwingConversions.toSwingColor(ApolloColorIndexedModels.WAVEFORM_SELECTION_COLOR));
+                                                                                g.drawLine(x, halfMaxHeight, x, -halfMaxHeight);
+                                                                                break;
+                                                                        }
+                                                                }
+
                                                                 currentAmplitude ++;
                                                         }
@@ -303 +318 @@
                                 } // next pass
                                 
-                                // Lession learnt: do not request lots of requests to repaint
-                                // later on the AWT Event queu otherwise it will get congested
+                                // Lesson learnt: do not request lots of requests to repaint
+                                // later on the AWT Event queue otherwise it will get congested
                                 // and will freeze up the interact for annoying periods of time.
                                 currentTask.setState(WaveFormRenderTask.STATE_STOPPED);
@@ -348 +363 @@
                 private Image imageBuffer; // nullified when stopped.
                 private byte[] audioBytes; // nullified when stopped. - Arrays (not contents) are immutable so no need to worry about threading issues with indexes
+                private boolean[] frameIsBeat;
+                
                 private final int startFrame;
                 private final int frameLength; // in frames
@@ -357 +374 @@
                                 byte[] audioBytes, 
                                 AudioFormat format,
+                                List<Double> detectedBeats,
                                 int startFrame, 
                                 int frameLength, 
@@ -371 +389 @@
                         this.frameLength = frameLength;
                         this.recommendInvalidations = recommendInvalidations;
+                                                
+                        this.frameIsBeat = new boolean[frameLength];
+                        if (detectedBeats != null) {
+                                for (double beat_in_secs: detectedBeats){
+                                        int frame_pos = (int)Math.round(beat_in_secs * format.getSampleRate());
+                                        frameIsBeat[frame_pos] = true;
+                                }
+                        }
+
                         renderer = new DualPeakTroughWaveFormRenderer(format);
                 }
@@ -384 +411 @@
                         if (state == STATE_STOPPED) {
                                 audioBytes = null;
+                                frameIsBeat = null;
                                 imageBuffer = null;
                         }