nu_wav 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/nu_wav.rb

@@ -1,6 +1,5 @@
 # http://www.prss.org/contentdepot/automation_specifications.cfm
 # Bill Kelly <billk <at> cts.com> http://article.gmane.org/gmane.comp.lang.ruby.general/43110
-
 # BWF intro  http://en.wikipedia.org/wiki/Broadcast_Wave_Format
 # BWF basics http://tech.ebu.ch/docs/tech/tech3285.pdf
 # BWF mpeg   http://tech.ebu.ch/docs/tech/tech3285s1.pdf
@@ -8,12 +7,17 @@
 require 'rubygems'
 require 'mp3info'
 require 'date'
+require 'tempfile'
 
 module NuWav
 
   DEBUG = false
 
-  PCM_COMPRESSION = 1
+  # 1 is standard integer based, 3 is the floating point PCM
+  PCM_INTEGER_COMPRESSION = 1
+  PCM_FLOATING_COMPRESSION = 3
+  PCM_COMPRESSION = [PCM_INTEGER_COMPRESSION, PCM_FLOATING_COMPRESSION]
+  
   MPEG_COMPRESSION = 80
   
   ACM_MPEG_LAYER1 = 1
@@ -51,12 +55,14 @@ module NuWav
     def parse(wave_file)
       NuWav::WaveFile.log "Processing wave file #{wave_file.inspect}...."
       File.open(wave_file, File::RDWR) do |f|
+
         #only for windows, make sure we are operating in binary mode 
         f.binmode
         #start at the very beginning, a very good place to start
         f.seek(0)
 
         riff, riff_length = read_chunk_header(f)
+        NuWav::WaveFile.log "riff: #{riff}"
         NuWav::WaveFile.log "riff_length: #{riff_length}"
         raise NotRIFFFormat unless riff == 'RIFF'
         riff_end = f.tell + riff_length
@@ -66,23 +72,35 @@ module NuWav
 
         @header = RiffChunk.new(riff, riff_length, riff_type)
 
-        while f.tell < riff_end
+        while (f.tell + 8) <= riff_end
+          NuWav::WaveFile.log "while #{f.tell} < #{riff_end}"
           chunk_name, chunk_length = read_chunk_header(f)
           fpos = f.tell
 
           NuWav::WaveFile.log "found chunk: '#{chunk_name}', size #{chunk_length}"
-          self.chunks[chunk_name.to_sym] = chunk_class(chunk_name).parse(chunk_name, chunk_length, f)
-
-          f.seek(fpos + self.chunks[chunk_name.to_sym].size)
+          
+          if chunk_name && chunk_length
+
+            self.chunks[chunk_name.to_sym] = chunk_class(chunk_name).parse(chunk_name, chunk_length, f)
+
+            NuWav::WaveFile.log "about to do a seek..."
+            NuWav::WaveFile.log "f.seek #{fpos} + #{self.chunks[chunk_name.to_sym].size}"
+            f.seek(fpos + self.chunks[chunk_name.to_sym].size)
+            NuWav::WaveFile.log "seek done"
+          else
+            NuWav::WaveFile.log "chunk or length was off - remainder of file does not parse properly: #{riff_end} - #{fpos} = #{riff_end - fpos}"
+            f.seek(riff_end)
+          end
         end
       end
-      @chunks.each{|k,v| NuWav::WaveFile.log "#{k}: #{v}\n\n" unless k == :data}
+      @chunks.each{|k,v| NuWav::WaveFile.log "#{k}: #{v}\n\n" unless k.to_s == 'data'}
+      NuWav::WaveFile.log "parse done"
     end
 
     def duration
       fmt = @chunks[:fmt]
       
-      if (fmt.compression_code.to_i == PCM_COMPRESSION)
+      if (PCM_COMPRESSION.include?(fmt.compression_code.to_i))
         data = @chunks[:data]
         data.size / (fmt.sample_rate * fmt.number_of_channels * (fmt.sample_bits / 8))
       elsif (fmt.compression_code.to_i == MPEG_COMPRESSION)
@@ -93,6 +111,14 @@ module NuWav
         raise "Duration implemented for PCM and MEPG files only."
       end
     end
+    
+    def is_mpeg?
+      (@chunks[:fmt] && (@chunks[:fmt].compression_code.to_i == MPEG_COMPRESSION))
+    end
+
+    def is_pcm?
+      (@chunks[:fmt] && (PCM_COMPRESSION.include?(@chunks[:fmt].compression_code.to_i)))
+    end
 
     def to_s
       out = "NuWav:#{@header}\n"
@@ -109,13 +135,17 @@ module NuWav
       NuWav::WaveFile.log "NuWav::WaveFile.to_file: file_name = #{file_name}"
       
       #get all the chunks together to get final length
-      chunks_out = [:fmt, :fact, :mext, :bext, :cart, :data].inject([]) do |list, chunk| 
-        out = self.chunks[chunk].to_binary
-        NuWav::WaveFile.log out.length
-        list << out
+      chunks_out = [:fmt, :fact, :mext, :bext, :cart, :data].inject([]) do |list, chunk|
+        if self.chunks[chunk]
+          out = self.chunks[chunk].to_binary
+          NuWav::WaveFile.log out.length
+          list << out
+        end
         list
       end
       
+      # TODO: handle other chunks not in the above list, but that might have been in a parsed wav
+      
       riff_length = chunks_out.inject(0){|sum, chunk| sum += chunk.size}
       NuWav::WaveFile.log "NuWav::WaveFile.to_file: riff_length = #{riff_length}"
       
@@ -182,12 +212,8 @@ module NuWav
       
       #mext chunk
       mext = MextChunk.new
-      # from what I can tell, a 7 indicates a homogenous 44100 or 22050 mpeg audio with no padding
-      mext.sound_information = 7
-      
-      # from what I can tell, a 7 indicates a homogenous 44100 or 22050 mpeg audio with no padding
-      # if there is padding, it is more complicated, see sectin 2.2 here: http://tech.ebu.ch/docs/tech/tech3285s1.pdf
-      mext.sound_information = 5 if mp3info.header[:padding]
+      mext.sound_information =  5
+      mext.sound_information +=  2 if mp3info.header[:padding]
       mext.frame_size = calculate_mpeg_frame_size(mp3info)
       mext.ancillary_data_length = 0
       mext.ancillary_data_def = 0
@@ -251,7 +277,12 @@ module NuWav
     end
 
     def chunk_class(name)
-      constantize("NuWav::#{camelize("#{name}_chunk")}")
+      begin
+        constantize("NuWav::#{camelize("#{name}_chunk")}")
+      rescue NameError
+        NuWav::Chunk
+      end
+        
     end
     
     # File vendor/rails/activesupport/lib/active_support/inflector.rb, line 147
@@ -273,7 +304,7 @@ module NuWav
     
     def self.log(m)
       if NuWav::DEBUG
-        puts "#{Time.now}: NuWav: #{m}"
+        NuWav::WaveFile.log "#{Time.now}: NuWav: #{m}"
       end
     end
 
@@ -309,10 +340,12 @@ module NuWav
     end
 
     def write_dword(val)
+      val ||= 0
       [val].pack('V')
     end
 
     def write_word(val)
+      val ||= 0
       [val].pack('v')
     end
     
@@ -547,16 +580,53 @@ module NuWav
   end  
   
   class DataChunk < Chunk
-    alias_method :data, :raw
-    alias_method :data=, :raw=
+    attr_accessor :tmp_data_file
+    
+    def self.parse(id, size, file)
 
+      # tmp_data = File.open('./data_chunk.mp2', 'wb')
+      tmp_data = Tempfile.open('data_chunk')
+      tmp_data.binmode
+      
+      remaining = size
+      while (remaining > 0 && !file.eof?)
+        read_bytes = [128, remaining].min
+        tmp_data << file.read(read_bytes)
+        remaining -= read_bytes
+      end
+      tmp_data.rewind
+      chunk = self.new(id, size, tmp_data)
+
+      return chunk
+    end
+
+    def initialize(id=nil, size=nil, tmp_data_file=nil)
+      @id, @size, @tmp_data_file = id, size, tmp_data_file
+    end
+    
+    def data
+      f = ''
+      if self.tmp_data_file
+        NuWav::WaveFile.log "we have a tmp_data_file!"
+        self.tmp_data_file.rewind
+        f = self.tmp_data_file.read
+        self.tmp_data_file.rewind
+      else
+        NuWav::WaveFile.log "we have NO tmp_data_file!"
+      end
+      f
+    end
 
     def to_s
       "<chunk type:data (size:#{data.size})/>"
     end
     
     def to_binary
-      out = "data" + write_dword(data.size) + data
+      NuWav::WaveFile.log "data chunk to_binary"
+      d = self.data
+      NuWav::WaveFile.log "got data size = #{d.size} #{d[0,10]}"
+      out = "data" + write_dword(d.size) + d
+      out
     end
     
   end

data/nu_wav.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nu_wav}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kookster"]
-  s.date = %q{2011-03-02}
+  s.date = %q{2011-05-28}
   s.description = %q{NuWav is a pure ruby audio WAV file parser and writer.  It supports Broadcast Wave Format (BWF), inclluding MPEG audio data, and the public radio standard cart chunk.}
   s.email = %q{andrew@beginsinwonder.com}
   s.extra_rdoc_files = [

data/test/test_nu_wav.rb

@@ -1,11 +1,15 @@
 require 'helper'
 require 'nu_wav'
+require 'tempfile'
 
 class TestNuWav < Test::Unit::TestCase
   include NuWav
 
   def test_parse_wav
+    memory_usage = `ps -o rss= -p #{Process.pid}`.to_i # in kilobytes
+    puts "begin test: #{memory_usage/1024} mb"
     w = WaveFile.parse(File.expand_path(File.dirname(__FILE__) + '/files/test_basic.wav'))
+    puts w
     assert_equal 4260240, w.header.size
 
     assert_equal 2, w.chunks.size
@@ -20,10 +24,20 @@ class TestNuWav < Test::Unit::TestCase
     
     data = w.chunks[:data]
     assert_equal 4260204, data.size
+    
+    w.to_file('test_out.wav')
+    memory_usage = `ps -o rss= -p #{Process.pid}`.to_i # in kilobytes
+    puts "end of test: #{memory_usage/1024} mb"
   end
 
   def test_parse_wav_with_bwf_and_cart_chunk
+    memory_usage = `ps -o rss= -p #{Process.pid}`.to_i # in kilobytes
+    puts "begin test: #{memory_usage/1024} mb"
+    
     w = WaveFile.parse(File.expand_path(File.dirname(__FILE__) + '/files/AfropopW_040_SGMT01.wav'))
+    memory_usage = `ps -o rss= -p #{Process.pid}`.to_i # in kilobytes
+    puts "after parse: #{memory_usage/1024} mb"
+    
     assert_equal 6, w.chunks.size
     
     # duration is calculated differently for mpeg and pcm 
@@ -67,6 +81,8 @@ class TestNuWav < Test::Unit::TestCase
 
     # data
     assert_equal 57040521, w.chunks[:data].size
+    memory_usage = `ps -o rss= -p #{Process.pid}`.to_i # in kilobytes
+    puts "end of test: #{memory_usage/1024} mb"
   end
   
   def unpad(str)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nu_wav
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - kookster
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-02 00:00:00 -05:00
+date: 2011-05-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency