coreaudio 0.0.3 → 0.0.4

data/Gemfile

@@ -2,6 +2,7 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
+gem "narray", "~> 0.6.0.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -6,6 +6,7 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    narray (0.6.0.1)
     rake (0.9.2)
     rdoc (3.9.2)
 
@@ -15,5 +16,6 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
+  narray (~> 0.6.0.0)
   rake (~> 0.9.2)
   rdoc

data/README.rdoc

@@ -12,7 +12,6 @@ CoreAudio (Audio Framework of Mac OS X) wrapper library for ruby 1.9
 * Ream audio file (WAV/M4A)
 
 == ToDo
-* Switch input/output audio sample type (signed 16bit integer, packed String)
 * Wrapper for AudioUnit/AudioGraph
 
 == Contributing to coreaudio

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/coreaudio.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "coreaudio"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["CHIKANAGA Tomoyuki"]
-  s.date = "2011-10-16"
+  s.date = "2011-10-28"
   s.description = "Mac OS X CoreAudio wrapper library"
   s.email = "nagachika00@gmail.com"
   s.extensions = ["ext/extconf.rb"]
@@ -27,16 +27,20 @@ Gem::Specification.new do |s|
     "VERSION",
     "coreaudio.gemspec",
     "examples/convert_wav_to_m4a.rb",
+    "examples/fft_shift_pitch.rb",
+    "examples/loopback_delay.rb",
     "examples/outbuffer_sine.rb",
     "examples/outloop_sine.rb",
     "examples/record_to_wave.rb",
+    "examples/ring_modulator.rb",
     "ext/audiofile.m",
     "ext/coreaudio.h",
     "ext/coreaudio.m",
     "ext/coreaudio_missing.c",
     "ext/depend",
     "ext/extconf.rb",
-    "lib/coreaudio.rb"
+    "lib/coreaudio.rb",
+    "lib/coreaudio/audiofile.rb"
   ]
   s.homepage = "https://github.com/nagachika/ruby-coreaudio"
   s.licenses = ["BSDL"]
@@ -48,17 +52,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<narray>, ["~> 0.6.0.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
     else
+      s.add_dependency(%q<narray>, ["~> 0.6.0.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rake>, ["~> 0.9.2"])
       s.add_dependency(%q<rdoc>, [">= 0"])
     end
   else
+    s.add_dependency(%q<narray>, ["~> 0.6.0.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rake>, ["~> 0.9.2"])

data/examples/convert_wav_to_m4a.rb

@@ -6,11 +6,11 @@ wav = CoreAudio::AudioFile.new("sample.wav", :read)
 
 m4a = CoreAudio::AudioFile.new("sample.m4a", :write, :format => :m4a,
                                :rate => wav.rate,
-                               :channel => wav.channel)
+                               :channels => wav.channels)
 
 loop do
   buf = wav.read(1024)
-  break if buf.empty?
+  break if buf.nil?
   m4a.write(buf)
 end
 

data/examples/fft_shift_pitch.rb

@@ -0,0 +1,47 @@
+
+require "thread"
+require "fftw3"
+require "coreaudio"
+
+Thread.abort_on_exception = true
+
+inbuf = CoreAudio.default_input_device.input_buffer(1024)
+outbuf = CoreAudio.default_output_device.output_buffer(1024)
+
+queue = Queue.new
+pitch_shift_th = Thread.start do
+  while w = queue.pop
+    half = w.shape[1] / 2
+    f = FFTW3.fft(w, 1)
+    shift = 12
+    f.shape[0].times do |ch|
+      f[ch, shift...half] = f[ch, 0...(half-shift)]
+      f[ch, 0...shift] = 0
+      f[ch, half...(w.shape[1]-shift)] = f[ch, (half+shift)..-1]
+      f[ch, -shift..-1] = 0
+    end
+    outbuf << FFTW3.ifft(f, 1) / w.shape[1]
+  end
+end
+
+th = Thread.start do
+  loop do
+    wav = inbuf.read(1024)
+    queue.push(wav)
+  end
+end
+
+inbuf.start
+outbuf.start
+$stdout.print "loopback..."
+$stdout.flush
+sleep 10;
+queue.push(nil)
+inbuf.stop
+outbuf.stop
+$stdout.puts "done."
+th.kill.join
+pitch_shift_th.kill.join
+
+puts "#{inbuf.dropped_frame} frame dropped at input buffer."
+puts "#{outbuf.dropped_frame} frame dropped at output buffer."

data/examples/loopback_delay.rb

@@ -0,0 +1,30 @@
+
+require "coreaudio"
+
+inbuf = CoreAudio.default_input_device.input_buffer(1024)
+outbuf = CoreAudio.default_output_device.output_buffer(1024)
+
+th = Thread.start do
+  ary = []
+  loop do
+    wav = inbuf.read(1024)
+    ary.push(wav)
+    # 1024*43 frames delayed. about 1 sec when sample rate = 44100Hz
+    if ary.size > 43
+      outbuf << ary.shift
+    end
+  end
+end
+
+inbuf.start
+outbuf.start
+$stdout.print "loopback..."
+$stdout.flush
+sleep 10;
+inbuf.stop
+outbuf.stop
+$stdout.puts "done."
+th.kill.join
+
+puts "#{inbuf.dropped_frame} frame dropped at input buffer."
+puts "#{outbuf.dropped_frame} frame dropped at output buffer."

data/examples/outbuffer_sine.rb

@@ -6,8 +6,9 @@ buf = dev.output_buffer(1024)
 phase = Math::PI * 2.0 * 440.0 / dev.nominal_rate
 th = Thread.start do
   i = 0
+  wav = NArray.sint(1024)
   loop do
-    wav = Array.new(1024){|j| (0.4 * Math.sin(phase*(i+j)) * 0x7FFF).round }
+    1024.times {|j| wav[j] = (0.4 * Math.sin(phase*(i+j)) * 0x7FFF).round }
     i += 1024
     buf << wav
   end
@@ -19,4 +20,4 @@ buf.stop
 
 puts "#{buf.dropped_frame} frame dropped."
 
-th.kill
+th.kill.join

data/examples/record_to_wave.rb

@@ -6,7 +6,7 @@ buf = dev.input_buffer(1024)
 
 wav = CoreAudio::AudioFile.new("sample.wav", :write, :format => :wav,
                                :rate => dev.nominal_rate,
-                               :channel => dev.input_stream.channels)
+                               :channels => dev.input_stream.channels)
 
 samples = 0
 th = Thread.start do

data/examples/ring_modulator.rb

@@ -0,0 +1,42 @@
+
+require "thread"
+require "coreaudio"
+
+Thread.abort_on_exception = true
+
+inbuf = CoreAudio.default_input_device.input_buffer(1024)
+outbuf = CoreAudio.default_output_device.output_buffer(1024)
+
+queue = Queue.new
+output_th = Thread.start do
+  filter = NArray.float(2, 1024)
+  filter.shape[1].times do |i|
+    filter[true, i] = (i % 256 - 128) / 128.0
+  end
+
+  while w = queue.pop
+    outbuf << w * filter
+  end
+end
+
+input_th = Thread.start do
+  loop do
+    wav = inbuf.read(1024)
+    queue.push(wav)
+  end
+end
+
+inbuf.start
+outbuf.start
+$stdout.print "loopback..."
+$stdout.flush
+sleep 10;
+queue.push(nil)
+inbuf.stop
+outbuf.stop
+$stdout.puts "done."
+input_th.kill.join
+output_th.kill.join
+
+puts "#{inbuf.dropped_frame} frame dropped at input buffer."
+puts "#{outbuf.dropped_frame} frame dropped at output buffer."

data/ext/audiofile.m

@@ -14,7 +14,7 @@
 VALUE rb_cAudioFile;
 
 static VALUE sym_read, sym_write, sym_format;
-static VALUE sym_rate, sym_file_rate, sym_channel, sym_file_channel;
+static VALUE sym_rate, sym_file_rate, sym_channels, sym_file_channels;
 static VALUE sym_wav, sym_m4a;
 
 static void
@@ -22,7 +22,7 @@ setASBD(AudioStreamBasicDescription *asbd,
         Float64 rate,
         UInt32 format,
         UInt32 flags,
-        UInt32 channel,
+        UInt32 channels,
         UInt32 bitsPerChannel,
         UInt32 framePerPacket)
 {
@@ -30,10 +30,10 @@ setASBD(AudioStreamBasicDescription *asbd,
     asbd->mFormatID = format;
     asbd->mFormatFlags = flags;
     asbd->mBitsPerChannel = bitsPerChannel;
-    asbd->mChannelsPerFrame = channel;
+    asbd->mChannelsPerFrame = channels;
     asbd->mFramesPerPacket = framePerPacket;
-    asbd->mBytesPerFrame = bitsPerChannel/8*channel;
-    asbd->mBytesPerPacket = bitsPerChannel/8*channel*framePerPacket;
+    asbd->mBytesPerFrame = bitsPerChannel/8*channels;
+    asbd->mBytesPerPacket = bitsPerChannel/8*channels*framePerPacket;
 }
 
 typedef struct {
@@ -80,7 +80,7 @@ ca_audio_file_alloc(VALUE klass)
 static void
 parse_audio_file_options(VALUE opt, Boolean for_write,
                          Float64 *rate, Float64 *file_rate,
-                         UInt32 *channel, UInt32 *file_channel)
+                         UInt32 *channels, UInt32 *file_channels)
 {
     if (NIL_P(opt) || NIL_P(rb_hash_aref(opt, sym_rate))) {
       if (for_write)
@@ -90,13 +90,13 @@ parse_audio_file_options(VALUE opt, Boolean for_write,
     } else {
       *rate = NUM2DBL(rb_hash_aref(opt, sym_rate));
     }
-    if (NIL_P(opt) || NIL_P(rb_hash_aref(opt, sym_channel))) {
+    if (NIL_P(opt) || NIL_P(rb_hash_aref(opt, sym_channels))) {
       if (for_write)
-        *channel = 2;
+        *channels = 2;
       else
-        *channel = *file_channel;
+        *channels = *file_channels;
     } else {
-      *channel = NUM2UINT(rb_hash_aref(opt, sym_channel));
+      *channels = NUM2UINT(rb_hash_aref(opt, sym_channels));
     }
 
     if (for_write) {
@@ -105,10 +105,10 @@ parse_audio_file_options(VALUE opt, Boolean for_write,
       } else {
         *file_rate = NUM2DBL(rb_hash_aref(opt, sym_file_rate));
       }
-      if (NIL_P(opt) || NIL_P(rb_hash_aref(opt, sym_file_channel))) {
-        *file_channel = *channel;
+      if (NIL_P(opt) || NIL_P(rb_hash_aref(opt, sym_file_channels))) {
+        *file_channels = *channels;
       } else {
-        *file_channel = NUM2UINT(rb_hash_aref(opt, sym_file_channel));
+        *file_channels = NUM2UINT(rb_hash_aref(opt, sym_file_channels));
       }
     }
 }
@@ -128,9 +128,9 @@ parse_audio_file_options(VALUE opt, Boolean for_write,
  *            codec type is hardcoded. (:wav, :m4a)
  * :rate :: sample rate of data pass from AudioFile#read or to AudioFile#write
  *          If not specified, :file_rate value is used. (Float)
- * :channel :: number of channels
+ * :channels :: number of channels
  * :file_rate :: file data sample rate. only work when open for output. (Float)
- * :file_channel :: file data number of channels. only work when open for
+ * :file_channels :: file data number of channels. only work when open for
  *                  output.
  */
 static VALUE
@@ -139,7 +139,7 @@ ca_audio_file_initialize(int argc, VALUE *argv, VALUE self)
     ca_audio_file_t *data;
     VALUE path, mode, opt, format;
     Float64 rate, file_rate;
-    UInt32 channel, file_channel;
+    UInt32 channels, file_channels;
     CFURLRef url = NULL;
     AudioFileTypeID filetype = 0;
     OSStatus err = noErr;
@@ -159,7 +159,7 @@ ca_audio_file_initialize(int argc, VALUE *argv, VALUE self)
     if (data->for_write) {
       /* when open for write, parse options before open ExtAudioFile */
       parse_audio_file_options(opt, data->for_write, &rate, &file_rate,
-                               &channel, &file_channel);
+                               &channels, &file_channels);
 
       format = rb_hash_aref(opt, sym_format);
       if (NIL_P(format))
@@ -170,11 +170,11 @@ ca_audio_file_initialize(int argc, VALUE *argv, VALUE self)
         setASBD(&data->file_desc, file_rate, kAudioFormatLinearPCM,
                 kLinearPCMFormatFlagIsSignedInteger |
                 kAudioFormatFlagIsPacked,
-                file_channel, 16, 1);
+                file_channels, 16, 1);
       } else if (format == sym_m4a) {
         filetype = kAudioFileM4AType;
         setASBD(&data->file_desc, file_rate, kAudioFormatMPEG4AAC,
-                0, file_channel, 0, 0);
+                0, file_channels, 0, 0);
       } else {
         volatile VALUE str = rb_inspect(format);
         RB_GC_GUARD(str);
@@ -213,14 +213,14 @@ ca_audio_file_initialize(int argc, VALUE *argv, VALUE self)
 
       /* parse options */
       file_rate = data->file_desc.mSampleRate;
-      file_channel = data->file_desc.mChannelsPerFrame;
+      file_channels = data->file_desc.mChannelsPerFrame;
       parse_audio_file_options(opt, data->for_write, &rate, &file_rate,
-                               &channel, &file_channel);
+                               &channels, &file_channels);
     }
 
     setASBD(&data->inner_desc, rate, kAudioFormatLinearPCM,
             kLinearPCMFormatFlagIsSignedInteger | kAudioFormatFlagIsPacked,
-            channel, 16, 1);
+            channels, 16, 1);
 
     err = ExtAudioFileSetProperty(
             data->file, kExtAudioFileProperty_ClientDataFormat,
@@ -253,16 +253,20 @@ static VALUE
 ca_audio_file_write(VALUE self, VALUE data)
 {
     ca_audio_file_t *file;
-    short *buf;
+    UInt32 n_ch;
+    int rank;
+    short *buf = NULL;
     AudioBufferList buf_list;
     UInt32 frames;
     size_t alloc_size;
-    volatile VALUE tmpstr;
+    volatile VALUE tmpstr = Qundef;
     OSStatus err = noErr;
-    int i;
 
-    if (!RB_TYPE_P(data, T_ARRAY))
-      rb_raise(rb_eArgError, "coreaudio: audio buffer must be an array");
+    /* cast to NArray of SINT and check rank of NArray */
+    data = na_cast_object(data, NA_SINT);
+    rank = NA_RANK(data);
+    if (rank > 3)
+      rb_raise(rb_eArgError, "coreaudio: audio buffer rank must be 1 or 2.");
 
     TypedData_Get_Struct(self, ca_audio_file_t, &ca_audio_file_type, file);
 
@@ -272,23 +276,42 @@ ca_audio_file_write(VALUE self, VALUE data)
     if (!file->for_write)
       rb_raise(rb_eRuntimeError, "coreaudio: audio file opened for reading");
 
-    frames = RARRAY_LENINT(data) / file->inner_desc.mChannelsPerFrame;
-    alloc_size = (file->inner_desc.mBitsPerChannel/8) * RARRAY_LEN(data);
+    n_ch = file->inner_desc.mChannelsPerFrame;
+
+    if (rank == 2 && NA_SHAPE0(data) != (int)n_ch)
+      rb_raise(rb_eArgError,
+               "coreaudio: audio buffer size of first dimension must be "
+               "equal to number of channels");
+
+    frames = rank == 1 ? NA_SHAPE0(data) : NA_SHAPE1(data);
+    alloc_size = (file->inner_desc.mBitsPerChannel/8) * frames * n_ch;
 
     /* prepare interleaved audio buffer */
     buf_list.mNumberBuffers = 1;
-    buf_list.mBuffers[0].mNumberChannels = file->inner_desc.mChannelsPerFrame;
+    buf_list.mBuffers[0].mNumberChannels = n_ch;
     buf_list.mBuffers[0].mDataByteSize = (UInt32)alloc_size;
-    buf_list.mBuffers[0].mData = rb_alloc_tmp_buffer(&tmpstr, alloc_size);
-    buf = buf_list.mBuffers[0].mData;
 
-    for (i = 0; i < RARRAY_LEN(data); i++) {
-      buf[i] = (short)NUM2INT(RARRAY_PTR(data)[i]);
+    if ((rank == 1 && n_ch == 1) || rank == 2) {
+      /* no need to allocate buffer. NArray buffer can be used as mData */
+      buf_list.mBuffers[0].mData = NA_PTR_TYPE(data, void *);
+    } else {
+      UInt32 i, j;
+      short *na_buf = NA_PTR_TYPE(data, short *);
+
+      buf_list.mBuffers[0].mData = rb_alloc_tmp_buffer(&tmpstr, alloc_size);
+      buf = buf_list.mBuffers[0].mData;
+
+      for (i = 0; i < frames; i++) {
+        for (j = 0; j < n_ch; j++) {
+          buf[i*n_ch+j] = na_buf[i];
+        }
+      }
     }
 
     err = ExtAudioFileWrite(file->file, frames, &buf_list);
 
-    rb_free_tmp_buffer(&tmpstr);
+    if (tmpstr != Qundef)
+      rb_free_tmp_buffer(&tmpstr);
 
     if (err != noErr) {
       rb_raise(rb_eRuntimeError,
@@ -299,19 +322,18 @@ ca_audio_file_write(VALUE self, VALUE data)
 }
 
 static VALUE
-ca_audio_file_read(int argc, VALUE *argv, VALUE self)
+ca_audio_file_read_frames(VALUE self, VALUE frame_val)
 {
     ca_audio_file_t *file;
-    VALUE frame_val;
-    UInt32 frames, chunk, total, read_frames;
+    UInt32 channels, frames, read_frames;
     AudioBufferList buf_list;
-    short *buf;
     size_t alloc_size;
-    volatile VALUE tmpstr;
-    VALUE ary;
-    UInt32 i;
+    VALUE nary;
+    int shape[2];
     OSStatus err = noErr;
 
+    frames = NUM2UINT(frame_val);
+
     TypedData_Get_Struct(self, ca_audio_file_t, &ca_audio_file_type, file);
 
     if (file->file == NULL)
@@ -320,48 +342,34 @@ ca_audio_file_read(int argc, VALUE *argv, VALUE self)
     if (file->for_write)
       rb_raise(rb_eRuntimeError, "coreaudio: audio file open for writing");
 
-    rb_scan_args(argc, argv, "01", &frame_val);
+    channels = file->inner_desc.mChannelsPerFrame;
 
-    if (NIL_P(frame_val)) {
-      frames = 0;
-      chunk = 1024;
-    } else {
-      frames = chunk = NUM2UINT(frame_val);
-    }
+    shape[0] = channels;
+    shape[1] = frames;
+    nary = na_make_object(NA_SINT, 2, shape, cNArray);
 
-    alloc_size = (file->inner_desc.mBitsPerChannel/8) *
-      file->inner_desc.mChannelsPerFrame * chunk;
+    alloc_size = (file->inner_desc.mBitsPerChannel/8) * channels * frames;
 
     /* prepare interleaved audio buffer */
     buf_list.mNumberBuffers = 1;
-    buf_list.mBuffers[0].mNumberChannels = file->inner_desc.mChannelsPerFrame;
+    buf_list.mBuffers[0].mNumberChannels = channels;
     buf_list.mBuffers[0].mDataByteSize = (UInt32)alloc_size;
-    buf_list.mBuffers[0].mData = rb_alloc_tmp_buffer(&tmpstr, alloc_size);
-    buf = buf_list.mBuffers[0].mData;
+    buf_list.mBuffers[0].mData = NA_PTR_TYPE(nary, void *);
 
-    ary = rb_ary_new2(chunk*file->inner_desc.mChannelsPerFrame);
+    read_frames = frames;
+    err = ExtAudioFileRead(file->file, &read_frames, &buf_list);
 
-    for (total = 0; total < frames || frames == 0; total += read_frames) {
-      read_frames = chunk;
-      err = ExtAudioFileRead(file->file, &read_frames, &buf_list);
-
-      if (err != noErr) {
-        rb_free_tmp_buffer(&tmpstr);
-        rb_raise(rb_eRuntimeError,
-                 "coreaudio: ExtAudioFileRead() fails: %d", (int)err);
-      }
-
-      if (read_frames == 0)
-        break;
-
-      for (i = 0; i < read_frames * file->inner_desc.mChannelsPerFrame; i++) {
-        rb_ary_push(ary, INT2NUM((int)buf[i]));
-      }
+    if (err != noErr) {
+      rb_raise(rb_eRuntimeError,
+               "coreaudio: ExtAudioFileRead() fails: %d", (int)err);
     }
 
-    rb_free_tmp_buffer(&tmpstr);
+    if (read_frames == 0)
+      return Qnil;
+
+    NA_SHAPE1(nary) = read_frames;
 
-    return ary;
+    return nary;
 }
 
 static VALUE
@@ -375,7 +383,7 @@ ca_audio_file_rate(VALUE self)
 }
 
 static VALUE
-ca_audio_file_channel(VALUE self)
+ca_audio_file_channels(VALUE self)
 {
     ca_audio_file_t *data;
 
@@ -395,7 +403,7 @@ ca_audio_file_inner_rate(VALUE self)
 }
 
 static VALUE
-ca_audio_file_inner_channel(VALUE self)
+ca_audio_file_inner_channels(VALUE self)
 {
     ca_audio_file_t *data;
 
@@ -412,8 +420,8 @@ Init_coreaudio_audiofile(void)
     sym_format = ID2SYM(rb_intern("format"));
     sym_rate = ID2SYM(rb_intern("rate"));
     sym_file_rate = ID2SYM(rb_intern("file_rate"));
-    sym_channel = ID2SYM(rb_intern("channel"));
-    sym_file_channel = ID2SYM(rb_intern("file_channel"));
+    sym_channels = ID2SYM(rb_intern("channels"));
+    sym_file_channels = ID2SYM(rb_intern("file_channels"));
     sym_wav = ID2SYM(rb_intern("wav"));
     sym_m4a = ID2SYM(rb_intern("m4a"));
 
@@ -424,9 +432,9 @@ Init_coreaudio_audiofile(void)
     rb_define_method(rb_cAudioFile, "initialize", ca_audio_file_initialize, -1);
     rb_define_method(rb_cAudioFile, "close", ca_audio_file_close, 0);
     rb_define_method(rb_cAudioFile, "write", ca_audio_file_write, 1);
-    rb_define_method(rb_cAudioFile, "read", ca_audio_file_read, -1);
+    rb_define_method(rb_cAudioFile, "read_frames", ca_audio_file_read_frames, 1);
     rb_define_method(rb_cAudioFile, "rate", ca_audio_file_rate, 0);
-    rb_define_method(rb_cAudioFile, "channel", ca_audio_file_channel, 0);
+    rb_define_method(rb_cAudioFile, "channels", ca_audio_file_channels, 0);
     rb_define_method(rb_cAudioFile, "inner_rate", ca_audio_file_inner_rate, 0);
-    rb_define_method(rb_cAudioFile, "inner_channel", ca_audio_file_inner_channel, 0);
+    rb_define_method(rb_cAudioFile, "inner_channels", ca_audio_file_inner_channels, 0);
 }

data/ext/coreaudio.h

@@ -3,6 +3,7 @@
 
 #include <ruby.h>
 
+#include "narray.h"
 #include "extconf.h"
 
 extern VALUE rb_mCoreAudio;

data/ext/coreaudio.m

@@ -374,7 +374,7 @@ typedef struct {
   AudioDeviceID       devID;
   AudioDeviceIOProcID procID;
   UInt32              frame;
-  UInt32              channel;
+  UInt32              channels;
   short               *buf;
 } ca_out_loop_data;
 
@@ -395,7 +395,7 @@ static size_t
 ca_out_loop_data_memsize(const void *ptr)
 {
     const ca_out_loop_data *data = ptr;
-    return sizeof(ca_out_loop_data) + data->channel * data->frame * sizeof(short);
+    return sizeof(ca_out_loop_data) + data->channels * data->frame * sizeof(short);
 }
 
 static const rb_data_type_t ca_out_loop_data_type = {
@@ -416,16 +416,16 @@ ca_out_loop_proc(
     NSUInteger i;
     UInt32 buffers = outOutputData->mNumberBuffers;
     ca_out_loop_data *loop_data = inClientData;
-    UInt32 channel = loop_data->channel;
+    UInt32 channels = loop_data->channels;
 
     for (i = 0; i < buffers; i++) {
       float *ptr = outOutputData->mBuffers[i].mData;
-      UInt32 size = outOutputData->mBuffers[i].mDataByteSize / (UInt32)sizeof(float) / channel;
+      UInt32 size = outOutputData->mBuffers[i].mDataByteSize / (UInt32)sizeof(float) / channels;
       UInt32 offset = (UInt32)inOutputTime->mSampleTime % loop_data->frame;
       UInt32 copied = 0;
 
-      if (outOutputData->mBuffers[i].mNumberChannels != channel) {
-        memset(ptr, 0, size * channel * sizeof(float));
+      if (outOutputData->mBuffers[i].mNumberChannels != channels) {
+        memset(ptr, 0, size * channels * sizeof(float));
         continue;
       }
 
@@ -434,8 +434,8 @@ ca_out_loop_proc(
         UInt32 j;
         if ( len > size - copied )
           len = size - copied;
-        for (j = 0; j < len*channel; j++) {
-          ptr[copied*channel+j] = SHORT2FLOAT(loop_data->buf[offset*channel+j]);
+        for (j = 0; j < len*channels; j++) {
+          ptr[copied*channels+j] = SHORT2FLOAT(loop_data->buf[offset*channels+j]);
         }
         offset = (offset + len) % loop_data->frame;
         copied += len;
@@ -456,7 +456,7 @@ ca_out_loop_data_alloc(VALUE klass)
 }
 
 static VALUE
-ca_out_loop_data_initialize(VALUE self, VALUE devID, VALUE frame, VALUE channel)
+ca_out_loop_data_initialize(VALUE self, VALUE devID, VALUE frame, VALUE channels)
 {
     ca_out_loop_data *data;
     OSStatus status;
@@ -469,8 +469,8 @@ ca_out_loop_data_initialize(VALUE self, VALUE devID, VALUE frame, VALUE channel)
       rb_raise(rb_eRuntimeError, "coreaudio: create proc ID fail: %d", status);
     }
     data->frame = NUM2UINT(frame);
-    data->channel = NUM2UINT(channel);
-    data->buf = malloc(sizeof(short)*data->frame*data->channel);
+    data->channels = NUM2UINT(channels);
+    data->buf = malloc(sizeof(short)*data->frame*data->channels);
     if (data->buf == NULL)
       rb_raise(rb_eNoMemError, "coreaudio: fail to alloc out loop data buffer");
     return self;
@@ -550,7 +550,7 @@ ca_out_loop_data_stop(VALUE self)
  *
  * Assign audio loop buffer frame value.
  * If assigned value is an Fixnum (-32767..32767, signed 16bit),
- * the value is stored to all channel.
+ * the value is stored to all channels.
  * The +sample+ should be normalize to -32767 <= sample <= 32767 range.
  * If assigned value is an Array of Fixnum, each value is stored to each
  * correponding channel. If size of array is not equal to the AudioDevice's
@@ -567,15 +567,15 @@ ca_out_loop_data_assign(VALUE self, VALUE index, VALUE val)
 
     idx = NUM2UINT(index) % data->frame;
     if (TYPE(val) == T_ARRAY) {
-      if (RARRAY_LEN(val) != data->channel) {
+      if (RARRAY_LEN(val) != data->channels) {
         rb_raise(rb_eArgError, "size of array and channel size mismatch");
       }
-      for (i = 0; i < data->channel; i++) {
-        data->buf[idx*data->channel+i] = (short)NUM2INT(RARRAY_PTR(val)[i]);
+      for (i = 0; i < data->channels; i++) {
+        data->buf[idx*data->channels+i] = (short)NUM2INT(RARRAY_PTR(val)[i]);
       }
     } else {
-      for (i = 0; i < data->channel; i++) {
-        data->buf[idx*data->channel+i] = (short)NUM2INT(val);
+      for (i = 0; i < data->channels; i++) {
+        data->buf[idx*data->channels+i] = (short)NUM2INT(val);
       }
     }
     return val;
@@ -585,7 +585,7 @@ typedef struct {
   AudioDeviceID       devID;
   AudioDeviceIOProcID procID;
   UInt32              frame;
-  UInt32              channel;
+  UInt32              channels;
   short               *buf;
   UInt32              start;
   UInt32              end;
@@ -613,7 +613,7 @@ static size_t
 ca_buffer_data_memsize(const void *ptr)
 {
     const ca_buffer_data *data = ptr;
-    return sizeof(ca_buffer_data) + data->channel * data->frame * sizeof(short);
+    return sizeof(ca_buffer_data) + data->channels * data->frame * sizeof(short);
 }
 
 static const rb_data_type_t ca_buffer_data_type = {
@@ -754,31 +754,31 @@ ca_out_buffer_proc(
     NSUInteger n_buf;
     UInt32 buffers = outOutputData->mNumberBuffers;
     ca_buffer_data *buffer_data = inClientData;
-    UInt32 channel = buffer_data->channel;
+    UInt32 channels = buffer_data->channels;
 
     for (n_buf = 0; n_buf < buffers; n_buf++) {
       float *ptr = outOutputData->mBuffers[n_buf].mData;
-      UInt32 size = outOutputData->mBuffers[n_buf].mDataByteSize / (UInt32)sizeof(float) / channel;
+      UInt32 size = outOutputData->mBuffers[n_buf].mDataByteSize / (UInt32)sizeof(float) / channels;
       UInt32 copied = 0;
       UInt32 i;
 
-      if (outOutputData->mBuffers[n_buf].mNumberChannels != channel) {
-        memset(ptr, 0, size * channel * sizeof(float));
+      if (outOutputData->mBuffers[n_buf].mNumberChannels != channels) {
+        memset(ptr, 0, size * channels * sizeof(float));
         continue;
       }
 
       pthread_mutex_lock(&buffer_data->mutex);
       for ( copied = 0, i = buffer_data->start; copied < size && i != buffer_data->end; copied++, i = (i+1) % buffer_data->frame ) {
         UInt32 ch;
-        for (ch = 0; ch < channel; ch++) {
-          ptr[copied*channel+ch] = SHORT2FLOAT(buffer_data->buf[i*channel+ch]);
+        for (ch = 0; ch < channels; ch++) {
+          ptr[copied*channels+ch] = SHORT2FLOAT(buffer_data->buf[i*channels+ch]);
         }
       }
       buffer_data->start = i;
       pthread_cond_broadcast(&buffer_data->cond);
       pthread_mutex_unlock(&buffer_data->mutex);
       if ( copied < size ) {
-        memset(ptr+(copied*channel), 0, sizeof(float)*channel*(size-copied));
+        memset(ptr+(copied*channels), 0, sizeof(float)*channels*(size-copied));
         buffer_data->dropped_frame += size - copied;
       }
     }
@@ -787,7 +787,7 @@ ca_out_buffer_proc(
 }
 
 static VALUE
-ca_out_buffer_data_initialize(VALUE self, VALUE devID, VALUE frame, VALUE channel)
+ca_out_buffer_data_initialize(VALUE self, VALUE devID, VALUE frame, VALUE channels)
 {
     ca_buffer_data *data;
     OSStatus status;
@@ -800,8 +800,8 @@ ca_out_buffer_data_initialize(VALUE self, VALUE devID, VALUE frame, VALUE channe
       rb_raise(rb_eRuntimeError, "coreaudio: create proc ID fail: %d", status);
     }
     data->frame = NUM2UINT(frame);
-    data->channel = NUM2UINT(channel);
-    data->buf = malloc(sizeof(short)*data->frame*data->channel);
+    data->channels = NUM2UINT(channels);
+    data->buf = malloc(sizeof(short)*data->frame*data->channels);
     if (data->buf == NULL)
       rb_raise(rb_eNoMemError, "coreaudio: fail to alloc out buffer data buffer");
     return self;
@@ -820,19 +820,37 @@ ca_device_create_out_buffer_proc(VALUE self, VALUE frame)
 }
 
 static VALUE
-ca_out_buffer_data_append(VALUE self, VALUE ary)
+ca_out_buffer_data_append(VALUE self, VALUE nary)
 {
     ca_buffer_data *data;
+    int rank;
+    short *buf;
+    UInt32 frames;
     UInt32 idx;
-    VALUE val;
     long i;
     UInt32 j;
 
     TypedData_Get_Struct(self, ca_buffer_data, &ca_buffer_data_type, data);
 
+    nary = na_cast_object(nary, NA_SINT);
+    rank = NA_RANK(nary);
+    if (rank == 1) {
+      frames = NA_SHAPE0(nary);
+    } else if (rank == 2) {
+      frames = NA_SHAPE1(nary);
+      if (NA_SHAPE0(nary) != (int)data->channels)
+        rb_raise(rb_eArgError,
+                 "coreaudio: audio buffer NArray size of first dim. must be "
+                 "number of channels");
+    } else {
+      rb_raise(rb_eArgError,
+               "coreaudio: audio buffer NArray rank must be 1 or 2");
+    }
+    buf = NA_PTR_TYPE(nary, short *);
+
     pthread_mutex_lock(&data->mutex);
     idx = data->end;
-    for ( i = 0; i < RARRAY_LEN(ary); i++, idx = (idx+1)%data->frame) {
+    for ( i = 0; i < frames; i++, idx = (idx+1)%data->frame) {
       while ( (idx+1) % data->frame == data->start ) {
         int ret, state;
         data->end = idx;
@@ -852,19 +870,14 @@ ca_out_buffer_data_append(VALUE self, VALUE ary)
             break;
         }
       }
-      val = RARRAY_PTR(ary)[i];
 
-      if (TYPE(val) == T_ARRAY) {
-        if (RARRAY_LEN(val) != data->channel) {
-          pthread_mutex_unlock(&data->mutex);
-          rb_raise(rb_eArgError, "size of array and channel size mismatch");
-        }
-        for (j = 0; j < data->channel; j++) {
-          data->buf[idx*data->channel+j] = (short)NUM2INT(RARRAY_PTR(val)[j]);
-        }
+      if (rank == 2) {
+        memcpy(data->buf + idx * data->channels,
+               buf + i * data->channels,
+               sizeof(short) * data->channels);
       } else {
-        for (j = 0; j < data->channel; j++) {
-          data->buf[idx*data->channel+j] = (short)NUM2INT(val);
+        for (j = 0; j < data->channels; j++) {
+          data->buf[idx*data->channels+j] = buf[i];
         }
       }
       data->end = idx;
@@ -891,14 +904,14 @@ ca_in_buffer_proc(
     NSUInteger n_buf;
     UInt32 buffers = inInputData->mNumberBuffers;
     ca_buffer_data *buffer_data = inClientData;
-    UInt32 channel = buffer_data->channel;
+    UInt32 channels = buffer_data->channels;
 
     for (n_buf = 0; n_buf < buffers; n_buf++) {
       float *ptr = inInputData->mBuffers[n_buf].mData;
-      UInt32 size = inInputData->mBuffers[n_buf].mDataByteSize / (UInt32)sizeof(float) / channel;
+      UInt32 size = inInputData->mBuffers[n_buf].mDataByteSize / (UInt32)sizeof(float) / channels;
       UInt32 copied, idx;
 
-      if (inInputData->mBuffers[n_buf].mNumberChannels != channel) {
+      if (inInputData->mBuffers[n_buf].mNumberChannels != channels) {
         continue;
       }
 
@@ -909,8 +922,8 @@ ca_in_buffer_proc(
            copied < size && (idx+1) % buffer_data->frame != buffer_data->start;
            copied++, idx = (idx+1) % buffer_data->frame) {
         UInt32 ch;
-        for (ch = 0; ch < channel; ch++) {
-          buffer_data->buf[idx*channel+ch] = FLOAT2SHORT(ptr[copied*channel+ch]);
+        for (ch = 0; ch < channels; ch++) {
+          buffer_data->buf[idx*channels+ch] = FLOAT2SHORT(ptr[copied*channels+ch]);
         }
       }
       buffer_data->end = idx;
@@ -924,7 +937,7 @@ ca_in_buffer_proc(
 }
 
 static VALUE
-ca_in_buffer_data_initialize(VALUE self, VALUE devID, VALUE frame, VALUE channel)
+ca_in_buffer_data_initialize(VALUE self, VALUE devID, VALUE frame, VALUE channels)
 {
     ca_buffer_data *data;
     OSStatus status;
@@ -937,8 +950,8 @@ ca_in_buffer_data_initialize(VALUE self, VALUE devID, VALUE frame, VALUE channel
       rb_raise(rb_eRuntimeError, "coreaudio: create proc ID fail: %d", status);
     }
     data->frame = NUM2UINT(frame);
-    data->channel = NUM2UINT(channel);
-    data->buf = malloc(sizeof(short)*data->frame*data->channel);
+    data->channels = NUM2UINT(channels);
+    data->buf = malloc(sizeof(short)*data->frame*data->channels);
     if (data->buf == NULL)
       rb_raise(rb_eNoMemError, "coreaudio: fail to alloc input buffer data buffer");
     return self;
@@ -961,13 +974,17 @@ ca_in_buffer_data_read(VALUE self, VALUE num)
 {
     ca_buffer_data *data;
     UInt32 frame = NUM2UINT(num);
-    VALUE val;
+    VALUE nary;
+    int shape[2];
+    short *buf;
     UInt32 i;
-    UInt32 j;
 
     TypedData_Get_Struct(self, ca_buffer_data, &ca_buffer_data_type, data);
 
-    val = rb_ary_new2(frame * data->channel);
+    shape[0] = data->channels;
+    shape[1] = frame;
+    nary = na_make_object(NA_SINT, 2, shape, cNArray);
+    buf = NA_PTR_TYPE(nary, short *);
 
     pthread_mutex_lock(&data->mutex);
     for ( i = 0; i < frame; i++, data->start = (data->start+1)%data->frame) {
@@ -989,12 +1006,11 @@ ca_in_buffer_data_read(VALUE self, VALUE num)
             break;
         }
       }
-      for ( j = 0; j < data->channel; j++ ) {
-        rb_ary_push(val, INT2NUM((double)data->buf[data->start*data->channel+j]));
-      }
+      memcpy(buf + i * data->channels, data->buf + data->start*data->channels,
+             sizeof(short) * data->channels);
     }
     pthread_mutex_unlock(&data->mutex);
-    return val;
+    return nary;
 }
 
 void

data/ext/extconf.rb

@@ -17,7 +17,33 @@ unless defined?(have_framework)
   end
 end
 
-dir_config("coreaudio")
+begin
+  files = Gem.find_files("narray.h")
+  if files.empty?
+    narray_dir = $sitearchdir
+  else
+    narray_dir = File.dirname(files.first)
+  end
+rescue
+  narray_dir = $sitearchdir
+end
+dir_config("narray", narray_dir, narray_dir)
+
+if not(have_header("narray.h") and have_header("narray_config.h"))
+  print <<-EOS
+** configure error **
+narray.h or narray_config.h is not found.
+If you have installed narray to /path/to/narray, try the following:
+
+ % ruby extconf.rb --with-narray-dir=/path/to/narray
+
+or
+ % gem install coreaudio -- --with-narray-dir=/path/to/narray
+
+  EOS
+  exit false
+end
+
 if have_framework("CoreAudio") and
    have_framework("AudioToolBox") and
    have_framework("CoreFoundation") and

data/lib/coreaudio.rb

@@ -1,2 +1,4 @@
+require "narray"
 require "coreaudio/coreaudio_ext"
+require "coreaudio/audiofile"
 

data/lib/coreaudio/audiofile.rb

@@ -0,0 +1,38 @@
+
+module CoreAudio
+  class AudioFile
+    def read(frames=nil)
+      if frames
+        frames = Integer(frames)
+        if frames and frames > 0
+          return read_frames(frames)
+        elsif frames == 0
+          return NArray.sint(0)
+        else
+          raise ArgumentError,
+            "coreaudio: read frame number must be zero or positive"
+        end
+      end
+
+      # read all frames
+      chunk = self.inner_rate.to_i * 10
+      total = nil
+      loop do
+        tmp = read_frames(chunk)
+        if tmp.nil?
+          break
+        end
+        if total.nil?
+          total = tmp
+        else
+          new_na = NArray.sint(total.shape[0], tmp.shape[1] + total.shape[1])
+          new_na[false, 0...total.shape[1]] = total
+          new_na[false, total.shape[1]..-1] = tmp
+          total = new_na
+        end
+      end
+
+      total
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coreaudio
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-16 00:00:00.000000000 Z
+date: 2011-10-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: narray
+  requirement: &2156227560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156227560
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152377300 !ruby/object:Gem::Requirement
+  requirement: &2156239180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152377300
+  version_requirements: *2156239180
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152375220 !ruby/object:Gem::Requirement
+  requirement: &2156238240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2152375220
+  version_requirements: *2156238240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152373440 !ruby/object:Gem::Requirement
+  requirement: &2156237000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2152373440
+  version_requirements: *2156237000
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2152387460 !ruby/object:Gem::Requirement
+  requirement: &2156235680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152387460
+  version_requirements: *2156235680
 description: Mac OS X CoreAudio wrapper library
 email: nagachika00@gmail.com
 executables: []
@@ -73,9 +84,12 @@ files:
 - VERSION
 - coreaudio.gemspec
 - examples/convert_wav_to_m4a.rb
+- examples/fft_shift_pitch.rb
+- examples/loopback_delay.rb
 - examples/outbuffer_sine.rb
 - examples/outloop_sine.rb
 - examples/record_to_wave.rb
+- examples/ring_modulator.rb
 - ext/audiofile.m
 - ext/coreaudio.h
 - ext/coreaudio.m
@@ -83,6 +97,7 @@ files:
 - ext/depend
 - ext/extconf.rb
 - lib/coreaudio.rb
+- lib/coreaudio/audiofile.rb
 homepage: https://github.com/nagachika/ruby-coreaudio
 licenses:
 - BSDL
@@ -98,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1259507067134800519
+      hash: -1205790832167491304
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: