aviglitch 0.1.6 → 0.2.0

data/lib/aviglitch.rb

@@ -1,8 +1,7 @@
 require 'tempfile'
-require 'fileutils'
-require 'readline'
 require 'pathname'
 require 'stringio'
+require 'aviglitch/avi'
 require 'aviglitch/base'
 require 'aviglitch/frame'
 require 'aviglitch/frames'
@@ -31,7 +30,7 @@ require 'aviglitch/frames'
 #
 module AviGlitch
 
-  VERSION = '0.1.6'
+  VERSION = '0.2.0'
 
   BUFFER_SIZE = 2 ** 24
 

data/spec/avi2_spec.rb

@@ -0,0 +1,40 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe AviGlitch, 'AVI2.0' do
+
+  it 'should save same file when nothing has changed' do
+    avi = AviGlitch.open @in2
+    avi.glitch do |d|
+      d
+    end
+    avi.output @out
+    FileUtils.cmp(@in2, @out).should be true
+  end
+
+  it 'should be AVI1.0 when its size has reduced less than 1GB' do
+    a = AviGlitch.open @in2
+    size = 0
+    a.glitch do |d|
+      size += d.size
+      size < 1024 ** 3 ? d : nil
+    end
+    a.output @out
+    b = AviGlitch.open @out
+    b.avi.was_avi2?.should be false
+    b.close
+  end
+
+  it 'should be AVI2.0 when its size has increased over 1GB' do
+    a = AviGlitch.open @in
+    n = Math.log(1024.0 ** 3 / a.frames.data_size.to_f, 2).ceil
+    f = a.frames[0..-1]
+    n.times do
+      fx = f[0..-1]
+      f.concat fx
+    end
+    f.to_avi.output @out
+    b = AviGlitch.open @out
+    b.avi.was_avi2?.should be true
+    b.close
+  end
+end

data/spec/aviglitch_spec.rb

@@ -2,24 +2,10 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe AviGlitch do
 
-  before :all do
-    FileUtils.mkdir OUTPUT_DIR unless File.exist? OUTPUT_DIR
-    @in = FILES_DIR + 'sample.avi'
-    @out = OUTPUT_DIR + 'out.avi'
-  end
-
-  after :each do
-    FileUtils.rm Dir.glob((OUTPUT_DIR + '*').to_s)
-  end
-
-  after :all do
-    FileUtils.rmdir OUTPUT_DIR
-  end
-
   it 'should raise an error against unsupported files' do
     lambda {
       avi = AviGlitch.open __FILE__
-    }.should raise_error
+    }.should raise_error(RuntimeError)
   end
 
   it 'should return AviGlitch::Base object through the method #open' do
@@ -203,9 +189,6 @@ describe AviGlitch do
     end
 
     expect(dc1).to eq(dc2)
-
-
-
   end
-
+  
 end

data/spec/datamosh_spec.rb

@@ -3,23 +3,12 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe AviGlitch, 'datamosh cli' do
 
   before :all do
-    FileUtils.mkdir OUTPUT_DIR unless File.exist? OUTPUT_DIR
-    @in = FILES_DIR + 'sample.avi'
-    @out = OUTPUT_DIR + 'out.avi'
     here = File.dirname(__FILE__)
     lib = Pathname.new(File.join(here, '..', 'lib')).realpath
     datamosh = Pathname.new(File.join(here, '..', 'bin/datamosh')).realpath
     @cmd = "ruby -I%s %s -o %s " % [lib, datamosh, @out]
   end
 
-  after :each do
-    FileUtils.rm Dir.glob((OUTPUT_DIR + '*').to_s)
-  end
-
-  after :all do
-    FileUtils.rmdir OUTPUT_DIR
-  end
-
   it 'should correctly process files' do
     a = AviGlitch.open @in
     keys = a.frames.inject(0) do |c, f|
@@ -27,12 +16,13 @@ describe AviGlitch, 'datamosh cli' do
       c
     end
     total = a.frames.size
+    first_keyframe = a.frames.index(a.frames.first_of(:keyframe))
     a.close
 
     system [@cmd, @in].join(' ')
     o = AviGlitch.open @out
     o.frames.size.should == total
-    o.frames.first.is_keyframe?.should be true
+    o.frames[first_keyframe].is_keyframe?.should be true
     o.has_keyframe?.should be true
     o.close
     AviGlitch::Base.surely_formatted?(@out, true).should be true
@@ -40,7 +30,7 @@ describe AviGlitch, 'datamosh cli' do
     system [@cmd, '-a', @in].join(' ')
     o = AviGlitch.open @out
     o.frames.size.should == total
-    o.frames.first.is_keyframe?.should be false
+    o.frames[first_keyframe].is_keyframe?.should be false
     o.has_keyframe?.should be false
     o.close
     AviGlitch::Base.surely_formatted?(@out, true).should be true
@@ -48,7 +38,7 @@ describe AviGlitch, 'datamosh cli' do
     system [@cmd, @in, @in, @in].join(' ')
     o = AviGlitch.open @out
     o.frames.size.should == total * 3
-    o.frames.first.is_keyframe?.should be true
+    o.frames[first_keyframe].is_keyframe?.should be true
     o.close
     AviGlitch::Base.surely_formatted?(@out, true).should be true
 

data/spec/frames_spec.rb

@@ -5,26 +5,21 @@ describe AviGlitch::Frames do
   before :all do
     AviGlitch::Frames.class_eval do
       define_method(:get_real_id_with) do |frame|
-        pos = @io.pos
-        @io.pos -= frame.data.size
-        @io.pos -= 8
-        id = @io.read 4
-        @io.pos = pos
+        movi = @avi.get_movi
+        pos = movi.pos
+        movi.pos -= frame.data.size
+        movi.pos -= 8
+        id = movi.read 4
+        movi.pos = pos
         id
       end
     end
 
-    FileUtils.mkdir OUTPUT_DIR unless File.exist? OUTPUT_DIR
-    @in = FILES_DIR + 'sample.avi'
-    @out = OUTPUT_DIR + 'out.avi'
-  end
-
-  after :each do
-    FileUtils.rm Dir.glob((OUTPUT_DIR + '*').to_s)
-  end
-
-  after :all do
-    FileUtils.rmdir OUTPUT_DIR
+    AviGlitch::Avi.class_eval do
+      define_method(:get_movi) do
+        @movi
+      end
+    end
   end
 
   it 'should save the same file when nothing is changed' do
@@ -85,15 +80,6 @@ describe AviGlitch::Frames do
     avi.close
   end
 
-  it 'should hide the inner variables' do
-    avi = AviGlitch.open @in
-    frames = avi.frames
-    lambda { frames.meta }.should raise_error(NoMethodError)
-    lambda { frames.io }.should raise_error(NoMethodError)
-    lambda { frames.frames_data_as_io }.should raise_error(NoMethodError)
-    avi.close
-  end
-
   it 'should save video frames count in header' do
     avi = AviGlitch.open @in
     c = 0
@@ -557,4 +543,27 @@ describe AviGlitch::Frames do
     expect(ac2).to eq(ac)
   end
 
+  it 'should pick the first / last frame with a method' do
+    a = AviGlitch.open @in
+    fkidx = -1
+    lkidx = -1
+    faidx = -1
+    laidx = -1
+    a.frames.each_with_index do |f, i|
+      if f.is_keyframe?
+        fkidx = i if fkidx == -1
+        lkidx = i
+      end
+      if f.is_audioframe?
+        faidx = i if faidx == -1
+        laidx = i
+      end
+    end
+    a.frames.index(a.frames.first_of(:keyframe)).should eq(fkidx)
+    a.frames.rindex(a.frames.last_of(:keyframe)).should eq(lkidx)
+    a.frames.index(a.frames.first_of(:audioframe)).should eq(faidx)
+    a.frames.rindex(a.frames.last_of(:audioframe)).should eq(laidx)
+    a.close
+  end
+
 end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'rspec'
 require 'aviglitch'
 require 'pathname'
 require 'fileutils'
+require 'net/http'
 
 FILES_DIR = Pathname.new(File.dirname(__FILE__)).realpath + 'files'
 OUTPUT_DIR = FILES_DIR + 'output'
@@ -11,4 +12,44 @@ RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = [:should, :expect]
   end
+
+  config.before(:all) do
+    FileUtils.mkdir FILES_DIR unless File.exist? FILES_DIR
+    FileUtils.mkdir OUTPUT_DIR unless File.exist? OUTPUT_DIR
+    @in = FILES_DIR + 'sample1.avi'
+    @in2 = FILES_DIR + 'sample2.avi'
+    @out = OUTPUT_DIR + 'out.avi'
+    [
+      [@in2, 'http://a.ucnv.org/sample2.avi'], [@in, 'http://a.ucnv.org/sample1.avi']
+    ].each do |file, url|
+      unless File.exist? file
+        if file == @in2
+          puts 'At first test it needs to download a file over 1GB. It will take a while.'
+        end
+        puts 'Downloading ' + url
+        $stdout.sync = true
+        u = URI.parse url
+        Net::HTTP.start(u.host, u.port) do |http|
+          res = http.request_head u.path
+          max = res['content-length'].to_i
+          len = 0
+          bl = 75
+          File.open(file, 'w') do |file|
+            http.get(u.path) do |chunk|
+              file.write chunk
+              len += chunk.length
+              pct = '%3.1f' % (100.0 * len / max)
+              bar = ('#' * (bl * len / max)).ljust(bl)
+              print "\r#{bar} #{'%5s' % pct}%" unless ENV['CI']
+            end
+          end
+        end
+        puts
+      end
+    end
+  end
+
+  config.after(:each) do
+    FileUtils.rm Dir.glob((OUTPUT_DIR + '*').to_s)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aviglitch
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - ucnv
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-21 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,15 +73,16 @@ files:
 - aviglitch.gemspec
 - bin/datamosh
 - lib/aviglitch.rb
+- lib/aviglitch/avi.rb
 - lib/aviglitch/base.rb
 - lib/aviglitch/frame.rb
 - lib/aviglitch/frames.rb
+- spec/avi2_spec.rb
 - spec/aviglitch_spec.rb
 - spec/datamosh_spec.rb
-- spec/files/sample.avi
 - spec/frames_spec.rb
 - spec/spec_helper.rb
-homepage: http://ucnv.github.com/aviglitch/
+homepage: https://github.com/ucnv/aviglitch
 licenses:
 - MIT
 metadata: {}
@@ -107,8 +108,8 @@ signing_key:
 specification_version: 4
 summary: A Ruby library to destroy your AVI files.
 test_files:
+- spec/avi2_spec.rb
 - spec/aviglitch_spec.rb
 - spec/datamosh_spec.rb
-- spec/files/sample.avi
 - spec/frames_spec.rb
 - spec/spec_helper.rb