aubio 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48a28fd8e26d69beddf8d74b238fa31de32f5f00
-  data.tar.gz: 7758d79180d4cb152f3832e882a2193c8da69ce8
+  metadata.gz: 4449b468192ecfde756ebcba885104de2b1e2204
+  data.tar.gz: fac1a109e7dbd00a1c42eec07a708bafc489c0d9
 SHA512:
-  metadata.gz: 89eabbc1f9f39344b8d2f6b63fb9ed185bd10e97048d6f4e79ed33beff35bd9dc565c498398146ecd5a9e1e5744879d3e8417e18976e774c7c9687e1202ba2e2
-  data.tar.gz: f9e6f608555f9a0e8ad38b2886206213211332dcdc3abfda72f392803fe670b4b0baacdd9b700f4045ba07d25dab8fa7bfe90bc5031b78a09683f085167b8053
+  metadata.gz: 1be5f9f1f403087ba3719ea5d9789b870df6349706efcbfef790a0ae5c11876ca86159914d3f3326e7666357b198a0cd07ba3803f6dd97d8a0c59431cfac764a
+  data.tar.gz: 94e78233234035ce70d20d8022198f30136f380bf0d3506d8cd10e6e789aec00ff29cc9154af2fd11aae1bbfc6d47ee62147a6f7170f508ff80582765459099a

data/lib/aubio.rb

@@ -40,16 +40,55 @@ module Aubio
       Pitches.new(@source, @params).each
     end
 
-    def beats
+    def enum_beats
       check_for_closed
 
       Beats.new(@source, @params).each
     end
 
+    def beats
+      check_for_closed
+
+      beats = Beats.new(@source, @params).each.to_a
+
+      # fill in the zero beat
+      beats = beats.unshift(
+        beats.first.merge({
+          confidence: 1,
+          s: 0.0,
+          ms: 0.0,
+          sample_no: 0,
+          rel_start: 0.0
+        })
+      )
+
+      # fetch the rel_end from the next beat
+      # using 1.0 for the last beat
+      beats = beats.each_cons(2).map {|a,b|
+        a.merge({
+          rel_end: (b[:rel_start] || 1.0)
+        })
+      }
+
+      # set minimum inter-onset interval in seconds
+      # allows for 4/4 at 400bpm (faster than most music)
+      # filters beats detected too closely together
+      minioi = @params[:minioi] || 0.15
+      filtered_beats = [beats.first]
+      beats.each do |b|
+        if (b[:s] - filtered_beats.last[:s]) > minioi
+          filtered_beats << b
+        end
+      end
+
+      # TODO: are there other smoothing methods that would be useful here?
+      filtered_beats
+    end
+
     def bpm
       check_for_closed
 
-      beat_locations = Beats.new(@source, @params).each.to_a
+      beat_locations = self.beats
       beat_periods = beat_locations.each_cons(2).map {|a,b| b[:s] - a[:s] }
 
       return 60.0 if beat_locations.length == 1

data/lib/aubio/beats.rb

@@ -1,51 +1,54 @@
 module Aubio
-	class Beats
+  class Beats
 
-		def initialize(aubio_source, params)
+    def initialize(aubio_source, params)
       # TODO: cleanup param dups
-			@sample_rate = params[:sample_rate] || 44100
-			@window_size = params[:window_size] || 1024
-			@hop_size    = params[:hop_size]    || 512
+      @sample_rate = params[:sample_rate] || 44100
+      @window_size = params[:window_size] || 1024
+      @hop_size    = params[:hop_size]    || 512
 
-			@source = aubio_source
-			@tempo = Api.new_aubio_tempo('specdiff', @window_size, @hop_size, @sample_rate)
+      @source = aubio_source
+      @tempo = Api.new_aubio_tempo('specdiff', @window_size, @hop_size, @sample_rate)
 
-			# create output for source
-			@sample_buffer = Api.new_fvec(@hop_size)
-			# create output for beat
-			@out_fvec = Api.new_fvec(1)
-		end
+      # create output for source
+      @sample_buffer = Api.new_fvec(@hop_size)
+      # create output for beat
+      @out_fvec = Api.new_fvec(1)
+    end
 
-		def each
-			return enum_for(:each) unless block_given?
+    def each
+      return enum_for(:each) unless block_given?
 
-			total_frames_counter = 0
-			read_buffer = FFI::MemoryPointer.new(:int)
+      total_frames_counter = 0
+      read_buffer = FFI::MemoryPointer.new(:int)
+      total_samples = Api.aubio_source_get_duration(@source).to_f
 
-			loop do
-				# Perform tempo calculation
+      loop do
+        # Perform tempo calculation
         Api.aubio_source_do(@source, @sample_buffer, read_buffer)
-				Api.aubio_tempo_do(@tempo, @sample_buffer, @out_fvec)
+        Api.aubio_tempo_do(@tempo, @sample_buffer, @out_fvec)
 
         # Retrieve result
-				is_beat = Api.fvec_get_sample(@out_fvec, 0)
+        is_beat = Api.fvec_get_sample(@out_fvec, 0)
         no_of_bytes_read = read_buffer.read_int
         total_frames_counter += no_of_bytes_read
 
         if is_beat > 0.0
-					tempo_seconds = Api.aubio_tempo_get_last_s(@tempo)
-					tempo_milliseconds = Api.aubio_tempo_get_last_ms(@tempo)
+          tempo_samples = Api.aubio_tempo_get_last(@tempo)
+          tempo_seconds = Api.aubio_tempo_get_last_s(@tempo)
+          tempo_milliseconds = Api.aubio_tempo_get_last_ms(@tempo)
           tempo_confidence = Api.aubio_tempo_get_confidence(@tempo)
 
-					output = {
+          output = {
             :confidence => tempo_confidence,
             :s => tempo_seconds,
             :ms => tempo_milliseconds,
-            :start => (tempo_seconds == 0.0 ? 1 : 0),
-            :end => 0
-					}
+            :sample_no => tempo_samples,
+            :total_samples => total_samples,
+            :rel_start => tempo_samples/total_samples
+          }
           yield output
-				end
+        end
 
         if no_of_bytes_read != @hop_size
           # there's no more audio to look at
@@ -56,8 +59,8 @@ module Aubio
             :confidence => 1.0,
             :s => total_time,
             :ms => total_time/1000.0,
-            :start => 0,
-            :end  => 1
+            :sample_no => total_samples,
+            :total_samples => total_samples
           }
           yield output
 
@@ -68,8 +71,8 @@ module Aubio
 
           break
         end
-			end
-		end
+      end
+    end
 
-	end
+  end
 end

data/lib/aubio/pitches.rb

@@ -1,34 +1,42 @@
 module Aubio
-	class Pitches
+  class Pitches
 
-		def initialize(aubio_source, params)
+    def initialize(aubio_source, params)
       # TODO: cleanup param dups
-			@sample_rate = params[:sample_rate] || 44100
-			@window_size = params[:window_size] || 1024
-			@hop_size    = params[:hop_size]    || 512
-
-			@source = aubio_source
-			@pitch = Api.new_aubio_pitch('yin', @window_size, @hop_size, @sample_rate)
-			Api.aubio_pitch_set_unit(@pitch, 'midi')
-			Api.aubio_pitch_set_tolerance(@pitch, 0.8)
-
-			# create output for source
-			@sample_buffer = Api.new_fvec(@hop_size)
-			# create output for pitch and beat
-			@out_fvec = Api.new_fvec(1)
-		end
-
-		def each
-			return enum_for(:each) unless block_given?
-
-			total_frames_counter = 0
-			read_buffer = FFI::MemoryPointer.new(:int)
+      @sample_rate = params[:sample_rate] || 44100
+      @window_size = params[:window_size] || 1024
+      @hop_size    = params[:hop_size]    || 512
+
+      # Set the tolerance for the pitch detection algorithm.
+      # Typical values range between 0.2 and 0.9.
+      # Pitch candidates found with a confidence less than this threshold will not be selected.
+      # The higher the threshold, the more confidence in the candidates.
+      @confidence_thresh  = params[:confidence_thresh]  || 0.9
+
+      @pitch_method = params[:pitch_method] || "yinfft"
+
+      @source = aubio_source
+      @pitch = Api.new_aubio_pitch(@pitch_method, @window_size, @hop_size, @sample_rate)
+      Api.aubio_pitch_set_unit(@pitch, 'midi')
+      Api.aubio_pitch_set_tolerance(@pitch, @confidence_thresh)
+
+      # create output for source
+      @sample_buffer = Api.new_fvec(@hop_size)
+      # create output for pitch and beat
+      @out_fvec = Api.new_fvec(1)
+    end
+
+    def each
+      return enum_for(:each) unless block_given?
+
+      total_frames_counter = 0
+      read_buffer = FFI::MemoryPointer.new(:int)
       last_pitch = 0
 
-			loop do
-				# Perform pitch calculation
+      loop do
+        # Perform pitch calculation
         Api.aubio_source_do(@source, @sample_buffer, read_buffer)
-				Api.aubio_pitch_do(@pitch, @sample_buffer, @out_fvec)
+        Api.aubio_pitch_do(@pitch, @sample_buffer, @out_fvec)
 
         # Retrieve result
         pitch = Api.fvec_get_sample(@out_fvec, 0)
@@ -36,15 +44,15 @@ module Aubio
         no_of_bytes_read = read_buffer.read_int
         total_frames_counter += no_of_bytes_read
 
-        if (last_pitch - pitch).abs >= 1 and confidence > 0.9
-					output = {
+        if (last_pitch - pitch).abs >= 1 and confidence > @confidence_thresh
+          output = {
             :pitch => pitch,
             :confidence => confidence,
             :start => (total_frames_counter == 0 ? 1 : 0),
             :end => 0
-					}
+          }
           yield output
-				end
+        end
 
         last_pitch = pitch
 
@@ -68,8 +76,8 @@ module Aubio
 
           break
         end
-			end
-		end
+      end
+    end
 
-	end
+  end
 end

data/lib/aubio/version.rb

@@ -1,3 +1,3 @@
 module Aubio
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aubio
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Xavier Riley