lame 0.0.3 → 0.0.4

data/spec/ffi/id3tag_spec.rb

@@ -20,75 +20,75 @@ module LAME
 
       LAME.id3tag_genre_list(genre_collector_callback, nil)
 
-      genres.should have(148).items
-      genres[0].should eql "Blues"
-      genres[147].should eql "SynthPop"
+      expect(genres.length).to be(148)
+      expect(genres[0]).to eql "Blues"
+      expect(genres[147]).to eql "SynthPop"
     end
 
     it "initializes" do
-      LAME.id3tag_init(@flags_pointer).should eql nil
+      expect(LAME.id3tag_init(@flags_pointer)).to eql nil
     end
 
     it "adds v2" do
-      LAME.id3tag_add_v2(@flags_pointer).should eql nil
+      expect(LAME.id3tag_add_v2(@flags_pointer)).to eql nil
     end
 
     it "set v1 only" do
-      LAME.id3tag_v1_only(@flags_pointer).should eql nil
+      expect(LAME.id3tag_v1_only(@flags_pointer)).to eql nil
     end
 
     it "set v2 only" do
-      LAME.id3tag_v2_only(@flags_pointer).should eql nil
+      expect(LAME.id3tag_v2_only(@flags_pointer)).to eql nil
     end
 
     it "pads with spaces" do
-      LAME.id3tag_space_v1(@flags_pointer).should eql nil
+      expect(LAME.id3tag_space_v1(@flags_pointer)).to eql nil
     end
 
     it "pads v2 with 128 extra bytes" do
-      LAME.id3tag_pad_v2(@flags_pointer).should eql nil
+      expect(LAME.id3tag_pad_v2(@flags_pointer)).to eql nil
     end
 
     it "pads v2 with extra bytes" do
-      LAME.id3tag_set_pad(@flags_pointer, 256).should eql nil
+      expect(LAME.id3tag_set_pad(@flags_pointer, 256)).to eql nil
     end
 
     it "sets the title" do
-      LAME.id3tag_set_title(@flags_pointer, pointer_from_string("foo")).should eql nil
+      expect(LAME.id3tag_set_title(@flags_pointer, pointer_from_string("foo"))).to eql nil
     end
 
     it "sets the artist" do
-      LAME.id3tag_set_artist(@flags_pointer, pointer_from_string("foo")).should eql nil
+      expect(LAME.id3tag_set_artist(@flags_pointer, pointer_from_string("foo"))).to eql nil
     end
 
     it "sets the album" do
-      LAME.id3tag_set_album(@flags_pointer, pointer_from_string("foo")).should eql nil
+      expect(LAME.id3tag_set_album(@flags_pointer, pointer_from_string("foo"))).to eql nil
     end
 
     it "sets the year" do
-      LAME.id3tag_set_year(@flags_pointer, pointer_from_string("foo")).should eql nil
+      expect(LAME.id3tag_set_year(@flags_pointer, pointer_from_string("foo"))).to eql nil
     end
 
     it "sets the comment" do
-      LAME.id3tag_set_comment(@flags_pointer, pointer_from_string("foo")).should eql nil
+      expect(LAME.id3tag_set_comment(@flags_pointer, pointer_from_string("foo"))).to eql nil
     end
 
     it "sets the track" do
-      LAME.id3tag_set_track(@flags_pointer, pointer_from_string("1")).should eql 0
+      expect(LAME.id3tag_set_track(@flags_pointer, pointer_from_string("1"))).to eql 0
     end
 
     it "ignores out of range track numbers for id3" do
-      LAME.id3tag_set_track(@flags_pointer, pointer_from_string("256")).should eql -1
+      expect(LAME.id3tag_set_track(@flags_pointer, pointer_from_string("256"))).to eql -1
     end
 
     it "sets the genre" do
-      LAME.id3tag_set_genre(@flags_pointer, pointer_from_string("Rock")).should eql 0
+      expect(LAME.id3tag_set_genre(@flags_pointer, pointer_from_string("Rock"))).to eql 0
     end
 
     # There is a fixed set of allowed fields (see id3tag.c)
     # LAME 3.99.4 fixed some bugs in setting field values, this could crash for certain tags.
     it "sets the fieldvalue" do
-      LAME.id3tag_set_fieldvalue(@flags_pointer, pointer_from_string("TIT2=foofoo")).should eql 0
+      expect(LAME.id3tag_set_fieldvalue(@flags_pointer, pointer_from_string("TIT2=foofoo"))).to eql 0
     end
 
     # it "sets the fieldvalue (utf16)" do
@@ -103,7 +103,7 @@ module LAME
       buffer.put_char(0, 0xff)
       buffer.put_char(1, 0xd8)
 
-      LAME.id3tag_set_albumart(@flags_pointer, buffer, buffer_size).should eql 0
+      expect(LAME.id3tag_set_albumart(@flags_pointer, buffer, buffer_size)).to eql 0
     end
 
     it "creates id3v1 tag" do
@@ -111,7 +111,7 @@ module LAME
       buffer = ::FFI::MemoryPointer.new(:uchar, buffer_size)
       LAME.id3tag_set_title(@flags_pointer, pointer_from_string("foo"))
       LAME.id3tag_set_album(@flags_pointer, pointer_from_string("bar"))
-      LAME.lame_get_id3v1_tag(@flags_pointer, buffer, buffer_size).should eql 128
+      expect(LAME.lame_get_id3v1_tag(@flags_pointer, buffer, buffer_size)).to eql 128
     end
 
     it "creates id3v2 tag" do
@@ -120,15 +120,15 @@ module LAME
       LAME.id3tag_add_v2(@flags_pointer)
       LAME.id3tag_set_title(@flags_pointer, pointer_from_string("foo"))
       LAME.id3tag_set_album(@flags_pointer, pointer_from_string("bar"))
-      LAME.lame_get_id3v2_tag(@flags_pointer, buffer, buffer_size).should eql 38
+      expect(LAME.lame_get_id3v2_tag(@flags_pointer, buffer, buffer_size)).to eql 38
     end
 
     it "sets id3tag automatic" do
-      LAME.should have_flag(:write_id3tag_automatic).with_value(1).for(@flags_pointer)
+      expect(LAME).to have_flag(:write_id3tag_automatic).with_value(1).for(@flags_pointer)
     end
 
     it "gets id3tag automatic" do
-      LAME.should be_able_to_set(:write_id3tag_automatic).to(0).for(@flags_pointer).and_return(nil)
+      expect(LAME).to be_able_to_set(:write_id3tag_automatic).to(0).for(@flags_pointer).and_return(nil)
     end
 
   end

data/spec/ffi/mp3_data_spec.rb

@@ -8,17 +8,17 @@ module LAME
 
       it "is stereo for two channels" do
         mp3_data[:stereo] = 2
-        mp3_data.channel_mode.should eql :stereo
+        expect(mp3_data.channel_mode).to eql :stereo
       end
 
       it "is mono for one channel" do
         mp3_data[:stereo] = 1
-        mp3_data.channel_mode.should eql :mono
+        expect(mp3_data.channel_mode).to eql :mono
       end
 
       it "has a sample rate" do
         mp3_data[:samplerate] = 44100
-        mp3_data.sample_rate.should eql 44100
+        expect(mp3_data.sample_rate).to eql 44100
       end
 
     end

data/spec/integration/encoding_spec.rb

@@ -4,13 +4,19 @@ require 'wavefile'
 
 describe "Encoding", :slow => true do
 
+  # regular 16-bit, 44.1kHz sine wave:
   let(:wav_file) { WaveFileGenerator.new(:length => 2).generate }
   let(:wav_path) { wav_file.path }
+  let(:wav_reader) { WaveFile::Reader.new(wav_path) }
+
+  # 24-bit, 192kHz sine wave:
+  let(:wav_file_24) { WaveFileGenerator.new(length: 2, bits: 24, sample_rate: 192000).generate }
+  let(:wav_path_24) { wav_file_24.path }
+  let(:wav_reader_24) { WaveFile::Reader.new(wav_path_24) }
+
   let(:mp3_path_raw) { Tempfile.new("output-raw.mp3") }
   let(:mp3_path_api) { Tempfile.new("output-api.mp3") }
 
-  let(:wav_reader) { WaveFile::Reader.new(wav_path) }
-
   it "encodes a file by api" do
 
     encoder = LAME::Encoder.new
@@ -87,7 +93,7 @@ describe "Encoding", :slow => true do
     # Digest::MD5.hexdigest(File.read(mp3_path_api)).should eql "d1cd92c106e7aac4f5291fd141a19e10"
   end
 
-  # This test serves as an example how to use the LAME API
+  # This test serves as an example how to use the LAME C-API
   it "encodes a wav file" do
 
    # setup
@@ -148,4 +154,70 @@ describe "Encoding", :slow => true do
     # Digest::MD5.hexdigest(File.read(mp3_path_raw)).should eql "84a1ce7994bb4a54fc13fb5381ebac40"
   end
 
+  it "encodes 24-bit source files using the long encoder" do
+    encoder = LAME::Encoder.new
+
+    encoder.configure do |config|
+      config.input_samplerate = 192000
+      config.id3.write_automatic = false
+      config.vbr.mode = :vbr_default
+      config.vbr.q = 0
+    end
+
+    File.open(mp3_path_api, "wb") do |file|
+
+      wav_reader_24.each_buffer(encoder.framesize) do |read_buffer|
+        # important: shift the 24-bit samples to the system's long-size (32/64-bit)
+        left  = read_buffer.samples.map { |s| s[0] << (::LAME::FFI::LONG_SIZE-24) }
+        right = read_buffer.samples.map { |s| s[1] << (::LAME::FFI::LONG_SIZE-24) }
+
+        encoder.encode_long(left, right) do |mp3|
+          file.write mp3
+        end
+      end
+      encoder.flush do |flush_frame|
+        file.write(flush_frame)
+      end
+
+      encoder.vbr_frame do |vbr_frame|
+        file.write(vbr_frame)
+      end
+
+    end
+  end
+
+  it "encodes 24-bit source files using the float encoder" do
+    encoder = LAME::Encoder.new
+
+    encoder.configure do |config|
+      config.input_samplerate = 192000
+      config.id3.write_automatic = false
+      config.vbr.mode = :vbr_default
+      config.vbr.q = 0
+    end
+
+    max24 = 2**24/2.0
+
+    File.open(mp3_path_api, "wb") do |file|
+
+      wav_reader_24.each_buffer(encoder.framesize) do |read_buffer|
+        # important: scale the 24-bit input values to floats between -1.0 and +1.0
+        left  = read_buffer.samples.map { |s| s[0] / max24 }
+        right = read_buffer.samples.map { |s| s[1] / max24 }
+
+        encoder.encode_float(left, right) do |mp3|
+          file.write mp3
+        end
+      end
+      encoder.flush do |flush_frame|
+        file.write(flush_frame)
+      end
+
+      encoder.vbr_frame do |vbr_frame|
+        file.write(vbr_frame)
+      end
+
+    end
+  end
+
 end

data/spec/integration/id3_tags_spec.rb

@@ -13,17 +13,17 @@ describe "ID3 tags", :slow => true do
     encode_wav_file(false)
 
     Mp3Info.open(mp3_id3_path) do |info|
-      info.hastag1?.should be_true
-      info.hastag2?.should be_false
+      expect(info.hastag1?).to be_truthy
+      expect(info.hastag2?).to be_falsy
 
       tags = info.tag1
-      tags["title"].should    eql "title"
-      tags["artist"].should   eql "artist"
-      tags["album"].should    eql "album"
-      tags["year"].should     eql 2013
-      tags["comments"].should eql "comment"
-      tags["tracknum"].should eql 42
-      tags["genre_s"].should  eql "Rock"
+      expect(tags["title"]).to    eql "title"
+      expect(tags["artist"]).to   eql "artist"
+      expect(tags["album"]).to    eql "album"
+      expect(tags["year"]).to     eql 2013
+      expect(tags["comments"]).to eql "comment"
+      expect(tags["tracknum"]).to eql 42
+      expect(tags["genre_s"]).to  eql "Rock"
     end
   end
 
@@ -31,17 +31,17 @@ describe "ID3 tags", :slow => true do
     encode_wav_file
 
     Mp3Info.open(mp3_id3_path) do |info|
-      info.hastag1?.should be_true
-      info.hastag2?.should be_true
+      expect(info.hastag1?).to be_truthy
+      expect(info.hastag2?).to be_truthy
 
       tags = info.tag2
-      tags["TIT2"].should eql "title"
-      tags["TPE1"].should eql "artist"
-      tags["TALB"].should eql "album"
-      tags["TYER"].should eql "2013"
-      tags["COMM"].should eql "comment"
-      tags["TRCK"].should eql "42"
-      tags["TCON"].should eql "Rock"
+      expect(tags["TIT2"]).to eql "title"
+      expect(tags["TPE1"]).to eql "artist"
+      expect(tags["TALB"]).to eql "album"
+      expect(tags["TYER"]).to eql "2013"
+      expect(tags["COMM"]).to eql "comment"
+      expect(tags["TRCK"]).to eql "42"
+      expect(tags["TCON"]).to eql "Rock"
     end
   end
 

data/spec/lib/custom_matchers.rb

@@ -56,7 +56,7 @@ RSpec::Matchers.define :have_getter do |expected|
       has_value?(actual, expected)
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     if !has_getter?(actual, expected)
       "expected that #{actual} would have a getter for field :#{expected}"
     elsif @value && !has_value?(actual, expected)
@@ -83,7 +83,7 @@ RSpec::Matchers.define :delegate do |from|
   end
 
   def delegates_setter?
-    LAME.should_receive(:"lame_set_#{target}").with(subject.global_flags, anything)
+    expect(LAME).to receive(:"lame_set_#{target}").with(subject.global_flags, anything)
     subject.send(:"#{from}=", double)
     true
   rescue => e
@@ -92,7 +92,7 @@ RSpec::Matchers.define :delegate do |from|
   end
 
   def delegates_getter?
-    LAME.should_receive(:"lame_get_#{target}").with(subject.global_flags)
+    expect(LAME).to receive(:"lame_get_#{target}").with(subject.global_flags)
     subject.send(:"#{from}")
     true
   rescue => e
@@ -100,7 +100,7 @@ RSpec::Matchers.define :delegate do |from|
     false
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "expected #{subject.class} to delegate :#{from} to LAME.lame_set_#{target}"
   end
 

data/spec/lib/wave_file_generator.rb

@@ -1,20 +1,20 @@
 class WaveFileGenerator
-  attr_accessor :mode, :bits, :bitrate, :length, :hertz
+  attr_accessor :mode, :bits, :sample_rate, :length, :hertz
 
   def initialize(options = {})
-    @mode    = options[:mode]   || :stereo
-    @bits    = options[:bits]   || 16
-    @bitrate = options[:bitate] || 44100
-    @length  = options[:length] || 1
-    @hertz   = options[:hertz]  || 440
+    @mode        = options[:mode]   || :stereo
+    @bits        = options[:bits]   || 16
+    @sample_rate = options[:sample_rate] || 44100
+    @length      = options[:length] || 1
+    @hertz       = options[:hertz]  || 440
   end
 
   def generate
     wav_file = Tempfile.new('sine.wav')
 
-    format = WaveFile::Format.new(mode, pcm_type, bitrate)
+    format = WaveFile::Format.new(mode, pcm_type, sample_rate)
     WaveFile::Writer.new(wav_file.path, format) do |writer|
-      samples = (0...bitrate*length).map do |offset|
+      samples = (0...sample_rate*length).map do |offset|
         sample = (Math.sin((Math::PI*2 / scale) * offset) * max).round
         [sample, sample]
       end
@@ -31,7 +31,7 @@ class WaveFileGenerator
   end
 
   def scale
-    bitrate / hertz
+    sample_rate / hertz
   end
 
   def pcm_type

data/spec/spec_helper.rb

@@ -19,7 +19,6 @@ require 'lib/setter_getter'
 require 'lib/custom_matchers'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.order = 'random'

metadata

@@ -1,128 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: lame
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Roel van Dijk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  name: ffi
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
   type: :development
   prerelease: false
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
   type: :development
   prerelease: false
-  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+- !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
   type: :development
   prerelease: false
-  name: pry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+- !ruby/object:Gem::Dependency
+  name: wavefile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
   type: :development
   prerelease: false
-  name: wavefile
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+- !ruby/object:Gem::Dependency
+  name: ruby-mp3info
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
   type: :development
   prerelease: false
-  name: ruby-mp3info
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+- !ruby/object:Gem::Dependency
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
   type: :development
   prerelease: false
-  name: coveralls
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 description: FFI powered library for the LAME MP3 encoder.
 email:
 - roel@rustradio.org
@@ -205,33 +190,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/rdvdijk/lame
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      hash: 220624676423183308
-      segments:
-      - 0
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      hash: 220624676423183308
-      segments:
-      - 0
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easily encode MP3 files using the LAME MP3 encoder.
 test_files:
 - spec/buffer_spec.rb