lame 0.0.2 → 0.0.3

data/lib/lame/ffi/functions.rb

@@ -182,7 +182,7 @@ module LAME
 
         # encoding
         attach_function :lame_encode_buffer,                         [:global_flags, :buffer_in, :buffer_in, :int, :buffer_out, :int], :int
-        attach_function :lame_encode_buffer_interleaved,             [:global_flags, :buffer_in, :buffer_in, :int, :buffer_out, :int], :int
+        attach_function :lame_encode_buffer_interleaved,             [:global_flags, :buffer_in,             :int, :buffer_out, :int], :int
         attach_function :lame_encode_buffer_float,                   [:global_flags, :buffer_in, :buffer_in, :int, :buffer_out, :int], :int
         attach_function :lame_encode_buffer_ieee_float,              [:global_flags, :buffer_in, :buffer_in, :int, :buffer_out, :int], :int
         attach_function :lame_encode_buffer_interleaved_ieee_float,  [:global_flags, :buffer_in,             :int, :buffer_out, :int],           :int

data/lib/lame/version.rb

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

data/spec/ffi/encoding_spec.rb

@@ -105,6 +105,15 @@ module LAME
 
         context "interleaved" do
 
+          context "short-buffer" do
+            let(:input_type) { :short }
+
+            it "encodes" do
+              return_code = LAME.lame_encode_buffer_interleaved(@flags_pointer, input_buffer_interleaved, input_buffer_size, output_buffer, output_buffer_size)
+              return_code.should >= 0
+            end
+          end
+
           context "ieee float-buffer" do
             let(:input_type) { :float }
 

data/spec/integration/decoding_spec.rb

@@ -24,9 +24,11 @@ describe "Decoding", :slow => true do
   end
 
   it "decodes an MP3 file" do
+    @debug = false
+
     # id3
     id3_length = id3_length(mp3_file)
-    puts "ID3 length: #{id3_length} bytes"
+    puts "ID3 length: #{id3_length} bytes" if @debug
     mp3_file.read(id3_length)
 
     # aid TODO (ignored for now)
@@ -34,7 +36,7 @@ describe "Decoding", :slow => true do
     # find MP3 sync frame
 
     mp3_offset = mpeg_audio_offset(mp3_file, id3_length)
-    puts "offset: #{mp3_offset}"
+    puts "offset: #{mp3_offset}" if @debug
 
     @decode_flags = LAME::FFI::DecodeFlags.new
     @mp3_data = LAME::FFI::MP3Data.new
@@ -46,7 +48,7 @@ describe "Decoding", :slow => true do
     end until @mp3_data.header_parsed?
 
     # Results:
-    if @mp3_data.header_parsed?
+    if @mp3_data.header_parsed? && @debug
       puts "stereo:      #{@mp3_data[:stereo]}"
       puts "samplerate:  #{@mp3_data[:samplerate]}"
       puts "bitrate:     #{@mp3_data[:bitrate]}"
@@ -95,7 +97,7 @@ describe "Decoding", :slow => true do
 
     result = LAME.hip_decode1_headersB(@decode_flags, in_buffer, size, out_left, out_right, @mp3_data, enc_delay, enc_padding)
 
-    if @mp3_data.header_parsed?
+    if @mp3_data.header_parsed? && @debug
       puts "header parsed @ #{mp3_file.pos}"
       puts "enc_delay:   #{enc_delay.read_array_of_int(1)}"
       puts "enc_padding: #{enc_padding.read_array_of_int(1)}"
@@ -151,7 +153,7 @@ describe "Decoding", :slow => true do
       in_data = mp3_file.read(window_size)
 
       if LAME::Decoding::MPEGAudioFrameMatcher.new(in_data).match?
-        puts "match offset @ #{offset} : #{in_data.bytes.to_a[0].to_s(2)} #{in_data.bytes.to_a[1].to_s(2)} #{in_data.bytes.to_a[2].to_s(2)} #{in_data.bytes.to_a[3].to_s(2)}"
+        puts "match offset @ #{offset} : #{in_data.bytes.to_a[0].to_s(2)} #{in_data.bytes.to_a[1].to_s(2)} #{in_data.bytes.to_a[2].to_s(2)} #{in_data.bytes.to_a[3].to_s(2)}" if @debug
         return offset
       end
 

data/spec/integration/encoding_spec.rb

@@ -63,6 +63,30 @@ describe "Encoding", :slow => true do
     # Digest::MD5.hexdigest(File.read(mp3_path_api)).should eql "d1cd92c106e7aac4f5291fd141a19e10"
   end
 
+  it "encodes a file using interleaved api" do
+
+    encoder = LAME::Encoder.new
+
+    encoder.configure do |config|
+      config.bitrate = 192
+    end
+
+    File.open(mp3_path_api, "wb") do |file|
+
+      wav_reader.each_buffer(encoder.framesize) do |read_buffer|
+        encoder.encode_interleaved_short(read_buffer.samples.flatten) do |mp3|
+          file.write mp3
+        end
+      end
+      encoder.flush do |flush_frame|
+        file.write(flush_frame)
+      end
+    end
+
+    # TODO: Need a better way to test output..
+    # Digest::MD5.hexdigest(File.read(mp3_path_api)).should eql "d1cd92c106e7aac4f5291fd141a19e10"
+  end
+
   # This test serves as an example how to use the LAME API
   it "encodes a wav file" do
 

metadata

@@ -2,7 +2,7 @@
 name: lame
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Roel van Dijk
@@ -213,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: -3758969818972899808
+      hash: 220624676423183308
       segments:
       - 0
       version: '0'
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: -3758969818972899808
+      hash: 220624676423183308
       segments:
       - 0
       version: '0'