mp3file 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da11954d17d2192242abc2017940101590ad797b
-  data.tar.gz: 0018b0f2fabb9aa7582722aaf3c8a1985a004479
+  metadata.gz: 7cf86507fcd63fcb962fe2dda0dbd5d2a2ab7663
+  data.tar.gz: b5d0ae9444f9f4d5c010f443c1872ad50f3671c7
 SHA512:
-  metadata.gz: a0e6fe9ae807f7981faf6332de40a7791666823bd9d55e94ebf2dbf89e16b3cb60dcefb46d603fe17b81fac974247887b379b4972ad8c76683f00c3c6a766246
-  data.tar.gz: f9e290a4928af6d4de7c68e82aa16913513745cc11c4157549289b3534b9b89e5737447d267abee81aacdeb0d3883a27eb5c3ec166f458d2a1cc603f5392d8e1
+  metadata.gz: 7559f2f3edbc7d530eab3c92a604cfb74b079130e53c7d036568c63938325e0f8823c33d864ee746710441006edb1d625bb5051a7a3ea83443cb43e5ce048b4a
+  data.tar.gz: 75a97f77e322cac1de9159e4f2106dac88ee675f407816c62782d121bdc8bdd3e4e931a82d7741caecd3106994f1d0f8d2d1ea0a2c2872962b9fd2fbe242d9ef

data/lib/mp3file/mp3_file.rb

@@ -198,23 +198,27 @@ module Mp3file
         if uniq_brs.size == 1
           @bitrate = uniq_brs.first / 1000
         end
+        @num_frames = frame_headers.size
       else
         # Use the Xing header to make the VBR / CBR call. Assume that
         # Xing headers, when present in a CBR file, are called "Info".
         @vbr = @xing_header.nil? || @xing_header.name == "Xing"
       end
 
-      if @xing_header && @xing_header.frames && @xing_header.bytes
-        # Use the Xing header to calculate the duration (and overall bitrate).
-        @num_frames = @xing_header.frames
-        @total_samples = @xing_header.frames * @first_header.samples
-        @length = total_samples.to_f / @samplerate.to_f
-        @bitrate = ((@xing_header.bytes.to_f / @length.to_f) * 8 / 1000)
-      else
-        # Do the CBR length calculation.
-        @num_frames = @audio_size / @first_header.frame_size
-        @total_samples = @num_frames * @first_header.samples
-        @length = @total_samples.to_f / @samplerate.to_f
+      # Find the number of frames. Prefer the actual frame count we
+      # did (if we scanned all the frames) over the Xing
+      # header. Prefer the Xing header over file size math.
+      @num_frames = @num_frames || (@xing_header && @xing_header.frames) || (@audio_size / @first_header.frame_size)
+
+      # Figure out the total samples and the time duration.
+      @total_samples = @num_frames * @first_header.samples
+      @length = @total_samples.to_f / @samplerate.to_f
+
+      # If the file looks like it's a VBR file, do an averate bitrate
+      # calculation, either using the Xing header's idea of the file
+      # size or the one we found.
+      if @vbr
+        @bitrate = (@xing_header.bytes || @audio_size) / @length.to_f * 8 / 1000
       end
 
       @file.close

data/lib/mp3file/version.rb

@@ -1,3 +1,3 @@
 module Mp3file
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mp3file
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Andrew Watts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec