nu_wav 0.1.0 → 0.2.0

data/Rakefile

@@ -13,7 +13,7 @@ begin
     gem.add_dependency('ruby-mp3info', '>= 0.6.13')
     gem.files.exclude ".document"
     gem.files.exclude ".gitignore"
-    
+    gem.files.exclude "test/files/**/*"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/nu_wav.rb

@@ -78,10 +78,15 @@ module NuWav
     def duration
       fmt = @chunks[:fmt]
       
-      if fmt && (fmt.compression_code.to_i == PCM_COMPRESSION)
-        @header.size / (fmt.sample_rate * fmt.number_of_channels * (fmt.sample_bits / 8))
+      if (fmt.compression_code.to_i == PCM_COMPRESSION)
+        data = @chunks[:data]
+        data.size / (fmt.sample_rate * fmt.number_of_channels * (fmt.sample_bits / 8))
+      elsif (fmt.compression_code.to_i == MPEG_COMPRESSION)
+        # <chunk type:fact samples_number:78695424 />
+        fact = @chunks[:fact]
+        fact.samples_number / fmt.sample_rate
       else
-        raise "Duration implemented for WAV files only."
+        raise "Duration implemented for PCM and MEPG files only."
       end
     end
 

data/nu_wav.gemspec

@@ -0,0 +1,52 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{nu_wav}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["kookster"]
+  s.date = %q{2010-04-05}
+  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 = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "lib/nu_wav.rb",
+     "nu_wav.gemspec",
+     "test/helper.rb",
+     "test/test_nu_wav.rb"
+  ]
+  s.homepage = %q{http://github.com/kookster/nu_wav}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{NuWav is a pure ruby audio WAV file parser and writer.}
+  s.test_files = [
+    "test/helper.rb",
+     "test/test_nu_wav.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<ruby-mp3info>, [">= 0.6.13"])
+    else
+      s.add_dependency(%q<ruby-mp3info>, [">= 0.6.13"])
+    end
+  else
+    s.add_dependency(%q<ruby-mp3info>, [">= 0.6.13"])
+  end
+end
+

data/test/test_nu_wav.rb

@@ -1,46 +1,76 @@
 require 'helper'
+require 'nu_wav'
 
 class TestNuWav < Test::Unit::TestCase
+  include NuWav
+
   def test_parse_wav
-    assert true
-  end
+    w = WaveFile.parse(File.expand_path(File.dirname(__FILE__) + '/files/test_basic.wav'))
+    assert_equal 4260240, w.header.size
 
-  def test_parse_wav_with_bwf
-    assert true
+    assert_equal 2, w.chunks.size
+    assert_equal 48, w.duration
+
+    fmt = w.chunks[:fmt]
+    assert_equal 1, fmt.number_of_channels
+    assert_equal 44100, fmt.sample_rate
+    assert_equal 88200, fmt.byte_rate
+    assert_equal 2, fmt.block_align
+    assert_equal 16, fmt.sample_bits
+    
+    data = w.chunks[:data]
+    assert_equal 4260204, data.size
   end
 
   def test_parse_wav_with_bwf_and_cart_chunk
-    assert true
+    w = WaveFile.parse(File.expand_path(File.dirname(__FILE__) + '/files/AfropopW_040_SGMT01.wav'))
+    assert_equal 6, w.chunks.size
+    
+    # duration is calculated differently for mpeg and pcm 
+    assert_equal 1784, w.duration
+
+    # fmt
+    assert_equal 2, w.chunks[:fmt].number_of_channels
+    assert_equal 44100, w.chunks[:fmt].sample_rate
+    assert_equal 32000, w.chunks[:fmt].byte_rate
+    assert_equal 835, w.chunks[:fmt].block_align
+    assert_equal 65535, w.chunks[:fmt].sample_bits
+    assert_equal 22, w.chunks[:fmt].extra_size
+    assert_equal 2, w.chunks[:fmt].head_layer
+    assert_equal 256000, w.chunks[:fmt].head_bit_rate
+    assert_equal 1, w.chunks[:fmt].head_mode
+    assert_equal 1, w.chunks[:fmt].head_mode_ext
+    assert_equal 0, w.chunks[:fmt].head_emphasis
+    assert_equal 28, w.chunks[:fmt].head_flags
+
+    # fact
+    assert_equal 78695424, w.chunks[:fact].samples_number
+    
+    # mext
+    assert_equal 7, w.chunks[:mext].sound_information
+    assert_equal 835, w.chunks[:mext].frame_size
+    
+    # bext
+    assert_equal "A=MPEG1L2,F=44100,B=256,M=STEREO,T=CV_PcxTl2NP\r\n", unpad(w.chunks[:bext].coding_history)
+    
+    # cart
+    assert_equal '0101', w.chunks[:cart].version
+    assert_equal 'Afropop 070524_Episode on 05/24/2007_sgmt 1', unpad(w.chunks[:cart].title)
+    assert_equal 'Georges Collinet', unpad(w.chunks[:cart].artist)
+    assert_equal '60314', unpad(w.chunks[:cart].cut_id)
+    assert_equal '2007/05/24', unpad(w.chunks[:cart].start_date)
+    assert_equal '16:00:00', unpad(w.chunks[:cart].start_time)
+    assert_equal '2007/06/24', unpad(w.chunks[:cart].end_date)
+    assert_equal '16:00:00', unpad(w.chunks[:cart].end_time)
+    assert_equal 'ContentDepot', unpad(w.chunks[:cart].producer_app_id)
+    assert_equal '1.0', unpad(w.chunks[:cart].producer_app_version)
+
+    # data
+    assert_equal 57040521, w.chunks[:data].size
   end
+  
+  def unpad(str)
+    str.gsub(/\0*$/, '')
+  end
+  
 end
-
-# if NuWav::DEBUG 
-# 
-#   wf = NuWav::WaveFile.new
-#   # wf.parse('/Users/akuklewicz/dev/testaudio/0330AK_Studded.wav')
-#   # puts "wf.duration = #{wf.duration}"
-#   # puts "wf = #{wf}"
-#   
-#   wf.parse('/Users/akuklewicz/dev/workspace/mediajoint/test/fixtures/files/AfropopW_040_SGMT01.wav')
-# 
-#   puts "--------------------------------------------------------------------------------"
-# 
-#   wf.write_data_file('/Users/akuklewicz/dev/workspace/mediajoint/test/fixtures/files/AfropopW_040_SGMT01.mp2')
-# 
-#   # wf.to_file('AK_FreshA05_160_SGMT02')
-#   # wf.parse('AK_FreshA05_160_SGMT02.wav')
-#   
-#   puts "--------------------------------------------------------------------------------"
-#   # 
-# 
-#   wv = NuWav::WaveFile.from_mpeg('/Users/akuklewicz/dev/workspace/mediajoint/test/fixtures/files/AK_AfropopW_040_SGMT01.mp2')
-#   wv.to_file('AK_AfropopW_040_SGMT01_to_file_test.wav')
-#   
-#   puts "--------------------------------------------------------------------------------"
-# 
-#   wf = NuWav::WaveFile.new
-#   wf.parse('AK_AfropopW_040_SGMT01_to_file_test.wav')
-#   
-# 
-#   
-# end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nu_wav
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - kookster
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-03 00:00:00 -04:00
+date: 2010-04-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,6 +37,7 @@ files:
 - Rakefile
 - VERSION
 - lib/nu_wav.rb
+- nu_wav.gemspec
 - test/helper.rb
 - test/test_nu_wav.rb
 has_rdoc: true