noyes 1.0.1 → 1.1.1

data/COPYING

@@ -1,7 +1,22 @@
 Copyright 2010 Talkhouse. All rights reserved.
 
-Noyes is licensed under GPLv3.  You can obtain a copy here:
-http://www.gnu.org/licenses/gpl.html
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice, this list of
+      conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice, this list
+      of conditions and the following disclaimer in the documentation and/or other materials
+      provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY TALKHOUSE ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL TALKHOUSE OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-If for any reason this license is not adequate for your purposes please contact
-talkhouse.  We're very open minded.

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.1

data/bin/noyes

@@ -0,0 +1,43 @@
+#!/usr/bin/env ruby
+# vim: set filetype=ruby :
+ROOT = File.dirname(File.dirname(__FILE__))
+VERSION_FILE = "#{ROOT}/VERSION"
+$: << "#{ROOT}/lib" << "#{ROOT}/ship"
+
+require 'trollop'
+require 'noyes_c'
+include NoyesC
+
+options = Trollop::options do
+  version "Noyes #{IO.read(VERSION_FILE).strip} (c) 2010 Talkhouse"
+  banner <<DOC'Usage: noyes [options] file1 file2 ...'
+Converts files from audio to raw features.  Supports format that your
+version of SOX supports.
+DOC
+  opt :force, 'Force creation'
+  opt :verbose, 'Verbose mode'
+  opt :pattern, 'Files matching pattern.', :type => :strings, :multi => true
+end
+
+patterns = options[:pattern].flatten
+pattern_files = patterns.inject [] {|memo, pattern| memo | Dir[pattern]}
+audio_files = ARGV | pattern_files
+# Make sure were not overwritting anything unless force flag is used.
+mfcc_files = audio_files.map {|audio_file| audio_file.sub /\.\w+$/, '.mfcc'}
+unless options[:force]
+  mfcc_file = mfcc_files.detect {|mfcc_file| File.exists? mfcc_file}
+  if mfcc_file
+    puts "#{mfcc_file} already exists.  Quitting. Use -f to force."
+    exit 9
+  end
+end
+  
+audio_files.zip(mfcc_files).each do |audio_file, mfcc_file|
+  observations = file2features audio_file
+  puts mfcc_file if options[:verbose]
+  open(mfcc_file, 'wb') do |f|
+    f.print [observations.size, 100000].pack 'N*'
+    f.print [0x009c, 0x2306].pack 'n*'
+    f.puts observations.flatten.pack 'g*'
+  end
+end

data/bin/nrec

@@ -11,6 +11,7 @@ options = Trollop::options do
   banner 'Usage: nrec [options] file1 file2 ...'
   opt :implementation, "ruby, c, or java", :default => 'ruby'
   opt :address, "address", :default => '174.129.244.159'
+  opt :file, "Output file (overrides default TCP/IP)", :type => :string
   opt :port, "port", :default => 2348
   opt :bits, "bit depth", :default => 16
   opt :frequency, "sampling frequency", :default => 16000
@@ -22,8 +23,11 @@ if options[:bits] != 16 && options[:payload] == 'mfcc'
   Trollop::die :bits, "must be 16 for mfcc"
 end
 
-if options[:payload] == 'mfcc' && ((options[:frequency] % 8000) != 0)
-  Trollop::die :frequency, "(#{options[:frequency]}) for mfcc must be divisible by 8000"
+if options[:payload] == 'mfcc'
+  f = options[:frequency]
+  if f != 8000 && f != 16000
+    Trollop::die :frequency, "(#{options[:frequency]}) for mfcc must be either 16000 or 8000"
+  end
 end
 
 # Must set implementation specific library path before requiring libraries.
@@ -99,12 +103,23 @@ end
 require 'socket'
 
 def recognize file, options
-  TCPSocket.open(options[:address], options[:port]) do |client|
-    bits, rate = options[:bits], options[:frequency]
-    if options[:pcm]
-      send_incremental_pcm file, client, client, bits, rate
-    else
-      send_incremental_features file, client, client, bits, rate
+  bits, rate = options[:bits], options[:frequency]
+  if rate == 8000
+    rateinfo =  FEAT8M16R
+  elsif rate == 16000
+    rateinfo =  FEAT16M16R
+  end
+  if options[:file]
+    open(options[:file], 'wb') do |client|
+      send_incremental_features file, client, nil, bits, rateinfo
+    end
+  else
+    TCPSocket.open(options[:address], options[:port]) do |client|
+      if options[:pcm]
+        send_incremental_pcm file, client, client, bits, rateinfo
+      else
+        send_incremental_features file, client, client, bits, rateinfo
+      end
     end
   end
 rescue Errno::ECONNREFUSED

data/lib/common/file2feat.rb

@@ -0,0 +1,42 @@
+require 'stringio'
+
+# Convert audio file into an IO object with features.
+def file2fstream file, format = FEAT8M16R
+  to_server = StringIO.new 'wb'
+  from_server = StringIO.new 'dummy result'
+  result = send_incremental_features file, to_server, from_server, 16, format
+  StringIO.new to_server.string
+end
+
+# Take a talkhouse feature stream and convert it into an array.
+def stream2features stream
+  observations = []
+  raise "Unexpected magic number." if stream.read(TMAGIC.size) != TMAGIC
+  raise "Expected TSTART."         if stream.read(4) != TSTART
+  loop do
+    case stream.read(4)
+      when TPCM
+      count = stream.read(4).unpack('N')[0]
+      pcm = stream.read count
+      pcm = pcm.unpack('g*')
+      when TCEPSTRA
+      count = stream.read(4).unpack('N')[0]
+      cmn = Array.new(count) {stream.read(13*4).unpack('g*')}
+      observations += cmn
+      when TBYE
+      break
+      when TEND
+      else
+      end
+   end
+  delta_filter = Noyes::DoubleDeltaFilter.new
+  observations >>= delta_filter
+  observations.map {|a| a.flatten}
+end
+
+# Convenience function for converting almost any type of audio file to an mfcc
+# feature array.
+def file2features file, format = FEAT8M16R
+  stream = file2fstream file, format
+  stream2features stream
+end

data/lib/common/noyes_protocol.rb

@@ -2,7 +2,7 @@ TMAGIC = '1.0 talkhouse'
 
 # The following constants are packed as 4 byte big-endian integers.
 TSTART = [0].pack('N')
-#TAUDIO = [1].pack('N')
+TPCM = [1].pack('N')
 TEND = [2].pack('N')
 TBYE = [3].pack('N')
 TCEPSTRA = [4].pack('N')

data/lib/common/send_incrementally.rb

@@ -1,6 +1,12 @@
 require 'noyes'
 require 'common/file2pcm'
 
+
+# Parameters for 8 kHz models and 16 kHz data
+FEAT8M16R =  [32, 200, 3700, 256*2, 8000*2, 80*2, 205*2]
+# Paramenters for 16 kHz models and 16 kHz data
+FEAT16M16R = [40, 133.33, 6855.5, 512, 8000*2, 80*2, 205*2]
+
 # The following flags are in network byte order (big endian) and are 4 bytes
 # long. 
 #
@@ -17,14 +23,9 @@ require 'common/file2pcm'
 # Use sox to convert a file of almost any common type int pcm.
 # Not sure this works for anything beside 16 bits.
 # Takes a file and two IO-like objects.
-def send_incremental_features file, to_server, from_server, bits, freq
+def send_incremental_features file, to_server, from_server, bits, freqinfo
   stats = {}
-  nfilt = 40
-  min_freq = 133.33334
-  max_freq = 6855.4976
-  nfft = 512
-  shift = 160
-  frame_size = 410
+  nfilt, min_freq, max_freq, nfft, freq, shift, frame_size  = *freqinfo
   preemphasizer = Preemphasizer.new 0.97
   segmenter = Segmenter.new frame_size, shift
   hamming_windower = HammingWindow.new frame_size
@@ -52,7 +53,7 @@ def send_incremental_features file, to_server, from_server, bits, freq
     stats[:process_time] += Time.new - process_time_start
     to_server.write TCEPSTRA
     to_server.write [data.size].pack('N')
-    print '.'
+    # print '.'
     data.each {|cmn| to_server.write cmn.pack('g*')} 
     to_server.flush
   end
@@ -60,9 +61,9 @@ def send_incremental_features file, to_server, from_server, bits, freq
   to_server.write TBYE
   to_server.flush
   latency_start = Time.new
-  stats[:transcript] = from_server.read
+  stats[:transcript] = from_server ? from_server.read : ""
   stats[:latency] = Time.new - latency_start
-  return stats
+  stats
 end
 
 def send_incremental_pcm file, to_server, from_server, depth, rate
@@ -74,7 +75,7 @@ def send_incremental_pcm file, to_server, from_server, depth, rate
     to_server.write TA16_16
     to_server.write [chunk.size/2].pack('N')
     to_server.write chunk
-    print '.'
+    # print '.'
     to_server.flush
     chunk = raw.slice! 0, 1024
   end

data/lib/common.rb

@@ -4,4 +4,5 @@ require 'common/noyes_dsl'
 require 'common/noyes_math'
 require 'common/noyes_protocol'
 require 'common/send_incrementally'
+require 'common/file2feat'
 require 'common/ruby_ext'

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: noyes
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
+  prerelease: 
+  version: 1.1.1
 platform: ruby
 authors: 
 - Joe Woelfel
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 -04:00
+date: 2011-12-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :runtime
   version_requirements: *id001
@@ -40,6 +30,7 @@ description: |-
 email: joe@talkhouse.com
 executables: 
 - mock_noyes_server
+- noyes
 - noyes_dump44k
 - noyes_dump8k
 - nrec
@@ -82,6 +73,7 @@ files:
 - lib/cext/segmenter.c
 - lib/cext/speech_trimmer.c
 - lib/common.rb
+- lib/common/file2feat.rb
 - lib/common/file2pcm.rb
 - lib/common/mock_noyes_server.rb
 - lib/common/noyes_dsl.rb
@@ -123,9 +115,11 @@ files:
 - lib/ruby_impl/preemphasis.rb
 - lib/ruby_impl/segment.rb
 - lib/ruby_impl/speech_trimmer.rb
+- ship/noyes.jar
 - COPYING
 - FAQ
 - bin/mock_noyes_server
+- bin/noyes
 - bin/noyes_dump44k
 - bin/noyes_dump8k
 - bin/nrec
@@ -134,8 +128,8 @@ homepage: http://github.com/talkhouse/noyes
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 - ship
@@ -144,23 +138,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: A signal processing library