aviglitch 0.1.1 → 0.1.2

data/ChangeLog

@@ -1,3 +1,10 @@
+== 0.1.2 / 2011-04-10
+
+* Fix to be able to handle data with offsets from 0 of the file.
+* Added clear_keyframes! method to AviGlitch::Frames and AviGlitch::Base.
+* Changed to be able to access frame's meta data.
+* Changed datamosh command to handle wildcard char.
+
 == 0.1.1 / 2010-09-09
 
 * Fixed a bug with windows.

data/Rakefile

@@ -7,11 +7,12 @@ begin
     gem.name = "aviglitch"
     gem.summary = "A Ruby library to destroy your AVI files."
     gem.email = "ucnvvv@gmail.com"
-    gem.homepage = "http://github.com/ucnv/aviglitch"
+    gem.homepage = "http://ucnv.github.com/aviglitch/"
     gem.authors = ["ucnv"]
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.files = %w(README.rdoc ChangeLog Rakefile VERSION) +
       Dir.glob("{bin,spec,lib}/**/*") 
+    gem.add_development_dependency "rspec", ">= 2.0.0"
 
   end
 
@@ -19,14 +20,12 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/datamosh

@@ -26,7 +26,7 @@ opts = OptionParser.new do |opts|
   end
 end
 
-input = opts.parse!
+input = Dir.glob opts.parse!
 if input.empty?
   puts opts
   exit 1
@@ -34,13 +34,16 @@ end
 
 a = AviGlitch.open input.shift
 a.glitch_with_index :keyframe do |frame, i|
-  (!all && i == 0) ? frame : nil # keep the first frame
+  (!all && i == 0) ? frame : "" # keep the first frame
 end
+a.clear_keyframes!(!all ? 1..a.frames.size : nil)
+
 input.each do |file|
   b = AviGlitch.open file
   b.glitch :keyframe do |frame|
-    nil
+    ""
   end
+  b.clear_keyframes!
   a.frames.concat b.frames
 end
 

data/lib/aviglitch.rb

@@ -35,7 +35,7 @@ require 'aviglitch/tempfile'
 #
 module AviGlitch
 
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 
   class << self
     ##

data/lib/aviglitch/base.rb

@@ -33,9 +33,10 @@ module AviGlitch
 
     ##
     # Outputs the glitched file to +path+, and close the file.
-    def output path
+    def output path, do_file_close = true
       FileUtils.cp @file.path, path
-      close
+      close if do_file_close
+      self
     end
 
     ##
@@ -81,7 +82,13 @@ module AviGlitch
       self
     end
 
-    alias_method :write, :output
+    ##
+    # Clears all (or in +range+) keyframes to deltaframes.
+    # It's an alias for Frames#clear_keyframes!
+    def clear_keyframes! range = nil
+      self.frames.clear_keyframes! range
+      self
+    end
 
     ##
     # Swaps the frames with other Frames data.
@@ -91,6 +98,8 @@ module AviGlitch
       @frames.concat other
     end
 
+    alias_method :write, :output
+
     def valid_target? target, frame #:nodoc:
       return true if target == :all
       begin

data/lib/aviglitch/frame.rb

@@ -9,8 +9,7 @@ module AviGlitch
     AVIIF_KEYFRAME = 0x00000010
     AVIIF_NO_TIME  = 0x00000100
 
-    attr_accessor :data
-    attr_reader :id, :flag
+    attr_accessor :data, :id, :flag
 
     ##
     # Creates a new AviGlitch::Frame object.

data/lib/aviglitch/frames.rb

@@ -45,8 +45,9 @@ module AviGlitch
           :size   => io.read(4).unpack('V').first,
         }
       end
+      fix_offsets_if_needed io
       unless safe_frames_count? @meta.size
-        @io.close!
+        io.close!
         exit
       end
       io.rewind
@@ -78,6 +79,8 @@ module AviGlitch
         unless frame.data.nil?
           m[:offset] = io.pos + 4   # 4 for 'movi'
           m[:size] = frame.data.size
+          m[:flag] = frame.flag
+          m[:id] = frame.id
           io.print m[:id]
           io.print [frame.data.size].pack('V')
           io.print frame.data
@@ -320,6 +323,17 @@ module AviGlitch
       self.slice! n
     end
 
+    ##
+    # Modify keyframes to deltaframes at given range, or all.
+    def clear_keyframes! range = nil
+      range = 0..self.size if range.nil?
+      self.each_with_index do |frame, i|
+        if range.include? i
+          frame.flag = 0 if frame.is_keyframe?
+        end
+      end
+    end
+
     ##
     # Returns true if +other+'s frames are same as self's frames.
     def == other
@@ -332,6 +346,10 @@ module AviGlitch
       AviGlitch.open @io.path
     end
 
+    def inspect # :nodec:
+      "#<#{self.class.name}:#{sprintf("0x%x", object_id)} @io=#{@io.inspect} size=#{self.size}>"
+    end
+
     def get_beginning_and_length *args #:nodoc:
       b, l = args
       if args.first.kind_of? Range
@@ -362,7 +380,21 @@ module AviGlitch
       r
     end
 
+    def fix_offsets_if_needed io #:nodoc:
+      # rarely data offsets begin from 0 of the file
+      return if @meta.empty?
+      pos = io.pos
+      m = @meta.first
+      io.pos = @pos_of_movi + m[:offset]
+      unless io.read(4) == m[:id]
+        @meta.each do |x|
+          x[:offset] -= @pos_of_movi
+        end
+      end
+      io.pos = pos
+    end
+
     protected :frames_data_as_io, :meta
-    private :overwrite, :get_beginning_and_length
+    private :overwrite, :get_beginning_and_length, :fix_offsets_if_needed
   end
 end

data/spec/aviglitch_spec.rb

@@ -143,4 +143,24 @@ describe AviGlitch do
     AviGlitch::Base.surely_formatted?(@out, true).should be true
   end
 
+  it 'should clear keyframes with one method' do
+    a = AviGlitch.open @in
+    a.clear_keyframes!
+    a.output @out
+    a = AviGlitch.open @out
+    a.frames.each do |f|
+      f.is_keyframe?.should be false
+    end
+
+    a = AviGlitch.open @in
+    a.clear_keyframes! 0..50
+    a.output @out
+    a = AviGlitch.open @out
+    a.frames.each_with_index do |f, i|
+      if i <= 50
+        f.is_keyframe?.should be false
+      end
+    end
+  end
+
 end

data/spec/datamosh_spec.rb

@@ -31,21 +31,21 @@ describe AviGlitch, 'datamosh cli' do
 
     system [@cmd, @in].join(' ')
     o = AviGlitch.open @out
-    o.frames.size.should == total - keys + 1
+    o.frames.size.should == total
     o.frames.first.is_keyframe?.should be true
     o.close
     AviGlitch::Base.surely_formatted?(@out, true).should be true
 
     system [@cmd, '-a', @in].join(' ')
     o = AviGlitch.open @out
-    o.frames.size.should == total - keys
+    o.frames.size.should == total
     o.frames.first.is_keyframe?.should be false
     o.close
     AviGlitch::Base.surely_formatted?(@out, true).should be true
 
     system [@cmd, @in, @in, @in].join(' ')
     o = AviGlitch.open @out
-    o.frames.size.should == 1 + (total - keys) * 3
+    o.frames.size.should == total * 3
     o.frames.first.is_keyframe?.should be true
     o.close
     AviGlitch::Base.surely_formatted?(@out, true).should be true

data/spec/frames_spec.rb

@@ -446,5 +446,38 @@ describe AviGlitch::Frames do
     x.should be_nil
   end
 
+  it 'can modify frame flag and frame id' do
+    a = AviGlitch.open @in
+    a.frames.each do |f|
+      f.flag = 0
+      f.id = "02dc"
+    end
+    a.output @out
+    a = AviGlitch.open @out
+    a.frames.each do |f|
+      f.flag.should == 0
+      f.id.should == "02dc"
+    end
+  end
+
+  it 'should clear keyframes with one method' do
+    a = AviGlitch.open @in
+    a.frames.clear_keyframes!
+    a.output @out
+    a = AviGlitch.open @out
+    a.frames.each do |f|
+      f.is_keyframe?.should be false
+    end
+
+    a = AviGlitch.open @in
+    a.frames.clear_keyframes! 0..50
+    a.output @out
+    a = AviGlitch.open @out
+    a.frames.each_with_index do |f, i|
+      if i <= 50
+        f.is_keyframe?.should be false
+      end
+    end
+  end
 
 end

data/spec/spec_helper.rb

@@ -1,7 +1,4 @@
-require 'spec'
-
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rspec'
 require 'aviglitch'
 require 'pathname'
 require 'fileutils'
@@ -9,6 +6,6 @@ require 'fileutils'
 FILES_DIR = Pathname.new(File.dirname(__FILE__)).realpath + 'files'
 OUTPUT_DIR = FILES_DIR + 'output'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - ucnv
@@ -14,10 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 +09:00
+date: 2011-04-10 00:00:00 +09:00
 default_executable: datamosh
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :development
+  version_requirements: *id001
 description: 
 email: ucnvvv@gmail.com
 executables: 
@@ -43,16 +57,15 @@ files:
 - spec/datamosh_spec.rb
 - spec/files/sample.avi
 - spec/frames_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - LICENSE
 has_rdoc: true
-homepage: http://github.com/ucnv/aviglitch
+homepage: http://ucnv.github.com/aviglitch/
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/spec/spec.opts

@@ -1,2 +0,0 @@
--c
--fs