audio_monster 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a057b2a1f3a759502c32a054151db67b29c7f94
-  data.tar.gz: 8dc01f649e809dedc68c1530bc58a591071cf32b
+  metadata.gz: a8ff1806c90f459f01c8c8c804be6a9924f37e91
+  data.tar.gz: 93fab5211b9c7c2663353071ac67916d0f5fc700
 SHA512:
-  metadata.gz: 228c4f3616a61b1e9bb0fa49baf2e8ae4dbac65f2c13916d4b121f196f1ae5272c3382f5f65944e7dfd09014ce6fdfd3eacf2aa958bda5dd74335696ac557fe3
-  data.tar.gz: f433d041ae8ea1d4ba0c964ebd6bb879e8ea48b77b436c104b0ed93995b2c53f7e1ef274fc772a2c1eee14ad302d591c5f756969bc0d1e0b9fa6fdba44820783
+  metadata.gz: e4485524174726a344b16386d0fdfb3aca441948bd8cb5de59b3449395206329206a0b2e72b509d01b56e166cf40944fb73fdf283bf242e7f75c9208fbf1ac5e
+  data.tar.gz: 4c5441ac587e4bd2d76e074cf5cfc1b7ef2514e9ec3323bd986930c033d535f37acc3c0c1e30901e97903b226cc920689ce8f94274766bfe82f39952ada3a891

data/lib/audio_monster/configuration.rb

@@ -35,7 +35,7 @@ module AudioMonster
 
     AES46_2002_TIME_FORMAT = '%H:%M:%S'
 
-    BINARIES_KEYS = [:file, :ffmpeg, :flac, :lame, :mpck, :mp3val, :sox, :soxi, :madplay, :twolame].freeze
+    BINARIES_KEYS = [:file, :ffmpeg, :ffprobe, :flac, :lame, :mpck, :mp3val, :sox, :soxi, :madplay, :twolame].freeze
 
     VALID_OPTIONS_KEYS = ([
       :logger,
@@ -114,6 +114,7 @@ module AudioMonster
       self.tmp_dir = '/tmp/audio_monster'
       self.file    = 'file'
       self.ffmpeg  = 'ffmpeg'
+      self.ffprobe = 'ffprobe'
       self.flac    = 'flac'
       self.lame    = 'lame'
       self.mpck    = 'mpck'

data/lib/audio_monster/monster.rb

@@ -11,6 +11,7 @@ require 'nu_wav'
 require 'tempfile'
 require 'mimemagic'
 require 'digest/sha2'
+require 'bigdecimal'
 
 module AudioMonster
 
@@ -252,38 +253,74 @@ module AudioMonster
     end
 
     def info_for_audio(path)
+      info = audio_file_info_ffprobe(path)
       {
-        :size         => File.size(path),
-        :content_type => (MimeMagic.by_path(path) || MimeMagic.by_magic(path)).to_s,
-        :channel_mode => audio_file_channels(path) <= 1 ? 'Mono' : 'Stereo',
-        :bit_rate     => audio_file_bit_rate(path),
-        :length       => audio_file_duration(path),
-        :sample_rate  => audio_file_sample_rate(path)
+        size:         info['format']['size'].to_i,
+        content_type: (MimeMagic.by_path(path) || MimeMagic.by_magic(path)).to_s,
+        format:       audio_file_format(path, info),
+        channel_mode: audio_file_channels(path, info) <= 1 ? 'Mono' : 'Stereo',
+        bit_rate:     audio_file_bit_rate(path, info),
+        length:       audio_file_duration(path, info),
+        sample_rate:  audio_file_sample_rate(path, info)
       }
     end
 
-    def audio_file_duration(path)
-      audio_file_info(path, 'D').to_f
+    def audio_file_format(path, info = nil)
+      info ||= audio_file_info_ffprobe(path)
+      f = info['format']['format_name']
+      if f == 'mp3'
+        stream = info['streams'].detect { |s| s['codec_type'] == 'audio' }
+        f = stream['codec_name']
+      end
+      f.downcase
+    end
+
+    def audio_file_duration(path, info = nil)
+      # audio_file_info_soxi(path, 'D').to_f
+      info ||= audio_file_info_ffprobe(path)
+      info['format']['duration'].to_f
     end
 
-    def audio_file_channels(path)
-      audio_file_info(path, 'c').to_i
+    def audio_file_channels(path, info = nil)
+      # audio_file_info_soxi(path, 'c').to_i
+      info ||= audio_file_info_ffprobe(path)
+      stream = info['streams'].detect { |s| s['codec_type'] == 'audio' }
+      stream['channels'].to_i
     end
 
-    def audio_file_sample_rate(path)
-      audio_file_info(path, 'r').to_i
+    def audio_file_sample_rate(path, info = nil)
+      # audio_file_info_soxi(path, 'r').to_i
+      info ||= audio_file_info_ffprobe(path)
+      stream = info['streams'].detect { |s| s['codec_type'] == 'audio' }
+      stream['sample_rate'].to_i
     end
 
-    def audio_file_bit_rate(path)
-      audio_file_info(path, 'B').to_i
+    def audio_file_bit_rate(path, info = nil)
+      # audio_file_info_soxi(path, 'B').to_i
+      info ||= audio_file_info_ffprobe(path)
+      stream = info['streams'].detect { |s| s['codec_type'] == 'audio' }
+      bit_rate = stream['bit_rate'] || info['format']['bit_rate']
+      (BigDecimal.new(bit_rate) / 1000).round
     end
 
-    def audio_file_info(path, flag)
+    def audio_file_info_soxi(path, flag)
       check_local_file(path)
       out, err = run_command("#{bin(:soxi)} -V0 -#{flag} '#{path}'", nice: 'n', echo_return: false)
       out.chomp
     end
 
+    def audio_file_info_ffprobe(path)
+      check_local_file(path)
+      cmd = bin(:ffprobe) +
+        " -v quiet -print_format json -show_format -show_streams" +
+        " '#{path}'"
+      out, err = run_command(cmd, nice: 'n', echo_return: false)
+      json = out.chomp
+      JSON.parse(json)
+    end
+
+    alias audio_file_info audio_file_info_ffprobe
+
     # valid options
     # :sample_rate
     # :bit_rate
@@ -984,6 +1021,5 @@ module AudioMonster
     def get_lame_channel_mode(channel_mode)
       ["Stereo", "JStereo"].include?(channel_mode) ? "j" : "m"
     end
-
   end
 end

data/lib/audio_monster/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module AudioMonster
-  VERSION = "1.1.2"
+  VERSION = '1.2.0'
 end

data/test/monster_test.rb

@@ -84,7 +84,6 @@ describe AudioMonster::Monster do
     info[:content_type].must_equal "audio/ogg"
   end
 
-
   it 'should create a wav wrapped mp2' do
     start_at = '2010-06-19T00:00:00-04:00'
     end_at = DateTime.parse(start_at) + 6.days
@@ -129,4 +128,55 @@ describe AudioMonster::Monster do
     File.basename(file.path)[0, 64].must_equal Digest::SHA256.hexdigest(base_file_name)
     File.extname(file.path).must_equal '.exten'
   end
+
+  describe 'test info' do
+    let(:audio_files) do
+      {
+        'test_short.mp2' => ['mp2', 5, 2, 48000, 256],
+        'test_long.mp3' => ['mp3', 48, 1, 44100, 128],
+        'test.ogg' => ['ogg', 12, 2, 44100, 128],
+        'test.flac' => ['flac', 15, 2, 44100, 246],
+        'test_short.wav' => ['wav', 5, 2, 48000, 1536]
+      }
+    end
+
+    it 'can get the ffprobe info on a file' do
+      audio_files.keys.each do |file|
+        info = monster.audio_file_info_ffprobe(in_file(file))
+        info.wont_be_nil
+        info['streams'].wont_be_nil
+        info['format'].wont_be_nil
+      end
+    end
+
+    it 'can get the format of a file' do
+      audio_files.keys.each do |file|
+        monster.audio_file_format(in_file(file)).must_equal audio_files[file][0]
+      end
+    end
+
+    it 'can get the duration of a file' do
+      audio_files.keys.each do |file|
+        monster.audio_file_duration(in_file(file)).to_i.must_equal audio_files[file][1]
+      end
+    end
+
+    it 'can get the number of channels for a file' do
+      audio_files.keys.each do |file|
+        monster.audio_file_channels(in_file(file)).must_equal audio_files[file][2]
+      end
+    end
+
+    it 'can get the sample rate of a file' do
+      audio_files.keys.each do |file|
+        monster.audio_file_sample_rate(in_file(file)).must_equal audio_files[file][3]
+      end
+    end
+
+    it 'can get the bit rate of a file' do
+      audio_files.keys.each do |file|
+        monster.audio_file_bit_rate(in_file(file)).must_equal audio_files[file][4]
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audio_monster
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Andrew Kuklewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nu_wav