rist 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37cde15cbc2351d914b250f95813ac49250218a2
-  data.tar.gz: e72797409c6a9970d18a428a6a0701f7faae5cc2
+  metadata.gz: 25fe8929aa49a303ac481c44c0cc54925abebffe
+  data.tar.gz: 3365df1dccaa8069c2f73e4d8b0b3140a2ef2530
 SHA512:
-  metadata.gz: 625e3e9c074673589d9d8dc0c6af9e9403bc3d1711749749a00117740ec0924dfab0bbd32bdc142d1592f51e84bd63122e34a2e135bf158fff384a749c2aee35
-  data.tar.gz: 73c5b2866f0d8cedcb791cd568fac5212de3549dc00472945b7bf14414d9a641c8599e112105915466d71f91331f9d8020644e6f1702ffb3024a89ccdae07be1
+  metadata.gz: 64e8773fd58f1343d29f56b6e95c48e541575ca94661655b78f925d79a9b2d6d04c10eda3ea8413354dfcc7c4031b5566c9ea17104e957734284d7caada34707
+  data.tar.gz: 1c9adabfca2fc14955edab3f231e7b263be06b8da87d192acfce6c534c5f11da798a114200df4cba35f9c5652806891a2f747b345d1097a5645b18a115226c02

data/README.md

@@ -1,10 +1,13 @@
 # Rist
 
+[![Gem Version](https://badge.fury.io/rb/rist.svg)](http://badge.fury.io/rb/rist)
+[![Inline docs](http://inch-ci.org/github/siegfried/rist.svg?branch=master)](http://inch-ci.org/github/siegfried/rist)
+
 Rist (Ruby Intelligent System Tools) is a tool set to build Intelligent System.
 
 ## Installation
 
-*Warning: OpenAL and Pocketsphinx (> 0.8) are prerequisite.*
+*Warning: Pocketsphinx (> 0.8) are prerequisite.*
 
 Add this line to your application's Gemfile:
 
@@ -24,7 +27,7 @@ Or install it yourself as:
 
 ### Transcriber
 
-Transcriber captures audio using OpenAL and turns the audio into text using [Pocketsphinx](http://cmusphinx.sourceforge.net/).
+Transcriber transcribes audio into text using [Pocketsphinx](http://cmusphinx.sourceforge.net/).
 
 ```ruby
 transcriber = Rist::Transcriber.new logfn: "/dev/null"

data/ext/transcriber/extconf.rb

@@ -1,22 +1,21 @@
 require 'mkmf'
 
-unless find_header 'AL/al.h', '/usr/local/include', '/usr/include'
-  abort 'cannot find OpenAL, please install it.'
-end
-unless find_header 'AL/alc.h', '/usr/local/include', '/usr/include'
-  abort 'cannot find OpenAL, please install it.'
-end
-unless find_header 'pocketsphinx/pocketsphinx_export.h', '/usr/local/include', '/opt/include', '/usr/include'
+header_paths = ['/usr/local/include', '/opt/include', '/usr/include']
+
+unless find_header 'pocketsphinx/pocketsphinx_export.h', *header_paths
   abort 'cannot find pocketsphinx, please install it.'
 end
-unless find_header 'sphinxbase/sphinxbase_export.h', '/usr/local/include', '/opt/include', '/usr/include'
+unless find_header 'sphinxbase/sphinxbase_export.h', *header_paths
   abort 'cannot find sphinxbase, please install it.'
 end
 find_header 'pocketsphinx_export.h', '/usr/local/include/pocketsphinx', '/opt/include/pocketsphinx', '/usr/include/pocketsphinx'
 find_header 'sphinxbase_export.h', '/usr/local/include/sphinxbase', '/opt/include/sphinxbase', '/usr/include/sphinxbase'
 
-find_library 'pocketsphinx', 'ps_init', '/usr/local/lib', '/opt/lib', '/usr/lib'
-find_library 'sphinxbase', 'cmd_ln_init', '/usr/local/lib', '/opt/lib', '/usr/lib'
-find_library 'openal', 'alcCaptureOpenDevice'
+lib_paths = ['/usr/local/lib', '/opt/lib', '/usr/lib']
+
+find_library 'pocketsphinx',  'ps_init',      *lib_paths
+find_library 'sphinxbase',    'cmd_ln_init',  *lib_paths
+find_library 'sphinxad',      'ad_open_dev',  *lib_paths
 
+create_header
 create_makefile 'transcriber/transcriber'

data/ext/transcriber/transcriber.c

@@ -1,7 +1,6 @@
 #include <ruby.h>
-#include <AL/al.h>
-#include <AL/alc.h>
 #include <pocketsphinx.h>
+#include <sphinxbase/ad.h>
 
 static const arg_t cont_args_def[] = {
     POCKETSPHINX_OPTIONS,
@@ -21,7 +20,8 @@ static VALUE rb_mRist,
              rb_cTranscriber;
 
 static void transcriber_deallocate(Transcriber * transcriber) {
-    ps_free(transcriber -> decoder);
+    if (transcriber -> decoder)
+        ps_free(transcriber -> decoder);
     xfree(transcriber);
 }
 
@@ -57,23 +57,11 @@ static VALUE transcriber_initialize_pocketsphinx(VALUE self, VALUE arguments) {
     return self;
 }
 
-static void close_raise(ALCdevice * device, VALUE error, const char * message) {
-    alcCaptureCloseDevice(device);
+static void close_and_raise(ad_rec_t * ad, VALUE error, const char * message) {
+    ad_close(ad);
     rb_raise(error, "%s\n", message);
 }
 
-static int32 al_read(ALCdevice * device, int16 * buffer, int32 max) {
-    ALCint number;
-
-    alcGetIntegerv(device, ALC_CAPTURE_SAMPLES, sizeof(number), &number);
-    if (number >= 0) {
-        number = (number < max ? number : max);
-        alcCaptureSamples(device, buffer, number);
-    }
-
-    return number;
-}
-
 /* Transcribe speech continuously.
  *
  * for block { |utterance| ... }
@@ -81,46 +69,45 @@ static int32 al_read(ALCdevice * device, int16 * buffer, int32 max) {
  *
  * @yieldparam [String] utterance the utterance transcribed
  */
-static VALUE transcriber_transcribe(VALUE self)
-{
-    ALCdevice * device;
-    ALCuint frequency;
+static VALUE transcriber_transcribe(VALUE self) {
     Transcriber * transcriber;
-    cmd_ln_t *config;
-    const char * hyp;
-    const char * uttid;
+    ad_rec_t * ad;
     int16 adbuf[4096];
     int32 k;
-    ps_decoder_t * ps;
     uint8 utt_started, in_speech;
+    char const * hyp;
+    char const * uttid;
+    cmd_ln_t * config;
+    ps_decoder_t * ps;
 
     Data_Get_Struct(self, Transcriber, transcriber);
     ps = transcriber -> decoder;
     config = ps_get_config(ps);
-    frequency = cmd_ln_float32_r(config, "-samprate");
 
-    device = alcCaptureOpenDevice(NULL, frequency, AL_FORMAT_MONO16, frequency * 10);
-    if (device == NULL)
-        rb_raise(rb_eRuntimeError, "failed to open audio device");
-    alcCaptureStart(device);
+    if ((ad = ad_open_dev(cmd_ln_str_r(config, "-adcdev"),
+                          (int) cmd_ln_float32_r(config,
+                                                 "-samprate"))) == NULL)
+        close_and_raise(ad, rb_eRuntimeError, "failed to open audio device");
+    if (ad_start_rec(ad) < 0)
+        close_and_raise(ad, rb_eRuntimeError, "failed to start recording");
 
     if (ps_start_utt(ps, NULL) < 0)
-        close_raise(device, rb_eRuntimeError, "failed to start utterance");
+        close_and_raise(ad, rb_eRuntimeError, "failed to start utterance");
     utt_started = FALSE;
 
-    /* Indicate listening for next utterance */
     for (;;) {
-        if ((k = al_read(device, adbuf, 4096)) < 0)
-            close_raise(device, rb_eRuntimeError, "failed to read audio");
+        if ((k = ad_read(ad, adbuf, 4096)) < 0)
+            close_and_raise(ad, rb_eRuntimeError, "failed to read audio");
         rb_funcall(self, rb_intern("sleep"), 1, rb_float_new(0.1));
+
         ps_process_raw(ps, adbuf, k, FALSE, FALSE);
         in_speech = ps_get_in_speech(ps);
         if (in_speech && !utt_started) {
             utt_started = TRUE;
         }
         if (!in_speech && utt_started) {
-            //speech -> silence transition, 
-            //time to start new utterance
+            // speech -> silence transition, 
+            // time to start new utterance
             ps_end_utt(ps);
             hyp = ps_get_hyp(ps, NULL, &uttid);
 
@@ -128,12 +115,11 @@ static VALUE transcriber_transcribe(VALUE self)
             rb_yield(rb_str_new2(hyp));
 
             if (ps_start_utt(ps, NULL) < 0)
-                close_raise(device, rb_eRuntimeError, "failed to start utterance");
-            /* Indicate listening for next utterance */
+                close_and_raise(ad, rb_eRuntimeError, "failed to start utterance");
             utt_started = FALSE;
         }
     }
-    alcCaptureCloseDevice(device);
+    ad_close(ad);
 }
 
 void Init_transcriber() {

data/lib/rist/version.rb

@@ -1,3 +1,3 @@
 module Rist
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rist
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Zhi-Qiang Lei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-20 00:00:00.000000000 Z
+date: 2014-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler