lame 0.0.3 → 0.0.5

data/lame.gemspec

@@ -24,5 +24,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "pry"
   gem.add_development_dependency "wavefile"
   gem.add_development_dependency "ruby-mp3info"
-  gem.add_development_dependency "coveralls"
+  gem.add_development_dependency "simplecov", "~> 0.22"
+  gem.add_development_dependency "simplecov-lcov", "~> 0.8"
 end

data/lib/lame/buffer.rb

@@ -3,7 +3,7 @@ module LAME
 
     def self.create(type, input)
       buffer = ::FFI::MemoryPointer.new(type, input.size)
-      buffer.put_array_of_short(0, input)
+      buffer.send(:"put_array_of_#{type}", 0, input)
       buffer
     end
 

data/lib/lame/encoder.rb

@@ -1,15 +1,12 @@
 module LAME
   class Encoder
 
-    STEREO_ENCODERS = {
+    BUFFER_ENCODERS = {
       :short => Encoding::ShortBufferEncoder,
       :float => Encoding::FloatBufferEncoder,
-      :long => Encoding::LongBufferEncoder
-    }
-
-    INTERLEAVED_ENCODERS = {
-      :short => Encoding::InterleavedShortBufferEncoder,
-      :float => Encoding::InterleavedFloatBufferEncoder
+      :long  => Encoding::LongBufferEncoder,
+      :short_interleaved => Encoding::InterleavedShortBufferEncoder,
+      :float_interleaved => Encoding::InterleavedFloatBufferEncoder
     }
 
     attr_reader :global_flags
@@ -36,11 +33,11 @@ module LAME
     end
 
     def encode_interleaved_short(samples, &block)
-      encode_interleaved(samples, :short, &block)
+      encode_interleaved(samples, :short_interleaved, &block)
     end
 
     def encode_interleaved_float(samples, &block)
-      encode_interleaved(samples, :float, &block)
+      encode_interleaved(samples, :float_interleaved, &block)
     end
 
     def flush(&block)
@@ -81,7 +78,8 @@ module LAME
       apply_configuration
 
       each_frame(left, right) do |left_frame, right_frame|
-        mp3_data = STEREO_ENCODERS[data_type].new(configuration).encode_frame(left_frame, right_frame)
+        encoder = BUFFER_ENCODERS[data_type].new(configuration)
+        mp3_data = encoder.encode_frame(left_frame, right_frame)
         yield mp3_data
       end
     end
@@ -90,7 +88,8 @@ module LAME
       apply_configuration
 
       each_interleaved_frame(interleaved_samples) do |interleaved_frame|
-        mp3_data = INTERLEAVED_ENCODERS[data_type].new(configuration).encode_frame(interleaved_frame)
+        encoder = BUFFER_ENCODERS[data_type].new(configuration)
+        mp3_data = encoder.encode_frame(interleaved_frame)
         yield mp3_data
       end
     end

data/lib/lame/encoding/interleaved_int_buffer_encoder.rb

@@ -0,0 +1,15 @@
+module LAME
+  module Encoding
+    class InterleavedIntBufferEncoder < InterleavedBufferEncoder
+
+      def data_type
+        :int
+      end
+
+      def lame_function
+        :lame_encode_buffer_interleaved_int
+      end
+
+    end
+  end
+end

data/lib/lame/encoding/long_buffer_encoder.rb

@@ -3,7 +3,7 @@ module LAME
     class LongBufferEncoder < StereoBufferEncoder
 
       def data_type
-        :long
+        :"int#{::LAME::FFI::LONG_SIZE}"
       end
 
       def lame_function

data/lib/lame/encoding/stereo_buffer_encoder.rb

@@ -14,6 +14,7 @@ module LAME
       def encode_frame(left, right)
         left_buffer  = Buffer.create(data_type, left)
         right_buffer = Buffer.create(data_type, right)
+
         output       = Buffer.create_empty(:uchar, output_buffer_size)
 
         mp3_size = LAME.send(lame_function, global_flags,

data/lib/lame/ffi/functions.rb

@@ -75,22 +75,22 @@ module LAME
         attach_function :lame_get_strict_ISO,         [:global_flags],               :int
 
         # quantization/noise shaping
-        attach_function :lame_set_disable_reservoir, [:global_flags, :int],    :int
-        attach_function :lame_get_disable_reservoir, [:global_flags],          :int
-        attach_function :lame_set_quant_comp,        [:global_flags, :int],    :int
-        attach_function :lame_get_quant_comp,        [:global_flags],          :int
-        attach_function :lame_set_quant_comp_short,  [:global_flags, :int],    :int
-        attach_function :lame_get_quant_comp_short,  [:global_flags],          :int
-        attach_function :lame_set_experimentalX,     [:global_flags, :int],    :int
-        attach_function :lame_get_experimentalX,     [:global_flags],          :int
-        attach_function :lame_set_experimentalY,     [:global_flags, :int],    :int
-        attach_function :lame_get_experimentalY,     [:global_flags],          :int
-        attach_function :lame_set_experimentalZ,     [:global_flags, :int],    :int
-        attach_function :lame_get_experimentalZ,     [:global_flags],          :int
-        attach_function :lame_set_exp_nspsytune,     [:global_flags, :int],    :int
-        attach_function :lame_get_exp_nspsytune,     [:global_flags],          :int
-        attach_function :lame_set_msfix,             [:global_flags, :double], :void
-        attach_function :lame_get_msfix,             [:global_flags],          :float
+        attach_function :lame_set_disable_reservoir,             [:global_flags, :int],    :int
+        attach_function :lame_get_disable_reservoir,             [:global_flags],          :int
+        attach_function :lame_set_quant_comp,                    [:global_flags, :int],    :int
+        attach_function :lame_get_quant_comp,                    [:global_flags],          :int
+        attach_function :lame_set_quant_comp_short,              [:global_flags, :int],    :int
+        attach_function :lame_get_quant_comp_short,              [:global_flags],          :int
+        attach_function :lame_set_experimentalX,                 [:global_flags, :int],    :int
+        attach_function :lame_get_experimentalX,                 [:global_flags],          :int
+        attach_function :lame_set_experimentalY,                 [:global_flags, :int],    :int
+        attach_function :lame_get_experimentalY,                 [:global_flags],          :int
+        attach_function :lame_set_experimentalZ,                 [:global_flags, :int],    :int
+        attach_function :lame_get_experimentalZ,                 [:global_flags],          :int
+        attach_function :lame_set_exp_nspsytune,                 [:global_flags, :int],    :int
+        attach_function :lame_get_exp_nspsytune,                 [:global_flags],          :int
+        attach_function :native_lame_set_msfix, :lame_set_msfix, [:global_flags, :double], :void
+        attach_function :lame_get_msfix,                         [:global_flags],          :float
 
         # VBR
         attach_function :lame_set_VBR,                   [:global_flags, :vbr_mode], :int
@@ -174,7 +174,7 @@ module LAME
         attach_function :get_lame_url,                [], :string
         attach_function :get_lame_os_bitness,         [], :string
 
-        attach_function :get_lame_version_numerical,  [:global_flags], FFI::Version.by_value
+        attach_function :get_lame_version_numerical,  [:global_flags], :void
 
         # TODO: test when we have implemented lame_set_msgf
         attach_function :lame_print_config,    [:global_flags], :void
@@ -191,6 +191,7 @@ module LAME
         attach_function :lame_encode_buffer_long,                    [:global_flags, :buffer_in, :buffer_in, :int, :buffer_out, :int], :int
         attach_function :lame_encode_buffer_long2,                   [:global_flags, :buffer_in, :buffer_in, :int, :buffer_out, :int], :int
         attach_function :lame_encode_buffer_int,                     [:global_flags, :buffer_in, :buffer_in, :int, :buffer_out, :int], :int
+        attach_function :lame_encode_buffer_interleaved_int,         [:global_flags, :buffer_in,             :int, :buffer_out, :int], :int
 
         # flushing
         attach_function :lame_encode_flush,       [:global_flags, :pointer, :int], :int
@@ -233,27 +234,27 @@ module LAME
 
         # id3
         callback :genre_callback, [:int, :string, :pointer], :void
-        attach_function :id3tag_genre_list, [:genre_callback, :pointer], :void
-        attach_function :id3tag_init,                     [:global_flags], :void
-        attach_function :id3tag_add_v2,                   [:global_flags], :void
-        attach_function :id3tag_v1_only,                  [:global_flags], :void
-        attach_function :id3tag_v2_only,                  [:global_flags], :void
-        attach_function :id3tag_space_v1,                 [:global_flags], :void
-        attach_function :id3tag_pad_v2,                   [:global_flags], :void
-        attach_function :id3tag_set_pad,                  [:global_flags, :size_t], :void
-        attach_function :id3tag_set_title,                [:global_flags, :pointer], :void
-        attach_function :id3tag_set_artist,               [:global_flags, :pointer], :void
-        attach_function :id3tag_set_album,                [:global_flags, :pointer], :void
-        attach_function :id3tag_set_year,                 [:global_flags, :pointer], :void
-        attach_function :id3tag_set_comment,              [:global_flags, :pointer], :void
-        attach_function :id3tag_set_track,                [:global_flags, :pointer], :int
-        attach_function :id3tag_set_genre,                [:global_flags, :pointer], :int
-        attach_function :id3tag_set_fieldvalue,           [:global_flags, :pointer], :int
-        attach_function :id3tag_set_albumart,             [:global_flags, :buffer_in, :size_t], :int
-        attach_function :lame_get_id3v1_tag,              [:global_flags, :buffer_out, :size_t], :size_t
-        attach_function :lame_get_id3v2_tag,              [:global_flags, :buffer_out, :size_t], :size_t
-        attach_function :lame_set_write_id3tag_automatic, [:global_flags, :int], :void
-        attach_function :lame_get_write_id3tag_automatic, [:global_flags], :int
+        attach_function :id3tag_genre_list,                              [:genre_callback, :pointer], :void
+        attach_function :native_id3tag_init,        :id3tag_init,        [:global_flags], :void
+        attach_function :native_id3tag_add_v2,      :id3tag_add_v2,      [:global_flags], :void
+        attach_function :native_id3tag_v1_only,     :id3tag_v1_only,     [:global_flags], :void
+        attach_function :native_id3tag_v2_only,     :id3tag_v2_only,     [:global_flags], :void
+        attach_function :native_id3tag_space_v1,    :id3tag_space_v1,    [:global_flags], :void
+        attach_function :native_id3tag_pad_v2,      :id3tag_pad_v2,      [:global_flags], :void
+        attach_function :native_id3tag_set_pad,     :id3tag_set_pad,     [:global_flags, :size_t], :void
+        attach_function :native_id3tag_set_title,   :id3tag_set_title,   [:global_flags, :pointer], :void
+        attach_function :native_id3tag_set_artist,  :id3tag_set_artist,  [:global_flags, :pointer], :void
+        attach_function :native_id3tag_set_album,   :id3tag_set_album,   [:global_flags, :pointer], :void
+        attach_function :native_id3tag_set_year,    :id3tag_set_year,    [:global_flags, :pointer], :void
+        attach_function :native_id3tag_set_comment, :id3tag_set_comment, [:global_flags, :pointer], :void
+        attach_function :id3tag_set_track,                               [:global_flags, :pointer], :int
+        attach_function :id3tag_set_genre,                               [:global_flags, :pointer], :int
+        attach_function :id3tag_set_fieldvalue,                          [:global_flags, :pointer], :int
+        attach_function :id3tag_set_albumart,                            [:global_flags, :buffer_in, :size_t], :int
+        attach_function :lame_get_id3v1_tag,                             [:global_flags, :buffer_out, :size_t], :size_t
+        attach_function :lame_get_id3v2_tag,                             [:global_flags, :buffer_out, :size_t], :size_t
+        attach_function :native_lame_set_write_id3tag_automatic, :lame_set_write_id3tag_automatic, [:global_flags, :int], :void
+        attach_function :lame_get_write_id3tag_automatic,  [:global_flags], :int
         # experimental id3:
         # attach_function :id3tag_set_textinfo_latin1,      [:global_flags, :string, :string], :int
         # attach_function :id3tag_set_comment_latin1,       [:global_flags, :string, :string, :string], :int
@@ -264,6 +265,66 @@ module LAME
         # tables
         attach_function :lame_get_bitrate,    [:int, :int], :int
         attach_function :lame_get_samplerate, [:int, :int], :int
+      end
+
+      # for truffleruby compatibility, return nil explicitly
+      base.singleton_class.class_eval do
+        def lame_set_msfix(global_flags, double)
+          native_lame_set_msfix(global_flags, double)
+          nil
+        end
+        def id3tag_init(global_flags)
+          native_id3tag_init(global_flags)
+          nil
+        end
+        def id3tag_add_v2(global_flags)
+          native_id3tag_add_v2(global_flags)
+          nil
+        end
+        def id3tag_v1_only(global_flags)
+          native_id3tag_v1_only(global_flags)
+          nil
+        end
+        def id3tag_v2_only(global_flags)
+          native_id3tag_v2_only(global_flags)
+          nil
+        end
+        def id3tag_space_v1(global_flags)
+          native_id3tag_space_v1(global_flags)
+          nil
+        end
+        def id3tag_pad_v2(global_flags)
+          native_id3tag_pad_v2(global_flags)
+          nil
+        end
+        def id3tag_set_pad(global_flags, size_t)
+          native_id3tag_set_pad(global_flags, size_t)
+          nil
+        end
+        def id3tag_set_title(global_flags, pointer)
+          native_id3tag_set_title(global_flags, pointer)
+          nil
+        end
+        def id3tag_set_artist(global_flags, pointer)
+          native_id3tag_set_artist(global_flags, pointer)
+          nil
+        end
+        def id3tag_set_album(global_flags, pointer)
+          native_id3tag_set_album(global_flags, pointer)
+          nil
+        end
+        def id3tag_set_year(global_flags, pointer)
+          native_id3tag_set_year(global_flags, pointer)
+          nil
+        end
+        def id3tag_set_comment(global_flags, pointer)
+          native_id3tag_set_comment(global_flags, pointer)
+          nil
+        end
+        def lame_set_write_id3tag_automatic(global_flags, int)
+          native_lame_set_write_id3tag_automatic(global_flags, int)
+          nil
+        end
 
       end
     end

data/lib/lame/ffi.rb

@@ -9,6 +9,8 @@ require 'lame/ffi/mp3_data'
 module LAME
   module FFI
 
+    LONG_SIZE = ::FFI.type_size(:long) * 8
+
     def self.included(base)
       base.class_eval do
         include Enums

data/lib/lame/version.rb

@@ -1,3 +1,3 @@
 module LAME
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/lib/lame.rb

@@ -1,4 +1,5 @@
 require "ffi"
+require "forwardable"
 require "lame/version"
 require "lame/ffi"
 require "lame/error"
@@ -13,6 +14,7 @@ require "lame/encoding/long_buffer_encoder"
 require "lame/encoding/interleaved_buffer_encoder"
 require "lame/encoding/interleaved_short_buffer_encoder"
 require "lame/encoding/interleaved_float_buffer_encoder"
+require "lame/encoding/interleaved_int_buffer_encoder"
 require "lame/encoding/flusher"
 require "lame/encoding/id3"
 require "lame/encoding/vbr_info"

data/spec/buffer_spec.rb

@@ -7,19 +7,19 @@ module LAME
       input = [-42, 0, 42]
       buffer = Buffer.create(:short, input)
 
-      buffer.should be_a(::FFI::MemoryPointer)
-      buffer.size.should eql 6 # shorts are two bytes
-      buffer.type_size.should eql 2
-      buffer.get_array_of_short(0, 3).should eql [-42, 0, 42]
+      expect(buffer).to be_a(::FFI::MemoryPointer)
+      expect(buffer.size).to eql 6 # shorts are two bytes
+      expect(buffer.type_size).to eql 2
+      expect(buffer.get_array_of_short(0, 3)).to eql [-42, 0, 42]
     end
 
     it "creates an empty buffer" do
       buffer = Buffer.create_empty(:uchar, 100)
 
-      buffer.should be_a(::FFI::MemoryPointer)
-      buffer.size.should eql 100
-      buffer.type_size.should eql 1
-      buffer.get_array_of_uchar(0, 100).should eql [0]*100
+      expect(buffer).to be_a(::FFI::MemoryPointer)
+      expect(buffer.size).to eql 100
+      expect(buffer.type_size).to eql 1
+      expect(buffer.get_array_of_uchar(0, 100)).to eql [0]*100
     end
 
   end