Changeset 1559

Timestamp:

05/10/21 11:47:23 (3 years ago)

Author:

davidb

Message:

Beat tracking form mozart's laptop branch merged in

File:

• trunk/src/org/apollo/audio/SampledTrackModel.java (modified) (4 diffs)

trunk/src/org/apollo/audio/SampledTrackModel.java

@@ -2 +2 @@
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.UnsupportedAudioFileException;
 
 import org.apollo.io.AudioIO;
 import org.apollo.mvc.AbstractSubject;
 import org.apollo.mvc.SubjectChangedEvent;
+
+import be.tarsos.dsp.AudioDispatcher;
+import be.tarsos.dsp.beatroot.BeatRootOnsetEventHandler;
+import be.tarsos.dsp.io.jvm.AudioDispatcherFactory;
+import be.tarsos.dsp.onsets.ComplexOnsetDetector;
+import be.tarsos.dsp.onsets.OnsetHandler;
+
 
 /**
@@ -15 +25 @@
  *
  */
-public class SampledTrackModel extends AbstractSubject {
+public class SampledTrackModel extends AbstractSubject  implements OnsetHandler {
         
         private AudioFormat audioFormat = null;
@@ -32 +42 @@
         
         private String name = null;
+        
+        private List<Double> beats;
+
         
         /**
@@ -73 +86 @@
         }
         
+
+        public void detectBeats(int audioBufferSize, int audioBufferOverlap) throws UnsupportedAudioFileException {
+                AudioDispatcher dispatcher = AudioDispatcherFactory.fromByteArray(audioBytes, audioFormat,
+                                audioBufferSize, audioBufferOverlap);
+
+                ComplexOnsetDetector detector = new ComplexOnsetDetector(audioBufferSize);
+                BeatRootOnsetEventHandler handler = new BeatRootOnsetEventHandler();
+                detector.setHandler(handler);
+
+                dispatcher.addAudioProcessor(detector);
+                dispatcher.run();
+
+                beats = new ArrayList<Double>();
+                handler.trackBeats(this);
+
+        }
+
+        @Override
+        public void handleOnset(double time, double salience) {
+                beats.add(time);
+        }
+
+        public List<Double> getBeats() {
+                return beats;
+        }
+
+        public void clearBeats() {
+                beats = null;;
+        }
+
+
+
+                
         /**
          * @return True if audio bytes have been changed in some way since creation / last reset.