format_parser 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00a7541231e6ab1309b8fc318595725c4d0ec6de6a5732973b8ed0ac5e3b6393
-  data.tar.gz: fbd9d67e3cec87e474519bdade15a700694118f75f3ede8757fcb0b0657423f5
+  metadata.gz: 2f6351170e3d5041a34054745370b1e50e219997b48bbd7eba1f49e86c486b18
+  data.tar.gz: 5e7c4f318f65148297750a64d820e94fdc3c37c17048f67ca65a5989222c6bd6
 SHA512:
-  metadata.gz: 05a601a35d26db59f1df83f21fbe96fceff0e96c96ec9f958aa94326a34e95c4c4c585a36182b7c392eb205f5a433758eb1f45df2d726bb2402a89015ac26279
-  data.tar.gz: e9c935e201680e6740ef764b4836ecb3adddfb7559aab5e78f8a728c1e52bce0e784862a2cf5b73b05c8a3e23c1efcac8d402304dada21d4a404011d403fb604
+  metadata.gz: 4bd5598d0723537436fe746aac8b1fd65e654c4234f7749bf4a809ca0acb71f29a1c33b3887ba694e0fff47cada90c75c649f546358e9ca14ae688b012c42578
+  data.tar.gz: b765e56a4cb4d589dbd8c489533d38b90ab8c42f3cdca061fdc8edb30b4012546f39ff2aebc03d37a33907f81bb6c4809039466f8055bbb75f9044475bc85006

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.2.1
+* Bug fix for `CR3` files being misidentified as `MOOV`.
+
 ## 2.2.0
 * Add support for `CR3` files.
 * Add ISO base file format decoding functionality.

data/lib/format_parser/version.rb

@@ -1,3 +1,3 @@
 module FormatParser
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

data/lib/parsers/moov_parser.rb

@@ -107,12 +107,12 @@ class FormatParser::MOOVParser
   end
 
   # An MPEG4/MOV/M4A will start with the "ftyp" atom. The atom must have a length
-  # of at least 8 (to accomodate the atom size and the atom type itself) plus the major
+  # of at least 16 (to accomodate the atom size and the atom type itself) plus the major brand
   # and minor version fields. If we cannot find it we can be certain this is not our file.
   def matches_moov_definition?(io)
-    maybe_atom_size, maybe_ftyp_atom_signature = safe_read(io, 8).unpack('N1a4')
+    maybe_atom_size, maybe_ftyp_atom_signature, maybe_major_brand = safe_read(io, 12).unpack('N1a4a4')
     minimum_ftyp_atom_size = 4 + 4 + 4 + 4
-    maybe_atom_size >= minimum_ftyp_atom_size && maybe_ftyp_atom_signature == 'ftyp'
+    maybe_atom_size >= minimum_ftyp_atom_size && maybe_ftyp_atom_signature == 'ftyp' && maybe_major_brand != 'crx '
   end
 
   # Sample information is found in the 'time-to-sample' stts atom.

data/spec/parsers/moov_parser_spec.rb

@@ -135,4 +135,10 @@ describe FormatParser::MOOVParser do
     expect(result).not_to be_nil
     expect(result.format).to eq(:mov)
   end
+
+  it 'does not parse CR3 files' do
+    cr3_path = fixtures_dir + '/CR3/Canon EOS R10 (RAW).CR3'
+    result = subject.call(File.open(cr3_path, 'rb'))
+    expect(result).to be_nil
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: format_parser
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Noah Berman