depix 1.0.8 → 1.1.1

data/History.txt

@@ -1,3 +1,15 @@
+=== 1.1.1 / 2009-12-27
+
+* Return nil for flame_reel if the header was empty
+
+=== 1.1.0 / 2009-11-16
+
+* Be more intelligent when selecting timecode framerate source
+
+=== 1.0.9 / 2009-11-16
+
+* Accomodate the frames per second value from the file for synthetics time code
+
 === 1.0.8 / 2009-11-14
 
 * Fix the version tag check so that it allows all versions but is still included, and so that the tests run

data/lib/depix.rb

@@ -10,21 +10,25 @@ require File.dirname(__FILE__) + '/depix/editor'
 
 
 module Depix
-  VERSION = '1.0.8'
+  VERSION = '1.1.1'
   
   class InvalidHeader < RuntimeError; end
   
   # Offers convenience access to a few common attributes bypassing the piecemeal structs
   module Synthetics
     
+    DEFAULT_DPX_FPS = 25
+    
     # Get formatted keycode as string, empty elements are omitted
     def keycode
       [film.id, film.type, film.offset, film.prefix, film.count].compact.join(' ')
     end
     
-    # Return the flame reel name. The data after the first null byte is not meant to be seen and is used by Flame internally
+    # Return the flame reel name. The data after the first null byte is not meant to be seen 
+    # and is used by Flame internally
     # as it seems
     def flame_reel
+      return nil unless orientation.device
       orientation.device.split(0x00.chr).shift
     end
     
@@ -33,14 +37,17 @@ module Depix
       orientation.device = new_reel
     end
     
-    # Get television.time_code as a Timecode object with a framerate
+    # Get television.time_code as a Timecode object with a framerate.
+    # We explicitly use the television frame rate since Northlight
+    # writes different rates for television and film time code
     def time_code
-      Timecode.from_uint(television.time_code) #, film.frame_rate)
+      framerate = television.frame_rate || film.frame_rate || DEFAULT_DPX_FPS
+      Timecode.from_uint(television.time_code, framerate)
     end
     
     # Assign frame rate and timecode from a Timecode object
     def time_code=(new_tc)
-      television.time_code, film.frame_rate = new_tc.to_uint, new_tc.fps
+      television.time_code, television.frame_rate = new_tc.to_uint, new_tc.fps
     end
     
     # Get the name of the transfer function (Linear, Logarithmic, ...)

data/lib/depix/benchmark.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../depix'
 
 require 'benchmark'
 
-iter = 10000
+iter = 1000
 
 puts "Reading DPX header #{iter} times, all data"
 puts Benchmark.measure {

data/test/test_depix.rb

@@ -112,6 +112,12 @@ class ReaderTest < Test::Unit::TestCase
     assert_raise(Depix::InvalidHeader) { Depix.from_string(s) }
 
   end
+  
+  def test_parse_with_timecode_mismatch
+    # This file has mismatching framerates in the film and television headers 
+    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
 end
 
 class EditorTest < Test::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: depix
 version: !ruby/object:Gem::Version 
-  version: 1.0.8
+  version: 1.1.1
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-14 00:00:00 +01:00
+date: 2009-12-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency