ruby-mp3info 0.6.11 → 0.6.12

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.6.12 / 2009-02-23
+
+* fixed bug when @tag2["TLEN"] == 0
+
 === 0.6.11 / 2009-01-27
 
 * the library doesn't raise an ID3v2Error anymore when a id3v2 tag size is incorrect, but just output

data/lib/mp3info.rb

@@ -18,7 +18,7 @@ end
 
 class Mp3Info
 
-  VERSION = "0.6.11"
+  VERSION = "0.6.12"
 
   LAYER = [ nil, 3, 2, 1]
   BITRATE = {
@@ -301,33 +301,28 @@ class Mp3Info
         samples_per_frame = SAMPLES_PER_FRAME[@layer][@mpeg_version] 
 	@length = frame_count * samples_per_frame / Float(@samplerate)
 
-	@bitrate = (((stream_size/frame_count)*@samplerate)/144) >> 10
+	@bitrate = (((stream_size/frame_count)*@samplerate)/144) / 1024
 	@vbr = true
       else
 	# for cbr, calculate duration with the given bitrate
 	stream_size = @file.stat.size - (hastag1? ? TAG1_SIZE : 0) - (@tag2.io_position || 0)
 	@length = ((stream_size << 3)/1000.0)/@bitrate
+        full_scan_occured = false
         # read the first 100 frames and decide if the mp3 is vbr and needs full scan
         begin
           bitrate, length = frame_scan(100)
           if @bitrate != bitrate
             @vbr = true
             @bitrate, @length = frame_scan
+            full_scan_occured = true
           end
         rescue Mp3InfoInternalError
         end
-	if @tag2["TLEN"]
+	if (tlen = @tag2["TLEN"]) && !full_scan_occured
 	  # but if another duration is given and it isn't close (within 5%)
 	  #  assume the mp3 is vbr and go with the given duration
-	  tlen = (@tag2["TLEN"].is_a?(Array) ? @tag2["TLEN"].last : @tag2["TLEN"]).to_i/1000
-	  percent_diff = ((@length.to_i-tlen)/tlen.to_f)
-	  if percent_diff.abs > 0.05
-	    # without the xing header, this is the best guess without reading
-	    # every single frame
-	    @vbr = true
-	    @length = @tag2["TLEN"].to_i/1000
-	    @bitrate = (stream_size / @bitrate) >> 10
-	  end
+	  @length = (tlen.is_a?(Array) ? tlen.last : tlen).to_i/1000
+	  @bitrate = (stream_size / @bitrate) / 1024
 	end
       end
     ensure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-mp3info
 version: !ruby/object:Gem::Version 
-  version: 0.6.11
+  version: 0.6.12
 platform: ruby
 authors: 
 - Guillaume Pierronnet
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-27 00:00:00 +01:00
+date: 2009-02-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.3
     version: 
 description: "* written in pure ruby  * read low-level informations like bitrate, length, samplerate, etc... * read, write, remove id3v1 and id3v2 tags * correctly read VBR files (with or without Xing header) * only 2.3 version is supported for writings id3v2 tags  == SYNOPSIS:  a good exercise is to read the test.rb to understand how the library works deeper  require \"mp3info\" # read and display infos & tags Mp3Info.open(\"myfile.mp3\") do |mp3info| puts mp3info end  # read/write tag1 and tag2 with Mp3Info#tag attribute # when reading tag2 have priority over tag1 # when writing, each tag is written. Mp3Info.open(\"myfile.mp3\") do |mp3| puts mp3.tag.title    puts mp3.tag.artist    puts mp3.tag.album puts mp3.tag.tracknum mp3.tag.title = \"track title\" mp3.tag.artist = \"artist name\" end  Mp3Info.open(\"myfile.mp3\") do |mp3| # you can access four letter v2 tags like this puts mp3.tag2.TIT2 mp3.tag2.TIT2 = \"new TIT2\" # or like that mp3.tag2[\"TIT2\"] # at this time, only COMM tag is processed after reading and before writing # according to ID3v2#options hash mp3.tag2.options[:lang] = \"FRE\" mp3.tag2.COMM = \"my comment in french, correctly handled when reading and writing\" end"
 email: moumar@rubyforge.org