audio_monster 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d0e6ea4c3b3357151c51698a23c7edcae67c33e
-  data.tar.gz: 64439d9c9f2cc8105187c77d136ef4280fa51ef2
+  metadata.gz: c2f4df3869b78f65dc95459fe8bcb28d306a30e1
+  data.tar.gz: f13f261b25dc162762ff3988ec6a909f7f7a1201
 SHA512:
-  metadata.gz: ccac8d90d73c02d4b9c552b6ba13eebfd7ecbdeebda0cffd6ada4dd3fc467252f94ac2adb39328bbffabc3712edf95ee9bdbf5c4ea59f11fcf762252ebd4779c
-  data.tar.gz: 2bdccfd682e2b6fa3df6578d737126ff7e996275a2c5c40db33f04add9bc8ccfbb1e92085f8ee0c7fbc2d73501368b6c5ca6076fb5effd04d86061f49dc399e0
+  metadata.gz: b98ae9df3cc40799244ac59b21e3e481d7c90d421c9543a8af0615aa909ab2f80a3094311e57f0831dbab9b4709caf59bb33d4db75e524db89833597693ac48c
+  data.tar.gz: 2e760fb680f90fa4bc4619063894a8fdfa48e80baf97673d4cc868c0b0ab1b8d2c7d1d18503c3b0b16131328a09b4cff3be009981796a8302c0d5537ebbdea77

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
   - "2.2.1"
+  - "2.3.1"
 before_install:
-  - sudo add-apt-repository ppa:jon-severinsson/ffmpeg -y
+  - sudo add-apt-repository ppa:jonathonf/ffmpeg -y
   - sudo apt-get update -qq
-  - sudo apt-get install -qq libsndfile1-dev imagemagick libsox-fmt-all lame mp3val sox madplay twolame flac
+  - sudo apt-get install -qq libsndfile1-dev libsox-fmt-all lame mp3val sox twolame
   - sudo apt-get install -qq ffmpeg

data/README.md

@@ -1,20 +1,20 @@
 # AudioMonster
 
 AudioMonster manipulates and transcodes audio.
-It wraps a number of different command line binaries such as sox, lame, flac, twolame, and ffmpeg.
+It wraps a number of different command line binaries such as sox, lame, twolame, and ffmpeg.
+
+[![Build Status](https://travis-ci.org/PRX/audio_monster.svg?branch=master)](https://travis-ci.org/PRX/audio_monster)
 
 ## Dependencies
 
-The following binary tools are required. They are available via most OS package managers. 
+The following binary tools are required. They are available via most OS package managers.
 
 For OS X use homebrew:
 
 ```
 brew install lame
-brew install flac
 brew install sox
 brew install twolame --frontend
-brew install madplay
 brew install mp3val
 brew install ffmpeg
 ```
@@ -26,10 +26,8 @@ http://wiki.centos.org/TipsAndTricks/MultimediaOnCentOS7
 
 ```
 yum install lame
-yum install flac
-yum install sox 
-yum install twolame 
-yum install madplay
+yum install sox
+yum install twolame
 yum install mp3val
 yum install ffmpeg
 yum install libsndfile-devel libsndfile-utils
@@ -61,6 +59,16 @@ For convenience, all methods can be called from the AudioMonster module.
 
 The `monster_test.rb` contains examples of method calls.
 
+## Development
+To print potential expect checks, I sometimes change `AudioMonster`:
+```ruby
+def self.method_missing(method, *args, &block)
+  r = monster.send(method, *args)
+  puts "audio_monster.expect(:#{method}, #{r}, #{args.map { |a| a.class.name }})"
+  r
+end
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/audio_monster/fork )

data/lib/audio_monster/configuration.rb

@@ -12,8 +12,6 @@ module AudioMonster
     MP3VAL_WARNING_RE  = /WARNING/
     MP3VAL_ERROR_RE    = /ERROR/
     MP3VAL_IGNORE_RE   = /(^Done!|Non-layer-III frame encountered. See related INFO message for details.|No supported tags in the file|It seems that file is truncated or there is garbage at the end of the file|MPEG stream error, resynchronized successfully)/
-    MPCK_ERROR_RE      = /(mpck:|errors)/
-    MPCK_IGNORE_RE     = /errors(\s*)(CRC error|none)/
     LAME_SUCCESS_RE    = /0/
     LAME_ERROR_RE      = /fatal error/
     SOX_ERROR_RE       = /error:/
@@ -35,7 +33,7 @@ module AudioMonster
 
     AES46_2002_TIME_FORMAT = '%H:%M:%S'
 
-    BINARIES_KEYS = [:file, :ffmpeg, :ffprobe, :flac, :lame, :mpck, :mp3val, :sox, :soxi, :madplay, :twolame].freeze
+    BINARIES_KEYS = [:file, :ffmpeg, :ffprobe, :lame, :mp3val, :sox, :soxi, :twolame].freeze
 
     VALID_OPTIONS_KEYS = ([
       :logger,
@@ -115,13 +113,10 @@ module AudioMonster
       self.file    = 'file'
       self.ffmpeg  = 'ffmpeg'
       self.ffprobe = 'ffprobe'
-      self.flac    = 'flac'
       self.lame    = 'lame'
-      self.mpck    = 'mpck'
       self.mp3val  = 'mp3val'
       self.sox     = 'sox'
       self.soxi    = 'soxi'
-      self.madplay = 'madplay'
       self.twolame = 'twolame'
       self
     end

data/lib/audio_monster/monster.rb

@@ -24,6 +24,7 @@ module AudioMonster
     COMMON_EXTENSIONS = {
       'application/xml' => 'xml',
       'audio/mpeg' => 'mp3',
+      'audio/flac' => 'flac',
       'audio/mp4'  => 'm4a',
       'audio/ogg'  => 'ogg',
       'image/jpeg' => 'jpg',
@@ -170,39 +171,6 @@ module AudioMonster
       ranges
     end
 
-    def encode_wav_pcm_from_mpeg(original_path, wav_path, options={})
-      logger.info "encode_wav_pcm_from_mpeg: #{original_path}, #{wav_path}, #{options.inspect}"
-      # check to see if there is an original
-      check_local_file(original_path)
-
-      logger.debug "encode_wav_pcm_from_mpeg: start"
-      command = "#{bin(:madplay)} -Q -i --output=wave:'#{wav_path}' '#{original_path}'"
-
-      out, err = run_command(command)
-
-      # check to see if there is a file created, or don't go on.
-      check_local_file(wav_path)
-      return [out, err]
-    end
-
-    def encode_wav_pcm_from_flac(original_path, wav_path, options={})
-      logger.info "encode_wav_pcm_from_flac: #{original_path}, #{wav_path}, #{options.inspect}"
-      # check to see if there is an original
-      check_local_file(original_path)
-
-      logger.debug "encode_wav_pcm_from_mpeg: start"
-      command = "#{bin(:flac)} -s -f --decode '#{original_path}' --output-name='#{wav_path}'"
-      out, err = run_command(command)
-
-      # check to see if there is a file created, or don't go on.
-      check_local_file(wav_path)
-      return [out, err]
-    end
-
-    alias encode_wav_pcm_from_mp2 encode_wav_pcm_from_mpeg
-    alias encode_wav_pcm_from_mp3 encode_wav_pcm_from_mpeg
-
-    # experimental...should work on any ffmpeg compatible file
     def decode_audio(original_path, wav_path, options={})
       # check to see if there is an original
       logger.info "decode_audio: #{original_path}, #{wav_path}, #{options.inspect}"
@@ -771,44 +739,6 @@ module AudioMonster
       return true
     end
 
-    def append_mp3_to_wav(wav_path, mp3_path, out_path, add_length, fade_length=5)
-      # raise "append_mp3_to_wav: Can't find file to create mp3 preview of: #{mp3_path}" unless File.exist?(mp3_path)
-
-      mp3info = Mp3Info.new(mp3_path)
-      raise "mp3 is not sufficiently long enough (#{mp3info.length.to_i}) to add length (#{add_length})" if mp3info.length.to_i < add_length
-      append_length = [mp3info.length.to_i, (add_length - 1)].min
-      append_fade_length = [mp3info.length.to_i, fade_length].min
-
-
-      # find out if the wav file is stereo or mono as this meeds to match the wav from the mp3
-      wavinfo = info_for_wav(wav_path)
-      channels = wavinfo[:channel_mode] == 'Mono' ? 1 : 2
-      sample_rate = wavinfo[:sample_rate]
-      append_file = nil
-
-      begin
-        append_file = create_temp_file(mp3_path)
-        append_file.close
-
-        # create  the mp3 to append
-        command = "#{bin(:madplay)} -q -o wave:- '#{mp3_path}' - | #{bin(:sox)} -t wav - -t raw -s -b 16 -c #{channels} - trim 0 #{append_length} | #{bin(:sox)} -t raw -r #{sample_rate} -s -b 16 -c #{channels} - -t wav - fade h 0 #{append_length} #{append_fade_length} | #{bin(:sox)} -t wav - -t wav '#{append_file.path}' pad 1 0"
-        out, err = run_command(command)
-        response = out + err
-        response.split("\n").each{ |out| raise("append_mp3_to_wav: create append file error: '#{response}' on:\n #{command}") if out =~ SOX_ERROR_RE }
-
-        # append the files to out_filew
-        command = "#{bin(:sox)} -t wav '#{wav_path}' -t wav '#{append_file.path}' -t wav '#{out_path}'"
-        out, err = run_command(command)
-        response = out + err
-        response.split("\n").each{ |out| raise("append_mp3_to_wav: create append file error: '#{response}' on:\n #{command}") if out =~ SOX_ERROR_RE }
-      ensure
-        append_file.close rescue nil
-        append_file.unlink rescue nil
-      end
-
-      return true
-    end
-
     def normalize_wav(wav_path, out_path, level=-9)
       logger.info "normalize_wav: wav_path:#{wav_path}, level:#{level}"
       command = "#{bin(:sox)} -t wav '#{wav_path}' -t wav '#{out_path}' gain -n #{level.to_i}"
@@ -824,10 +754,6 @@ module AudioMonster
 
       info = mp3info_validation(audio_file_path, options)
 
-      # there are condtions where this spews output uncontrollably - so lose it for now: AK on 20080915
-      #   e.g. mpck:/home/app/mediajoint/tmp/audio_monster/prxfile-66097_111955868219902-0:3366912:read error
-      # mpck_validation(audio_file_path, errors) if errors.size <= 0
-
       # if the format seems legit, check the audio itself
       mp3val_validation(audio_file_path, options)
 
@@ -1016,19 +942,6 @@ module AudioMonster
       end
     end
 
-    def mpck_validation(audio_file_path, options)
-      errors= []
-      # validate using mpck
-      response = run_command("nice -n 19 #{bin(:mpck)} #{audio_file_path}")
-      response.split("\n").each { |o|
-        if ((o =~ MPCK_ERROR_RE) && !(o =~ MPCK_IGNORE_RE))
-          errors << "is not a valid mp2 file. The file is bad according to the 'mpck' audio check."
-        end
-      }
-
-      errors
-    end
-
     def method_missing(name, *args, &block)
       if name.to_s.starts_with?('encode_wav_pcm_from_')
         decode_audio(*args)

data/lib/audio_monster/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module AudioMonster
-  VERSION = '1.2.3'
+  VERSION = '1.3.0'
 end

data/test/audio_monster_test.rb

@@ -11,7 +11,7 @@ describe AudioMonster do
   end
 
   it 'delegates methods to monster' do
-    AudioMonster.flac.must_equal 'flac'
+    AudioMonster.ffmpeg.must_equal 'ffmpeg'
   end
 
   it 'returns an instance of monster' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audio_monster
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Andrew Kuklewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nu_wav