mxfinfo 0.0.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8ce5a7260ebc7d0657a16a137f2ce53cdb7fe663
-  data.tar.gz: fbbd22481926952429b5dc6f6a38f0ba2b2fd4cd
+SHA256:
+  metadata.gz: '0891821de9c4eef60dde42ddc083cc6a118580768198009962ece8957726f284'
+  data.tar.gz: ef9540ce8dd3394e802855220eace91cb64b65fff699574daaa34a13dfff26f8
 SHA512:
-  metadata.gz: eb70c65927e434c773ace50587b1027d6c390e6f06cbd1f92d27f5bae6a4289971507f6622a83bf97ce4a14aef0932c8b1bc8ec070cded2c9de6350bde5a294c
-  data.tar.gz: 37e75c0627ca9792606ee3bbd8a7db8d60c03ff03144355e269ca40e8cbe7e08d40143c1201295f17785b43c7e5a8b9fc6564aae7f274d365b13beb8ca565cd4
+  metadata.gz: 689ea935346dfedffa75e9c14945644b42600f23a8984495034ce04ca73f2a9eea5a7d93a25ba01f64bee127be05e9b1d6f0e53fcf56bed8b7e11e354f676932
+  data.tar.gz: de108b7dd52c51ff567df1a3383b7403f32b09ba75e3a8df88034e73c697122d478710b93b6d2d66b171c97e6a83271859825a85a50515f68a470568a3e8b742

data/.gitignore

@@ -15,6 +15,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.clangd
 
 # YARD artifacts
 .yardoc

data/Rakefile

@@ -3,4 +3,5 @@ require 'rspec/core/rake_task'
 require 'rake/extensiontask'
 
 RSpec::Core::RakeTask.new('spec')
+task spec: [:compile]
 Rake::ExtensionTask.new('mxfinfo')

data/compile_commands.json

@@ -0,0 +1,52 @@
+[
+    {
+        "arguments": [
+            "gcc",
+            "-c",
+            "-I.",
+            "-I/home/steved/.rbenv/versions/2.5.8/include/ruby-2.5.0/x86_64-linux",
+            "-I/home/steved/.rbenv/versions/2.5.8/include/ruby-2.5.0/ruby/backward",
+            "-I/home/steved/.rbenv/versions/2.5.8/include/ruby-2.5.0",
+            "-I../../../../ext/mxfinfo",
+            "-I/opt/environments/strawberry/include/libMXF-1.0",
+            "--std=gnu99",
+            "-D_GNU_SOURCE",
+            "-Wall",
+            "-I/home/steved/.rbenv/versions/2.5.8/include",
+            "-fPIC",
+            "-O3",
+            "-ggdb3",
+            "-fPIC",
+            "-o",
+            "avid_mxf_info.o",
+            "../../../../ext/mxfinfo/avid_mxf_info.c"
+        ],
+        "directory": "/home/steved/Documents/projective/github/mxfinfo/tmp/x86_64-linux/mxfinfo/2.5.8",
+        "file": "../../../../ext/mxfinfo/avid_mxf_info.c"
+    },
+    {
+        "arguments": [
+            "gcc",
+            "-c",
+            "-I.",
+            "-I/home/steved/.rbenv/versions/2.5.8/include/ruby-2.5.0/x86_64-linux",
+            "-I/home/steved/.rbenv/versions/2.5.8/include/ruby-2.5.0/ruby/backward",
+            "-I/home/steved/.rbenv/versions/2.5.8/include/ruby-2.5.0",
+            "-I../../../../ext/mxfinfo",
+            "-I/opt/environments/strawberry/include/libMXF-1.0",
+            "--std=gnu99",
+            "-D_GNU_SOURCE",
+            "-Wall",
+            "-I/home/steved/.rbenv/versions/2.5.8/include",
+            "-fPIC",
+            "-O3",
+            "-ggdb3",
+            "-fPIC",
+            "-o",
+            "mxfinfo.o",
+            "../../../../ext/mxfinfo/mxfinfo.c"
+        ],
+        "directory": "/home/steved/Documents/projective/github/mxfinfo/tmp/x86_64-linux/mxfinfo/2.5.8",
+        "file": "../../../../ext/mxfinfo/mxfinfo.c"
+    }
+]

data/ext/mxfinfo/mxfinfo.c

@@ -9,13 +9,12 @@ static
 VALUE rb_time_from_mxf_timestamp(mxfTimestamp *ts)
 {
 	/*
-	 * NOTE: This is probably not thread-safe, since struct tm*
-	 * returned by localtime is shared static.
+	 * NOTE: This is probably not thread-safe, since struct tm* returned by localtime is shared static.
 	 */
 	time_t t;
 	time(&t);
 	struct tm *tmts;
-	tmts = localtime(&t);
+	tmts = gmtime(&t);
 
 	tmts->tm_year = (int) ts->year - 1900;
 	tmts->tm_mon = (int) ts->month - 1;
@@ -23,6 +22,7 @@ VALUE rb_time_from_mxf_timestamp(mxfTimestamp *ts)
 	tmts->tm_hour = (int) ts->hour;
 	tmts->tm_min = (int) ts->min;
 	tmts->tm_sec = (int) ts->sec;
+  tmts->tm_isdst = -1;
 
   return rb_time_new(mktime(tmts), ts->qmsec);
 }
@@ -74,8 +74,12 @@ VALUE rb_str_from_label(const unsigned char *lbl, int len)
   {                                                                         \
     AvidMXFInfo *info;                                                      \
     Data_Get_Struct(self, AvidMXFInfo, info);                               \
-    return rb_rational_new(INT2FIX((info-> attr ).numerator),               \
-      INT2FIX((info-> attr ).denominator));                                 \
+    if((info->attr).denominator == 0) {                                     \
+      return Qnil;                                                          \
+    } else {                                                                \
+      return rb_rational_new(INT2FIX((info-> attr ).numerator),             \
+        INT2FIX((info-> attr ).denominator));                               \
+    }                                                                       \
   }
 
 #define CIO_INT_GETTER(name, attr) CIO_GENERIC_GETTER(INT2FIX, name, attr)
@@ -86,6 +90,9 @@ VALUE rb_str_from_label(const unsigned char *lbl, int len)
 
 VALUE m_mxfinfo = Qnil;
 VALUE c_infoobject = Qnil;
+VALUE c_error = Qnil;
+VALUE c_eNotOpAtom = Qnil;
+VALUE c_eNotReadable = Qnil;
 
 static
 void cio_free(void *ptr) {
@@ -106,7 +113,7 @@ void* ami_read_info_without_gvl(void* ptr)
   return NULL;
 }
 
-static 
+static
 VALUE cio_new(VALUE class, VALUE path)
 {
   Check_Type(path, T_STRING);
@@ -129,22 +136,22 @@ VALUE cio_new(VALUE class, VALUE path)
     switch(params.result)
     {
             case -2:
-              rb_raise(rb_eIOError, "Failed to open file.");
+              rb_raise(c_eNotReadable, "Failed to open file.");
                 break;
             case -3:
-              rb_raise(rb_eIOError, "Failed to read header partition.");
+              rb_raise(c_eNotReadable, "Failed to read header partition.");
                 break;
             case -4:
-              rb_raise(rb_eStandardError, "File is not OP-Atom.");
+              rb_raise(c_eNotOpAtom, "File is not OP-Atom.");
                 break;
             case -1:
             default:
-              rb_raise(rb_eStandardError, "Failed to read info.");
+              rb_raise(c_eNotReadable, "Failed to read info.");
                 break;
     }
 
     return Qnil;
-  } 
+  }
   else
   {
     VALUE tdata = Data_Wrap_Struct(class, 0, cio_free, info);
@@ -205,7 +212,7 @@ VALUE cio_get_material_package_uid(VALUE self)
   unsigned char *uid = (unsigned char*) &info->materialPackageUID;
 
   VALUE ary = rb_ary_new2(32);
-  for(unsigned int i = 0; i < 32; i++) 
+  for(unsigned int i = 0; i < 32; i++)
   {
     rb_ary_store(ary, i, CHR2FIX(uid[i]));
   }
@@ -238,7 +245,7 @@ VALUE cio_get_aspect_ratio(VALUE self)
   if(info->isVideo && info->aspectRatio.denominator != 0)
   {
     return rb_rational_new(INT2FIX(info->aspectRatio.numerator),
-      INT2FIX(info->aspectRatio.denominator)); 
+      INT2FIX(info->aspectRatio.denominator));
   }
   else
   {
@@ -286,12 +293,16 @@ VALUE cio_get_clip_track_string(VALUE self)
 
 void Init_mxfinfo()
 {
-  m_mxfinfo = rb_define_module("MXFInfo");	
+  m_mxfinfo = rb_define_module("MXFInfo");
+
+  c_error = rb_define_class_under(m_mxfinfo, "Error", rb_eStandardError);
+  c_eNotOpAtom = rb_define_class_under(c_error, "NotOpAtom", c_error);
+  c_eNotReadable = rb_define_class_under(c_error, "NotReadable", c_error);
 
 	c_infoobject = rb_define_class_under(m_mxfinfo, "InfoObject", rb_cObject);
   rb_define_singleton_method(c_infoobject, "new", cio_new, 1);
-	
-  rb_define_method(c_infoobject, "clip_name", cio_get_clip_name, 0);
+
+  rb_define_method(c_infoobject, "_clip_name", cio_get_clip_name, 0);
   rb_define_method(c_infoobject, "project_name", cio_get_project_name, 0);
   rb_define_method(c_infoobject, "clip_created", cio_get_clip_created, 0);
   rb_define_method(c_infoobject, "project_edit_rate", cio_get_project_edit_rate, 0);
@@ -302,7 +313,7 @@ void Init_mxfinfo()
   /* int numUserComments */
   /* AvidTaggedValue *materialPackageAttributes */
   /* int numMaterialPackageAttributes */
-  
+
   rb_define_method(c_infoobject, "num_video_tracks", cio_get_num_video_tracks, 0);
   rb_define_method(c_infoobject, "num_audio_tracks", cio_get_num_audio_tracks, 0);
   rb_define_method(c_infoobject, "tracks_string", cio_get_tracks_string, 0);

data/lib/mxfinfo.rb

@@ -3,12 +3,19 @@ require 'mxfinfo/version.rb'
 
 module MXFInfo
   def self.scan(path)
+    io = IO.new(2)
+    stderr = io.dup
+    io.reopen(IO::NULL)
     InfoObject.new path
+  rescue => e
+    io.reopen stderr
+    stderr.close
+    raise e
   end
 
   class InfoObject
     alias_method :videotracks, :num_video_tracks
-    alias_method :v_tracks, :num_video_tracks 
+    alias_method :v_tracks, :num_video_tracks
     alias_method :video_tracks, :num_video_tracks
     alias_method :audiotracks, :num_audio_tracks
     alias_method :audio_tracks, :num_audio_tracks
@@ -20,18 +27,14 @@ module MXFInfo
     alias_method :channelcount, :channel_count
     alias_method :c_count, :channel_count
     alias_method :file_package_uid, :file_source_package_uid
+    alias_method :clip_edit_rate, :project_edit_rate
 
     def render_file?
       physical_package_name == "Precompute Source Mob"
     end
 
-    alias_method :essence_type_orig, :essence_type
-    def essence_type
-      result = self.send(:essence_type_orig)
-      if result.start_with?("DNxHD")
-        result.gsub!(/ \(\d+\)/, "")
-      end
-      result
+    def clip_name
+      _clip_name.force_encoding('UTF-8')
     end
   end
 end

data/lib/mxfinfo/version.rb

@@ -1,4 +1,3 @@
 module MXFInfo
-  VERSION = '0.0.7'
+  VERSION = '0.2.0'.freeze
 end
-

data/mxfinfo.gemspec

@@ -1,14 +1,14 @@
-require File.expand_path('../lib/mxfinfo/version', __FILE__)
+require File.expand_path('lib/mxfinfo/version', __dir__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ['Steve Dierker', 'Malte Rohde']
-  gem.email         = ['technology@flavoursys.com']
-  gem.description   = %q{MXFinfo is a gem that wraps avidmxfinfo from libmxf in a native ruby extension.}
-  gem.summary       = %q{MXFinfo is a gem that wraps avidmxfinfo from libmxf in a native ruby extension.}
-  gem.homepage      = 'http://github.com/flavoursys/mxfinfo'
+  gem.email         = ['technology@projective.io']
+  gem.description   = 'MXFinfo is a gem that wraps avidmxfinfo from libmxf in a native ruby extension.'
+  gem.summary       = 'MXFinfo is a gem that wraps avidmxfinfo from libmxf in a native ruby extension.'
+  gem.homepage      = 'http://github.com/projectivetech/mxfinfo'
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.extensions    = ['ext/mxfinfo/extconf.rb']
   gem.name          = 'mxfinfo'
@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.3'
 
-  gem.add_development_dependency 'rspec', '~> 2.14'
   gem.add_development_dependency 'rake-compiler', '~> 0.9'
+  gem.add_development_dependency 'rspec', '~> 3'
+  gem.add_development_dependency 'rspec-its', '1.2.0'
 end
-

data/spec/info_object_spec.rb

@@ -1,29 +1,30 @@
 require 'spec_helper'
+require 'time'
 
 describe 'MXFInfo::InfoObject' do
-  context 'when created from an valid MXF file' do
+  context 'with a valid MXF file' do
     subject do
-      MXFInfo.scan File.expand_path('../fixtures/IMG_0395.MOV.A14DC7130D.mxf', __FILE__)
+      MXFInfo.scan File.expand_path('fixtures/IMG_0395.MOV.A14DC7130D.mxf', __dir__)
     end
 
     its(:project_name) { should eq('Ballerinas_zippy') }
     its(:clip_name) { should eq('IMG_0395.MOV') }
     its(:clip_created_at) { should eq(Time.parse('2011-05-08 22:02:53.000')) }
-    its(:project_edit_rate) { should eq((25/1)) }
+    its(:project_edit_rate) { should eq((25 / 1)) }
     its(:clip_duration) { should eq(287) }
+    its(:clip_edit_rate) { should eq((25 / 1)) }
     its(:video_tracks) { should eq(1) }
     its(:audio_tracks) { should eq(1) }
     its(:clip_track_string) { should eq('V1 A1') }
     its(:essence_type) { should eq('PCM') }
     its(:essence_label) { should eq('060e2b34040101010d01030102060200') }
     its(:track_number) { should eq(1) }
-    its(:edit_rate) { should eq((48000/1)) }
-    its(:track_duration) { should eq(551040) }
-    its(:segment_duration) { should eq(551040) }
+    its(:edit_rate) { should eq((48_000 / 1)) }
+    its(:track_duration) { should eq(551_040) }
+    its(:segment_duration) { should eq(551_040) }
     its(:segment_offset) { should eq(0) }
     its(:start_timecode) { should eq(0) }
-    # its_converted(:start_timecode) { should eq('00:00:00:00') }
-    its(:audio_sampling_rate) { should eq((48000/1)) }
+    its(:audio_sampling_rate) { should eq((48_000 / 1)) }
     its(:quantization_bits) { should eq(16) }
     its(:channel_count) { should eq(1) }
     its(:material_package_uid) { should eq('060a2b340101010101010f00130000004dc7130d05831a0a060e2b347f7f2a80') }
@@ -32,11 +33,5 @@ describe 'MXFInfo::InfoObject' do
     its(:physical_package_type) { should eq(:import) }
     its(:physical_package_name) { should eq('IMG_0395.MOV') }
     its(:physical_package_locator) { should eq('file:///Macintosh%20HD/Users/susannehassepass/Desktop/London%201video/IMG_0395.MOV') }
-
-    # Left-overs from the previous version (0.3.6) of mxfinfo
-
-#    its(:unc_path) { should('Macintosh HD:Users:susannehassepass:Desktop:London 1video:IMG_0395.MOV') }
-# => Isn't exported from libmxf.
-
   end
-end
+end

data/spec/mxfinfo_spec.rb

@@ -20,7 +20,11 @@ describe 'MXFInfo' do
       it 'should return an InfoObject instance' do
         expect(MXFInfo.scan File.expand_path('../fixtures/IMG_0395.MOV.A14DC7130D.mxf', __FILE__)).to be_a(MXFInfo::InfoObject)
       end
-    end 
+
+      it 'should return an UTF-8 clip_name' do
+        expect(MXFInfo.scan(File.expand_path('../fixtures/IMG_0395.MOV.A14DC7130D.mxf', __FILE__)).clip_name.encoding).to eq(Encoding::UTF_8)
+      end
+    end
   end
 end
 

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'mxfinfo'
+require 'rspec/its'
 
 RSpec.configure do |config|
   config.order = 'random'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mxfinfo
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Steve Dierker
@@ -9,40 +9,54 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2021-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 description: MXFinfo is a gem that wraps avidmxfinfo from libmxf in a native ruby
   extension.
 email:
-- technology@flavoursys.com
+- technology@projective.io
 executables: []
 extensions:
 - ext/mxfinfo/extconf.rb
@@ -53,6 +67,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- compile_commands.json
 - ext/mxfinfo/avid_mxf_info.c
 - ext/mxfinfo/avid_mxf_info.h
 - ext/mxfinfo/extconf.rb
@@ -65,7 +80,7 @@ files:
 - spec/info_object_spec.rb
 - spec/mxfinfo_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/flavoursys/mxfinfo
+homepage: http://github.com/projectivetech/mxfinfo
 licenses:
 - MIT
 metadata: {}
@@ -85,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: MXFinfo is a gem that wraps avidmxfinfo from libmxf in a native ruby extension.