depix 1.1.3 → 1.1.4

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.1.4 / 2010-08-04
+
+* Properly fallback to film framerate in timecode detection if television framerate is 
+  recognized as being zero (is a fact for Nuke renders)
+
 === 1.1.3 / 2010-02-12
 
 * Discard charfield content that comes after the first null byte (seriously, who cares?)

data/lib/depix.rb

@@ -10,7 +10,7 @@ require File.dirname(__FILE__) + '/depix/editor'
 
 
 module Depix
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
   
   class InvalidHeader < RuntimeError; end
   
@@ -41,11 +41,13 @@ module Depix
     # We explicitly use the television frame rate since Northlight
     # writes different rates for television and film time code
     def time_code
-      framerate = television.frame_rate || film.frame_rate || DEFAULT_DPX_FPS
+      framerates = [television.frame_rate, film.frame_rate, DEFAULT_DPX_FPS]
+      framerate = framerates.find{|e| !e.nil? && !e.zero? }
       if television.time_code
         Timecode.from_uint(television.time_code, framerate)
       else
-        Timecode.new(0, framerate)
+        # Assume frame position
+        Timecode.new(film.frame_position, framerate)
       end
     end
     

data/lib/depix/editor.rb

@@ -27,8 +27,12 @@ module Depix
     end
     
     # Copy headers from another DPX object
-    def copy_from(another)
-      @dpx = another
+    def copy_from(another, *fields_to_copy)
+      if fields_to_copy.empty?
+        @dpx = another.dup
+      else
+        fields_to_copy.each{|f| @dpx[f] = another[f] }
+      end
     end
     
     # Save the headers to file at path, overwriting the old ones

data/test/test_depix.rb

@@ -118,6 +118,14 @@ class ReaderTest < Test::Unit::TestCase
     dpx = Depix.from_file(File.dirname(__FILE__) + "/samples/northlight_tc_mode_mismatch.dpx")
     assert_equal "22:02:18:24", dpx.time_code.to_s
   end
+
+  def test_parse_zero_tc_fps
+    # This file has mismatching framerates in the film and television headers 
+    dpx = Depix.from_file(File.dirname(__FILE__) + "/samples/from_nuke_no_TC_meta.dpx")
+    assert_equal "05:00:59:20", dpx.time_code.to_s
+    assert_equal 25, dpx.time_code.fps
+  end
+
 end
 
 class EditorTest < Test::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: depix
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 +01:00
+date: 2010-08-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +25,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.2.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.4
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -33,7 +43,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.6.0
     version: 
 description: Read and write DPX file metadata
 email: