ruby-mp3info 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 421738e99b09100f70bdf70796c8f700b8a2abfd
-  data.tar.gz: c3d33ce01228e74e48ceee95696f422800f40323
+  metadata.gz: ce2fb0b472edc42655b9a42724e7b1cce5562251
+  data.tar.gz: b33e20ee08abbbf98fe6305ea2a2d034389459cf
 SHA512:
-  metadata.gz: 8265aa027cb141ea232c63b3209f9b3e4e42d02cae25626078d2e7eed4d7c972f14b4804195e32c58e5eb42a8ede15da3ecc638a6d1329cf5ebce0a8c172ce54
-  data.tar.gz: f8c3f0d2128173c554f584f0c8b636abe00ae8311b48d4b65003cddc87baf49db074b4fa04fd4f118ad42fa1d65501b95a1634b012055359b9a38a57b2ab401a
+  metadata.gz: 9dc4dd6b85ab4a3cda9f826ec5450b046d4a1e57b0bca72f7ca65aa337f532e8124a0491e3e374e74c2a027ed0bc6cb7cf44df2f0e20b0d48ec3923509ffabaf
+  data.tar.gz: aa3dc74cf05cc0b8359924814b75059c87853882099b89ed0932b5417791e955bdd4ecedd90c54b831176a076e13ee3855dcdec5a7a67d6d328c8d19c51d808d

data/History.txt

@@ -1,4 +1,9 @@
-=== 0.8.1 / 2013-10-280
+=== 0.8.2 / 2013-11-20
+
+* better parsing of corrupted mp3 (more robust frame scanning)
+* upgraded license to GPL 3 (previous license (ruby) is compatible)
+
+=== 0.8.1 / 2013-10-28
 
 * test fixes
 * added dot to temp filename

data/README.md

@@ -96,7 +96,7 @@ This task will install any missing dependencies, run the tests/specs, and genera
 
 ## License
 
-ruby
+GPL-3.0
 
 ## TODO:
 

data/lib/mp3info.rb

@@ -17,7 +17,7 @@ end
 
 class Mp3Info
 
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 
   LAYER = [ nil, 3, 2, 1]
   BITRATE = {
@@ -484,9 +484,18 @@ class Mp3Info
     @io.seek(@first_frame_pos, File::SEEK_SET)
     loop do
       head = @io.read(4).unpack("N").first
-      frame = Mp3Info.get_frames_infos(head)
-      @io.seek(frame[:size] -4, File::SEEK_CUR)
+      begin
+        frame = Mp3Info.get_frames_infos(head)
+      rescue Mp3InfoInternalError
+        begin
+          frame = find_next_frame
+        rescue Mp3InfoError
+          break
+        end
+      end
+       
       yield frame
+      @io.seek(frame[:size] -4, File::SEEK_CUR)
       #puts "frame #{frame_count} len #{frame[:length]} br #{frame[:bitrate]} @io.pos #{@io.pos}"
       break if @io.eof?
     end
@@ -518,12 +527,22 @@ private
       size = 144 * (bitrate*1000.0 / samplerate) + (padding ? 1 : 0)
     end
     size = size.to_i
+    channel_num = Mp3Info.bits(head, 7,6)
     { :layer => layer,
       :bitrate => bitrate,
       :samplerate => samplerate,
       :mpeg_version => mpeg_version,
       :padding => padding,
-      :size => size }
+      :size => size,
+      :error_protection => head[16] == 0,
+      :private => head[8] == 0,
+      :mode_extension => Mp3Info.bits(head, 5, 4),
+      :copyright => head[3] == 1,
+      :original => head[2] == 1,
+      :emphasis => Mp3Info.bits(head, 1, 0),
+      :channel_num => channel_num,
+      :channel_mode => CHANNEL_MODE[channel_num]
+    }
   end
 
   ### parses the id3 tags of the currently open @io
@@ -596,8 +615,7 @@ private
         raise(Mp3InfoError, "end of file reached") if @io.eof?
         head = 0xff000000 + (data.getbyte(0) << 16) + (data.getbyte(1) << 8) + data.getbyte(2)
         begin
-          Mp3Info.get_frames_infos(head)
-          return head
+          return Mp3Info.get_frames_infos(head)
         rescue Mp3InfoInternalError
           @io.seek(-3, IO::SEEK_CUR)
         end
@@ -629,23 +647,13 @@ private
     
     found = false
 
-    head = nil
     5.times do
-      head = find_next_frame() 
+      @header = find_next_frame() 
       @first_frame_pos = @io.pos - 4
-      current_frame = Mp3Info.get_frames_infos(head)
-      @mpeg_version = current_frame[:mpeg_version]
-      @layer = current_frame[:layer]
-      @header[:error_protection] = head[16] == 0 ? true : false
-      @bitrate = current_frame[:bitrate]
-      @samplerate = current_frame[:samplerate]
-      @header[:padding] = current_frame[:padding]
-      @header[:private] = head[8] == 0 ? true : false
-      @channel_mode = CHANNEL_MODE[@channel_num = Mp3Info.bits(head, 7,6)]
-      @header[:mode_extension] = Mp3Info.bits(head, 5,4)
-      @header[:copyright] = (head[3] == 1 ? true : false)
-      @header[:original] = (head[2] == 1 ? true : false)
-      @header[:emphasis] = Mp3Info.bits(head, 1,0)
+      [ :mpeg_version, :layer, :channel_mode,
+        :channel_num, :bitrate, :samplerate ].each do |var_name|
+        instance_variable_set("@#{var_name}", @header[var_name])
+      end
       @vbr = false
       found = true
       break
@@ -683,13 +691,10 @@ private
       stream_size = @io_size - (hastag1? ? TAG1_SIZE : 0) - (@tag2.io_position || 0)
       @length = ((stream_size << 3)/1000.0)/@bitrate
       # read the first 100 frames and decide if the mp3 is vbr and needs full scan
-      begin
-        bitrate = frame_scan(100).first
-        if @bitrate != bitrate
-          @vbr = true
-          @bitrate, @length = frame_scan
-        end
-      rescue Mp3InfoInternalError
+      average_bitrate = frame_scan(100).first
+      if @bitrate != average_bitrate
+        @vbr = true
+        @bitrate, @length = frame_scan
       end
     end
   end

data/test/test_ruby-mp3info.rb

@@ -526,13 +526,22 @@ class Mp3InfoTest < Test::Unit::TestCase
     assert_equal("JStereo", mp3.channel_mode)
     assert_equal(44100, mp3.samplerate)
     assert_equal(0.1305625, mp3.length)
-    assert_equal({:original => true, 
-                  :error_protection => false, 
-                  :padding => false, 
-                  :emphasis => 0, 
-                  :private => true, 
-                  :mode_extension => 2, 
-                  :copyright => false}, mp3.header)
+    assert_equal({
+      :layer=>3,
+      :bitrate=>128,
+      :samplerate=>44100,
+      :mpeg_version=>1,
+      :padding=>false,
+      :size=>417,
+      :error_protection=>false,
+      :private=>true,
+      :mode_extension=>2,
+      :copyright=>false,
+      :original=>true,
+      :emphasis=>0,
+      :channel_num=>1,
+      :channel_mode=>"JStereo"
+      }, mp3.header)
   end
 
   def load_string_io(filename = TEMP_FILE)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mp3info
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Guillaume Pierronnet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
 description: ruby-mp3info read low-level informations and manipulate tags on mp3 files.
 email:
 - guillaume.pierronnet@gmail.com
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files:
 - History.txt
 - Manifest.txt
+- README.md
 files:
 - History.txt
 - Manifest.txt
@@ -57,7 +58,8 @@ files:
 - test/test_ruby-mp3info.rb
 - .gemtest
 homepage: http://github.com/moumar/ruby-mp3info
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: