ruby-mp3info 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80ba2cacb2d0a83f95af04c66b595c8f62b3aa08
-  data.tar.gz: 44c530109c47f779e6c5d59a1251caedb19b62a5
+  metadata.gz: 2e73d57ec360910c42245abd65123968dc3a12c3
+  data.tar.gz: 41a47932af670ac092a1929ae18b796dc4b3a514
 SHA512:
-  metadata.gz: a4c86af54616f804a9a64eb3cab55c4b327981b7ddbe24343bd097d78be691d599e3ece9f935cda00c24f8c0a88f20bc04011303c6911b67c6c716442995d5c4
-  data.tar.gz: ad7a47b2b0027c184040cc4361bfd2d6ee674ba6292d1cbb451a59e42c42867f92c007201a6be5524f77eea99ea1ffc2d9619cbeef0fc58764022ba9f2bb1b33
+  metadata.gz: fc2a8e453af0620cc2159d8dd7b960df38196a3abceaa5716b845920b8f444feac7fbf99bbbb6e79038d2b9346c9934cc35d517ef8e22607f198f20284836db7
+  data.tar.gz: 4c89f8648c5075417f2d21199516037dfe09acccbca2f88de865aaf7077e1d8ccafef7ea5fdbb94e4666db4a5bf0bef07b3169e38732bf5dc5f6253915255aea

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.8.4 / 2014-04-26
+
+* more robust frame scanning when unsynced (thanks to emonsqueeze for the bug report)
+
 === 0.8.3 / 2014-01-18
 
 * fix for ruby 2.1.0 (thanks to smashwilson)

data/lib/mp3info.rb

@@ -17,22 +17,22 @@ end
 
 class Mp3Info
 
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 
   LAYER = [ nil, 3, 2, 1]
   BITRATE = {
-    1 => 
+    1 =>
     [
       [32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448],
       [32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384],
       [32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320] ],
-    2 => 
+    2 =>
     [
       [32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256],
       [8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160],
       [8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160]
     ],
-    2.5 => 
+    2.5 =>
     [
       [32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256],
       [8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160],
@@ -253,49 +253,43 @@ class Mp3Info
     @tag1 = @tag = @tag1_orig = @tag_orig = {}
     @tag1.extend(HashKeys)
     @tag2 = ID3v2.new(@id3v2_options)
-    
-    begin
-      if @tag_parsing_enabled
-        parse_tags
-        @tag1_orig = @tag1.dup
 
-        if hastag1?
-          @tag = @tag1.dup
-        end
+    if @tag_parsing_enabled
+      parse_tags
+      @tag1_orig = @tag1.dup
 
-        if hastag2?
-          @tag = {}
-          # creation of a sort of "universal" tag, regardless of the tag version
-          tag2_mapping = @tag2.version =~ /^2\.2/ ? TAG_MAPPING_2_2 : TAG_MAPPING_2_3
-          tag2_mapping.each do |key, tag2_name| 
-            tag_value = (@tag2[tag2_name].is_a?(Array) ? @tag2[tag2_name].first : @tag2[tag2_name])
-            next unless tag_value
-            @tag[key] = tag_value.is_a?(Array) ? tag_value.first : tag_value
-
-            if %w{year tracknum}.include?(key)
-              @tag[key] = tag_value.to_i
-            end
-            # this is a special case with id3v2.2, which uses
-            # old fashionned id3v1 genres
-            if tag2_name == "TCO" && tag_value =~ /^\((\d+)\)$/
-              @tag["genre_s"] = GENRES[$1.to_i]
-            end
+      if hastag1?
+        @tag = @tag1.dup
+      end
+
+      if hastag2?
+        @tag = {}
+        # creation of a sort of "universal" tag, regardless of the tag version
+        tag2_mapping = @tag2.version =~ /^2\.2/ ? TAG_MAPPING_2_2 : TAG_MAPPING_2_3
+        tag2_mapping.each do |key, tag2_name| 
+          tag_value = (@tag2[tag2_name].is_a?(Array) ? @tag2[tag2_name].first : @tag2[tag2_name])
+          next unless tag_value
+          @tag[key] = tag_value.is_a?(Array) ? tag_value.first : tag_value
+
+          if %w{year tracknum}.include?(key)
+            @tag[key] = tag_value.to_i
+          end
+          # this is a special case with id3v2.2, which uses
+          # old fashionned id3v1 genres
+          if tag2_name == "TCO" && tag_value =~ /^\((\d+)\)$/
+            @tag["genre_s"] = GENRES[$1.to_i]
           end
         end
-
-        @tag.extend(HashKeys)
-        @tag_orig = @tag.dup
       end
 
-      if @mp3_parsing_enabled
-        parse_mp3
-      end
+      @tag.extend(HashKeys)
+      @tag_orig = @tag.dup
+    end
 
-    ensure
-      if @io_is_a_file
-        @io.close
-      end
+    if @mp3_parsing_enabled
+      parse_mp3
     end
+
   end
 
   # "block version" of Mp3Info::new()
@@ -365,7 +359,7 @@ class Mp3Info
   end
 
   # return the length in seconds of one frame
-  def frame_length
+  def get_frame_length
     SAMPLES_PER_FRAME[@layer][@mpeg_version] / Float(@samplerate)
   end
 
@@ -483,17 +477,7 @@ class Mp3Info
   def each_frame
     @io.seek(@first_frame_pos, File::SEEK_SET)
     loop do
-      head = @io.read(4).unpack("N").first
-      begin
-        frame = Mp3Info.get_frames_infos(head)
-      rescue Mp3InfoInternalError
-        begin
-          frame = find_next_frame
-        rescue Mp3InfoError
-          break
-        end
-      end
-       
+      frame = find_next_frame
       yield frame
       @io.seek(frame[:size] -4, File::SEEK_CUR)
       #puts "frame #{frame_count} len #{frame[:length]} br #{frame[:bitrate]} @io.pos #{@io.pos}"
@@ -502,7 +486,7 @@ class Mp3Info
   end
 
 private
-  
+
   def Mp3Info.get_frames_infos(head)
     # be sure we are in sync
     if ((head & 0xffe00000) != 0xffe00000)    || # 11 bit MPEG frame sync
@@ -510,11 +494,11 @@ private
        ((head & 0x0000f000) == 0x0000f000)    || #  4 bit bitrate
        ((head & 0x0000f000) == 0x00000000)    || #        free format bitstream
        ((head & 0x00000c00) == 0x00000c00)    || #  2 bit frequency
-       ((head & 0xffff0000) == 0xfffe0000) 
-      raise Mp3InfoInternalError 
+       ((head & 0xffff0000) == 0xfffe0000)
+      raise Mp3InfoInternalError, "unsynced frame"
     end
     mpeg_version = [2.5, nil, 2, 1][bits(head, 20,19)]
-    
+
     layer = LAYER[bits(head, 18,17)]
     raise Mp3InfoInternalError if layer == nil || mpeg_version == nil
 
@@ -522,12 +506,12 @@ private
     samplerate = SAMPLERATE[mpeg_version][bits(head, 11,10)]
     padding = (head[9] == 1)
     if layer == 1
-      size = (12 * bitrate*1000.0 / samplerate + (padding ? 1 : 0))*4 
+      size = (12 * bitrate*1000.0 / samplerate + (padding ? 1 : 0))*4
     else # layer 2 and 3
       size = 144 * (bitrate*1000.0 / samplerate) + (padding ? 1 : 0)
     end
     size = size.to_i
-    channel_num = Mp3Info.bits(head, 7,6)
+    channel_num = Mp3Info.bits(head, 7, 6)
     { :layer => layer,
       :bitrate => bitrate,
       :samplerate => samplerate,
@@ -553,26 +537,26 @@ private
     @io.seek(0)
     f3 = @io.read(3)
     # v1 tag at beginning
-    if f3 == "TAG"  
-      gettag1 
+    if f3 == "TAG"
+      gettag1
       @tag1_parsed = true
     end
 
     @tag2.from_io(@io) if f3 == "ID3"  # v2 tag at beginning
-      
+
     unless @tag1_parsed         # v1 tag at end
       # this preserves the file pos if tag2 found, since gettag2 leaves
       # the file at the best guess as to the first MPEG frame
       pos = (@tag2.io_position || 0)
       # seek to where id3v1 tag should be
-      @io.seek(-TAG1_SIZE, IO::SEEK_END) 
+      @io.seek(-TAG1_SIZE, IO::SEEK_END)
       if @io.read(3) == "TAG"
         gettag1
       end
       @io.seek(pos)
     end
   end
-  
+
   ### gets id3v1 tag information from @io
   ### assumes @io is pointing to char after "TAG" id
   def gettag1
@@ -635,20 +619,20 @@ private
       frame_count += 1
       break if frame_limit && (frame_count >= frame_limit)
     end
-    
+
     average_bitrate = bitrate_sum/frame_count.to_f
-    length = (frame_count-1) * frame_length
+    length = frame_count * get_frame_length
     [average_bitrate, length]
   end
 
   def parse_mp3
     ### extracts MPEG info from MPEG header and stores it in the hash @mpeg
     ###  head (fixnum) = valid 4 byte MPEG header
-    
+
     found = false
 
     5.times do
-      @header = find_next_frame() 
+      @header = find_next_frame()
       @first_frame_pos = @io.pos - 4
       [ :mpeg_version, :layer, :channel_mode,
         :channel_num, :bitrate, :samplerate ].each do |var_name|
@@ -661,12 +645,12 @@ private
 
     raise(Mp3InfoError, "Cannot find good frame") unless found
 
-    seek = @mpeg_version == 1 ? 
-      (@channel_num == 3 ? 17 : 32) :       
+    seek = @mpeg_version == 1 ?
+      (@channel_num == 3 ? 17 : 32) :
       (@channel_num == 3 ?  9 : 17)
 
     @io.seek(seek, IO::SEEK_CUR)
-    
+
     vbr_head = @io.read(4)
     if vbr_head == "Xing"
       puts "Xing header (VBR) detected" if $DEBUG
@@ -680,21 +664,23 @@ private
       @io.seek(100, IO::SEEK_CUR) if flags[0] == 1
       #@vbr_quality = @io.get32bits if flags[3] == 1
 
-      samples_per_frame = SAMPLES_PER_FRAME[@layer][@mpeg_version] 
-      @length = frame_count * samples_per_frame / Float(@samplerate)
+      @length = frame_count * get_frame_length
 
       @bitrate = (((stream_size/frame_count)*@samplerate)/144) / 1024
       @vbr = true
     else
       # for cbr, calculate duration with the given bitrate
-      
+
       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
-      average_bitrate = frame_scan(100).first
-      if @bitrate != average_bitrate
-        @vbr = true
-        @bitrate, @length = frame_scan
+      begin
+        average_bitrate, _ = frame_scan(100)
+        if @bitrate != average_bitrate
+          @vbr = true
+          @bitrate, @length = frame_scan
+        end
+      rescue Mp3InfoError
       end
     end
   end

data/test/test_ruby-mp3info.rb

@@ -347,7 +347,7 @@ class Mp3InfoTest < Test::Unit::TestCase
       mp3.tag.artist = "toto"
       mp3.tag.comments = "comments"
       mp3.flush
-      expected_tag = { 
+      expected_tag = {
         "artist" => "toto",
         "genre_s" => "Hip Hop/Rap",
         "title" => "Intro",
@@ -495,6 +495,23 @@ class Mp3InfoTest < Test::Unit::TestCase
     end
   end
 
+  def test_parsing_unsynced_file
+    load_fixture_to_temp_file("vbr")
+    File.open("/tmp/test.mp3", "w") do |tf|
+      tf.write File.read(TEMP_FILE, 96512)
+      tf.write "\0\0"
+      tf.write File.read(TEMP_FILE, nil, 96512)
+    end
+
+    Mp3Info.open("/tmp/test.mp3") do |info|
+      assert_nothing_raised do
+        info.each_frame { |frame| frame }
+      end
+      assert(info.vbr)
+      assert_in_delta(174.210612, info.length, 0.000001)
+    end
+  end
+
   def compute_audio_content_mp3_digest(mp3)
     pos, size = mp3.audio_content
     data = File.open(mp3.filename) do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mp3info
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Guillaume Pierronnet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2014-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc