depix 1.1.5 → 1.1.6

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.1.6 / 2010-10-20
+
+* Fix unpacking reals and longs from little-endian DPX headers
+
 === 1.1.5 / 2010-10-20
 
 * Properly detect the DPX version when it is entered lowercase

data/Manifest.txt

@@ -19,7 +19,8 @@ test/samples/E012_P001_L000002_lin.0002.dpx
 test/samples/E012_P001_L000002_log.0001.dpx
 test/samples/E012_P001_L000002_log.0002.dpx
 test/samples/from_nuke_no_TC_meta.dpx
-test/samples/northlight_tc_mode_mismatch.dpx
 test/samples/gluetools_file_header.dpx
+test/samples/little_endian.dpx
+test/samples/northlight_tc_mode_mismatch.dpx
 test/test_depix.rb
 test/test_dict.rb

data/lib/depix.rb

@@ -10,7 +10,7 @@ require File.dirname(__FILE__) + '/depix/editor'
 
 
 module Depix
-  VERSION = '1.1.5'
+  VERSION = '1.1.6'
   
   class InvalidHeader < RuntimeError; end
   

data/lib/depix/dict.rb

@@ -414,6 +414,12 @@ module Depix
         fields.map{|f| f.pattern }.join
       end
       
+      # Get the pattern that will be used to unpack this structure and all of it's descendants
+      # from a buffer with pieces in little-endian byte order
+      def pattern_le
+        pattern.tr("gN", "eV")
+      end
+      
       # How many bytes are needed to complete this structure
       def length
         fields.inject(0){|_, s| _ + s.length }
@@ -433,6 +439,12 @@ module Depix
         consume!(string.unpack(pattern))
       end
       
+      # Apply this structure to data in the string, returning an instance of this structure with fields completed
+      # assume little-endian fields
+      def apply_le!(string)
+        consume!(string.unpack(pattern_le))
+      end
+      
       # Get a class that would parse just the same, preserving only the fields passed in the array. This speeds
       # up parsing because we only extract and conform the fields that we need
       def only(*field_names)

data/lib/depix/reader.rb

@@ -26,28 +26,20 @@ module Depix
     # The hear of Depix
     def parse(data, compact)
       magic = data[0..3]
-      
       raise InvalidHeader, "No magic bytes found at start" unless %w( SDPX XPDS).include?(magic)
       
-      struct = compact ? CompactDPX : DPX
+      is_le = (magic == "XPDS")
       
-      is_be = (magic == "SDPX")
       version_check = FileInfo.only(:magic, :version)
-      
-      result = begin
-        if is_be
-          version_check.consume!(data.unpack(version_check.pattern))
-        else
-          version_check.consume!(data.unpack(make_le(version_check.pattern)))
-        end
+      begin
+        result = is_le ? version_check.apply_le!(data) : version_check.apply!(data)
+        raise InvalidHeader, "Unknown version tag #{result.version}" unless result.version =~ /V(\d)\.(\d+)/i
       rescue ArgumentError
-        raise InvalidHeader
+        raise InvalidHeader, "Cannot unpack header"
       end
       
-      raise InvalidHeader, "Unknown version tag #{result.version}" unless result.version =~ /V(\d)\.(\d+)/i
-      
-      template = is_be ? DPX.pattern : make_le(DPX.pattern)
-      struct.consume!(data.unpack(struct.pattern))
+      struct = compact ? CompactDPX : DPX
+      is_le ? struct.apply_le!(data) : struct.apply!(data)
     end
   
     # Describe a filled DPX structure
@@ -74,10 +66,5 @@ module Depix
       end.map{|e| ('  ' * pad_offset) + e }.join("\n")
     end
   
-    # Convert an unpack pattern to LE
-    def make_le(pattern)
-      pattern.gsub(/n/, "v").gsub(/N/, "V").gsub(/g/, "f")
-    end
-  
   end
 end

data/test/test_depix.rb

@@ -108,10 +108,9 @@ class ReaderTest < Test::Unit::TestCase
     
     s = "Mary had a little lamb" * 1000
     assert_raise(Depix::InvalidHeader) { Depix.from_string(s) }
-
+    
     s = "SDPX Mary had a little lamb" * 1000
     assert_raise(Depix::InvalidHeader) { Depix.from_string(s) }
-
   end
   
   def test_parsing_gluetools_file
@@ -132,7 +131,13 @@ class ReaderTest < Test::Unit::TestCase
     assert_equal "05:00:59:20", dpx.time_code.to_s
     assert_equal 25, dpx.time_code.fps
   end
-
+  
+  def test_parse_le_dpx
+    # This file is little-endian 
+    dpx = Depix.from_file(File.dirname(__FILE__) + "/samples/little_endian.dpx")
+    assert_in_delta 25, dpx.film.frame_rate, 0.01
+  end
+  
 end
 
 class EditorTest < Test::Unit::TestCase

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: depix
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 1
-  - 5
-  version: 1.1.5
+  - 6
+  version: 1.1.6
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-20 00:00:00 +02:00
+date: 2010-11-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,8 +98,9 @@ files:
 - test/samples/E012_P001_L000002_log.0001.dpx
 - test/samples/E012_P001_L000002_log.0002.dpx
 - test/samples/from_nuke_no_TC_meta.dpx
-- test/samples/northlight_tc_mode_mismatch.dpx
 - test/samples/gluetools_file_header.dpx
+- test/samples/little_endian.dpx
+- test/samples/northlight_tc_mode_mismatch.dpx
 - test/test_depix.rb
 - test/test_dict.rb
 has_rdoc: true