scissor 0.4.0 → 0.5.0

data/README.rdoc

@@ -79,6 +79,12 @@ supported file format:
 
  foo.stretch(200)
 
+=== pan
+
+ foo.pan(0)   # left only
+ foo.pan(50)  # center(default)
+ foo.pan(100) # right only
+
 === mix
 
  Scissor.mix([foo, bar], 'mix.mp3')

data/lib/scissor/sound_file.rb

@@ -1,4 +1,5 @@
 require 'mp3info'
+require 'mp4info'
 require 'pathname'
 require 'riff/reader'
 
@@ -44,9 +45,27 @@ module Scissor
       end
     end
 
+    class M4a < SoundFile
+      def length
+        info.SECS_NOROUND
+      end
+
+      # FIXME
+      def mono?
+        false
+      end
+
+      private
+
+      def info
+        @info ||= MP4Info.open(@filename.to_s)
+      end
+    end
+
     SUPPORTED_FORMATS = {
       :mp3 => Mp3,
-      :wav => Wav
+      :wav => Wav,
+      :m4a => M4a
     }
 
     class Error < StandardError; end
@@ -67,3 +86,36 @@ module Scissor
     end
   end
 end
+
+class MP4Info
+  private
+
+  def parse_mvhd(io_stream, level, size)
+    raise "Parse error" if size < 32
+    data = read_or_raise(io_stream, size, "Premature end of file")
+
+    version = data.unpack("C")[0] & 255
+    if (version == 0)
+      scale, duration = data[12..19].unpack("NN")
+    elsif (version == 1)
+      scale, hi, low = data[20..31].unpack("NNN")
+      duration = hi * (2**32) + low
+    else
+      return
+    end
+
+    printf " %sDur/Scl=#{duration}/#{scale}\n", ' ' * ( 2 * level ) if $DEBUG
+
+    secs = (duration * 1.0) / scale
+
+    # add
+    @info_atoms["SECS_NOROUND"] = secs
+
+    @info_atoms["SECS"] = (secs).round
+    @info_atoms["MM"] = (secs / 60).floor
+    @info_atoms["SS"] = (secs - @info_atoms["MM"] * 60).floor
+    @info_atoms["MS"] = (1000 * (secs - secs.floor)).round
+    @info_atoms["TIME"] = sprintf "%02d:%02d", @info_atoms["MM"],
+    @info_atoms["SECS"] - @info_atoms["MM"] * 60;
+  end
+end

data/scissor.gemspec

@@ -13,10 +13,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = %q{scissor}
   gem.require_paths = ["lib"]
-  gem.version       = "0.4.0"
+  gem.version       = "0.5.0"
 
   gem.add_dependency('open4', '>= 1.3.0')
   gem.add_dependency('ruby-mp3info')
+  gem.add_dependency('mp4info', '1.7.3')
   gem.add_dependency('riff', '<= 0.3.0')
   gem.add_dependency('tempdir')
   gem.add_dependency('streamio-ffmpeg')

data/spec/scissor_spec.rb

@@ -270,6 +270,12 @@ describe Scissor do
     result.duration.should be_within(0.1).of(140)
   end
 
+  it "should write to m4a file" do
+    scissor = @mp3.slice(0, 120) + @mp3.slice(150, 20)
+    result = scissor.to_file('/tmp/scissor-test/out.m4a')
+    result.duration.should be_within(0.1).of(140)
+  end
+
   it "should write to file using 'greater than' operator" do
     result = @mp3.slice(0, 120) + @mp3.slice(150, 20) > '/tmp/scissor-test/out.wav'
     result.duration.should be_within(0.1).of(140)

data/spec/sound_file_spec.rb

@@ -9,6 +9,7 @@ describe Scissor::SoundFile do
   before do
     @mp3 = Scissor::SoundFile.new_from_filename(fixture('sample.mp3'))
     @wav = Scissor::SoundFile.new_from_filename(fixture('sine.wav'))
+    @m4a = Scissor::SoundFile.new_from_filename(fixture('sine.m4a'))
   end
 
   after do
@@ -23,12 +24,14 @@ describe Scissor::SoundFile do
   it "should get length" do
     @mp3.length.should be_within(0.1).of(178.1)
     @wav.length.should eql(1.0)
+    @m4a.length.should be_within(0.1).of(1.0)
   end
 
   describe '#mono?' do
     it "should return true if sound file is mono" do
       @mp3.should be_mono
       @wav.should_not be_mono
+      @m4a.should_not be_mono
 
       Scissor::SoundFile.new_from_filename(fixture('mono.wav')).should be_mono
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scissor
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mp4info
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.3
 - !ruby/object:Gem::Dependency
   name: riff
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +181,7 @@ files:
 - spec/fixtures/foo.bar
 - spec/fixtures/mono.wav
 - spec/fixtures/sample.mp3
+- spec/fixtures/sine.m4a
 - spec/fixtures/sine.wav
 - spec/fragment_spec.rb
 - spec/scissor_spec.rb
@@ -185,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2487823998857234402
+      hash: 337261600329672185
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -194,10 +211,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2487823998857234402
+      hash: 337261600329672185
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: utility to chop sound files
@@ -206,6 +223,7 @@ test_files:
 - spec/fixtures/foo.bar
 - spec/fixtures/mono.wav
 - spec/fixtures/sample.mp3
+- spec/fixtures/sine.m4a
 - spec/fixtures/sine.wav
 - spec/fragment_spec.rb
 - spec/scissor_spec.rb