raiff 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/raiff.rb

@@ -40,14 +40,6 @@ class Raiff
         @sample_size = common_chunk.sample_size
         @sample_rate = common_chunk.sample_rate
       end
-      
-      @samples = [ ]
-
-      if (@chunks['SSND'])
-        @chunks['SSND'].each do |sound_data|
-          @samples += sound_data.samples
-        end
-      end
     end
   end
   
@@ -55,9 +47,27 @@ class Raiff
     "<Raiff\##{object_id} channels=#{channels} sample_frames=#{sample_frames} sample_size=#{sample_size} sample_rate=#{sample_rate}>"
   end
   
-  def each_sample(&block)
+  def each_sample
     @chunks['SSND'].each do |sound_data|
-      sound_data.samples.each(&:block)
+      @file.seek(sound_data.start_offset)
+
+      sound_data.samples_count.times do
+        sample = sound_data.read_sample
+
+        yield(sample)
+      end
+    end
+  end
+
+  def each_sample_block(size)
+    @chunks['SSND'].each do |sound_data|
+      @file.seek(sound_data.start_offset)
+
+      block_count = (@sample_frames - 1) / size + 1
+      
+      block_count.times do
+        yield(sound_data.read_samples(size))
+      end
     end
   end
 end

data/lib/raiff/chunk.rb

@@ -15,6 +15,7 @@ class Raiff::Chunk
   # == Instance Methods =====================================================
   
   def initialize(file)
+    @file = file
     @id = file.read(4)
     @size = file.unpack('N')[0]
   end

data/lib/raiff/chunk/sound_data.rb

@@ -1,8 +1,7 @@
 class Raiff::Chunk::SoundData < Raiff::Chunk
   # == Properties ===========================================================
   
-  attr_reader :offset, :block_size
-  attr_reader :samples
+  attr_reader :offset, :block_size, :start_offset
 
   # == Class Methods ========================================================
 
@@ -11,33 +10,67 @@ class Raiff::Chunk::SoundData < Raiff::Chunk
   def initialize(file, common)
     super(file)
     
-    end_offset = file.offset + @size
+    @common = common
+
+    @start_offset = file.offset
+    @end_offset = file.offset + @size
     
     @offset, @block_size = file.unpack('NN')
 
     file.read(@offset)
     
-    sample_count = (end_offset - file.offset) / common.bytes_per_sample
-    bit_offset = common.bytes_per_sample * 8 - common.sample_size
-    value_offset = (1 << common.sample_size) - 1
+    @sample_count = (@end_offset - file.offset) / @common.bytes_per_sample
+    @bit_offset = @common.bytes_per_sample * 8 - @common.sample_size
     
-    @samples = [ ]
+    file.advance(@sample_count * @common.bytes_per_sample)
+  end
+  
+  def read_sample
+    self.decoder.call
+  end
+  
+  def read_samples(count)
+    if (count + @file.offset > @end_offset)
+      count = (@end_offset - @file.offset) / @common.bytes_per_sample
+    end
     
-    case (common.bytes_per_sample)
-    when 3
-      format = 'B24' * common.channels
-      
-      sample_count.times do
-        if (sample = file.unpack(format))
-          @samples << sample.collect { |s| (s.to_i(2) >> bit_offset) - value_offset }
-        end
-      end
-    else
-      format = %w[ C n x N ][common.bytes_per_sample] * common.channels
-      
-      sample_count.times do
-        @samples << file.unpack(format).collect { |i| (i >> bit_offset) - value_offset }
-      end
+    samples = [ ]
+    _decoder = self.decoder
+
+    count.times do
+      samples << _decoder.call
     end
+    
+    samples
   end
+  
+  def decoder
+    sample_size = @common.bytes_per_sample
+    channels = (1..@common.channels).to_a
+    negative = 1 << (@common.sample_size - 1)
+
+    @decoder =
+      case (@bit_offset)
+      when 0
+        lambda {
+          channels.collect {
+            v = @file.read(sample_size).bytes.inject(0) do |a, b|
+              a << 8 | b
+            end
+            
+            (v & negative) ? ((v ^ negative) - negative) : v
+          }
+        }
+      else
+        lambda {
+          channels.collect {
+            v = @file.read(sample_size).bytes.inject(0) do |a, b|
+              a << 8 | b
+            end >> @bit_offset - @value_offset
+
+            (v & negative) ? ((v ^ negative) - negative) : v
+          }
+        }
+      end
+    end
 end

data/lib/raiff/file.rb

@@ -55,11 +55,11 @@ class Raiff::File
     ((sign == '1') ? -1.0 : 1.0) * (fraction.to_f / ((1 << 63) - 1)) * (2 ** exponent)
   end
 
-  def unpack(format)
+  def unpack(format, length = nil)
     return if (@offset >= @data.length)
 
     part = @data[@offset, @data.length].unpack(format)
-    advance(part.pack(format).length)
+    advance(length || part.pack(format).length)
     part
 
   rescue TypeError

data/raiff.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{raiff}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Tadman"]
-  s.date = %q{2010-12-06}
+  s.date = %q{2011-02-14}
   s.description = %q{Reads in AIFF file data and audio contents}
   s.email = %q{github@tadman.ca}
   s.extra_rdoc_files = [
@@ -17,30 +17,28 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/raiff.rb",
-     "lib/raiff/chunk.rb",
-     "lib/raiff/chunk/common.rb",
-     "lib/raiff/chunk/data.rb",
-     "lib/raiff/chunk/form.rb",
-     "lib/raiff/chunk/sound_data.rb",
-     "lib/raiff/file.rb",
-     "raiff.gemspec",
-     "sample/example-24bit.aiff",
-     "test/helper.rb",
-     "test/test_raiff.rb"
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/raiff.rb",
+    "lib/raiff/chunk.rb",
+    "lib/raiff/chunk/common.rb",
+    "lib/raiff/chunk/data.rb",
+    "lib/raiff/chunk/form.rb",
+    "lib/raiff/chunk/sound_data.rb",
+    "lib/raiff/file.rb",
+    "raiff.gemspec",
+    "sample/example-24bit.aiff",
+    "test/helper.rb",
+    "test/test_raiff.rb"
   ]
   s.homepage = %q{http://github.com/twg/raiff}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby AIFF Reading Library}
   s.test_files = [
     "test/helper.rb",
-     "test/test_raiff.rb"
+    "test/test_raiff.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Scott Tadman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 -05:00
+date: 2011-02-14 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -28,7 +28,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - README.rdoc
 - Rakefile
 - VERSION
@@ -48,8 +47,8 @@ homepage: http://github.com/twg/raiff
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,2 +0,0 @@
-*.gem
-.DS_Store