mediainfo-native 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7872bbea265d1cc562d8684dceabc2624364550bdc74e07362e7ad5a696a0523
-  data.tar.gz: d5feba86a2c1404029c0843b5d82c4f763296d7b8965726e16e9d637bec946c0
+  metadata.gz: c240897a580eb3de9faaf15a827f96d20d310b0532cb2b01b74bf481bbb31760
+  data.tar.gz: 41596ad2d43cb9141732bac08d7e4cf1a4939b1df6b50739edf4d6f44ea243e3
 SHA512:
-  metadata.gz: ad9a1b66cc3b84134615e300b523c13092a0d8a4f647c722b474405bafa1b5bcd3d5a7131146e9baeae9b8f24956443a3c45e7de353dc1b090bb08664cd30716
-  data.tar.gz: f1e0a56e056e6b296c8f7195fa6f2e73c5323828a011a3d0c81916d64209ba201b3db212f9d538ecb5057b05ac111d0f174923ae9644cd32e383e23f1c464778
+  metadata.gz: 34d30843f971abf092d7db9676176e7c9a76ea531156d1b053f58025a6cfb2063b0bb24d5ce6b1b1309d96d503e2788428e37aebe9bd78e1652d32d64b2a3086
+  data.tar.gz: 579b8b1185b0222f9ac99150a66fd29183b4a3fe91d301fff38610a076aa3e6a620a2a1bdca9cd17899ff019c604b832ec21f19d53b207114c8d9cfdc1060114

data/ext/mediainfo_native/MediaInfoDLL.h

@@ -15,9 +15,12 @@
 #ifndef MediaInfoDLLH
 #define MediaInfoDLLH
 
-
+#ifndef UNICODE
 #define UNICODE
+#endif
+#ifndef _UNICODE
 #define _UNICODE
+#endif
 
 //***************************************************************************
 // Platforms (from libzen)

data/ext/mediainfo_native/basestream.cpp

@@ -8,7 +8,7 @@ namespace MediaInfoNative
 
 #define GET_BASESTREAM(var) \
   BaseStream* var; \
-  Data_Get_Struct(self, BaseStream, var)
+  TypedData_Get_Struct(self, BaseStream, &basestream_type, var)
 
 extern "C"
 {
@@ -18,6 +18,17 @@ extern "C"
     delete ((BaseStream*) ptr);
   }
 
+  static const rb_data_type_t basestream_type = {
+    "BaseStream",
+    {
+      nullptr, // mark function
+      bs_free, // free function
+      nullptr,  // memsize function
+    },
+    nullptr, nullptr,
+    RUBY_TYPED_FREE_IMMEDIATELY
+  };
+
   static VALUE bs_lookup(VALUE self, VALUE key)
   {
     GET_BASESTREAM(bs);
@@ -31,17 +42,21 @@ VALUE stream_klasses[STREAM_TYPE_MAX];
 void Init_BaseStream(VALUE mMediaInfoNative)
 {
   VALUE cBaseStream = rb_define_class_under(mMediaInfoNative, "BaseStream", rb_cObject);
+  rb_undef_alloc_func(cBaseStream);
+  VALUE cBaseStreamWithFramerate = rb_define_class_under(mMediaInfoNative, "BaseStreamWithFramerate", cBaseStream);
+  rb_undef_alloc_func(cBaseStreamWithFramerate);
 
   stream_klasses[GENERAL] = rb_define_class_under(mMediaInfoNative, "GeneralStream", cBaseStream);
-  stream_klasses[VIDEO]   = rb_define_class_under(mMediaInfoNative, "VideoStream", cBaseStream);
+  stream_klasses[VIDEO]   = rb_define_class_under(mMediaInfoNative, "VideoStream", cBaseStreamWithFramerate);
   stream_klasses[AUDIO]   = rb_define_class_under(mMediaInfoNative, "AudioStream", cBaseStream);
   stream_klasses[TEXT]    = rb_define_class_under(mMediaInfoNative, "TextStream", cBaseStream);
-  stream_klasses[OTHER]   = rb_define_class_under(mMediaInfoNative, "OtherStream", cBaseStream);
+  stream_klasses[OTHER]   = rb_define_class_under(mMediaInfoNative, "OtherStream", cBaseStreamWithFramerate);
   stream_klasses[IMAGE]   = rb_define_class_under(mMediaInfoNative, "ImageStream", cBaseStream);
   stream_klasses[MENU]    = rb_define_class_under(mMediaInfoNative, "MenuStream", cBaseStream);
 
   for(unsigned int st = 0; st < STREAM_TYPE_MAX; ++st) {
-    rb_define_method(stream_klasses[st], "lookup", (VALUE(*)(...)) bs_lookup, 1);
+    rb_undef_alloc_func(stream_klasses[st]);
+    rb_define_method(stream_klasses[st], "lookup", RUBY_METHOD_FUNC(bs_lookup), 1);
   }
 }
 
@@ -54,7 +69,7 @@ BaseStream::BaseStream(StreamType _type, unsigned int _idx, MediaInfoWrapper* _w
 
 VALUE BaseStream::wrap()
 {
-  return Data_Wrap_Struct(stream_klasses[type], 0, bs_free, this);
+  return TypedData_Wrap_Struct(stream_klasses[type], &basestream_type, this);
 }
 
 VALUE BaseStream::lookup(VALUE key) const

data/ext/mediainfo_native/mediainfo_wrapper.cpp

@@ -12,7 +12,7 @@ namespace MediaInfoNative
 
 #define GET_WRAPPER(var) \
   MediaInfoWrapper* var; \
-  Data_Get_Struct(self, MediaInfoWrapper, var)
+  TypedData_Get_Struct(self, MediaInfoWrapper, &mediainfo_wrapper_type, var)
 
 typedef struct {
   MediaInfoWrapper* miw;
@@ -23,13 +23,22 @@ typedef struct {
 extern "C"
 {
 
-  typedef VALUE(*RUBYFUNC)(...);
-
   static void miw_free(void* ptr) 
   {
     delete ((MediaInfoWrapper*) ptr);
   }
 
+  static const rb_data_type_t mediainfo_wrapper_type = {
+    "MediaInfoWrapper",
+    {
+      nullptr, // mark function
+      miw_free, // free function
+      nullptr,  // memsize function
+    },
+    nullptr, nullptr, // parent, data
+    RUBY_TYPED_FREE_IMMEDIATELY
+  };
+
   static VALUE miw_new(VALUE klass, VALUE args)
   {
     if(RARRAY_LEN(args) > 1)
@@ -46,7 +55,7 @@ extern "C"
     }
 
     MediaInfoWrapper* miw = new MediaInfoWrapper(ignore_continuous_file_names);
-    return Data_Wrap_Struct(klass, 0, miw_free, miw);
+    return TypedData_Wrap_Struct(klass, &mediainfo_wrapper_type, miw);
   }
 
   static VALUE miw_close(VALUE self)
@@ -79,7 +88,7 @@ extern "C"
     }
 
     if(rb_block_given_p())
-      return rb_ensure((RUBYFUNC) rb_yield, Qnil, (RUBYFUNC) miw_close, self);
+      return rb_ensure(rb_yield, Qnil, miw_close, self);
     else
       return Qnil;
   }
@@ -123,16 +132,17 @@ extern "C"
 void Init_MediaInfoWrapper(VALUE mMediaInfoNative)
 {
   VALUE cMediaInfo = rb_define_class_under(mMediaInfoNative, "MediaInfo", rb_cObject);
+  rb_undef_alloc_func(cMediaInfo);
 
-  rb_define_singleton_method(cMediaInfo, "new", (RUBYFUNC) miw_new, -2);
+  rb_define_singleton_method(cMediaInfo, "new", RUBY_METHOD_FUNC(miw_new), -2);
 
-  rb_define_method(cMediaInfo, "close", (RUBYFUNC) miw_close, 0);
-  rb_define_method(cMediaInfo, "open", (RUBYFUNC) miw_open, 1);
-  rb_define_method(cMediaInfo, "is_open?", (RUBYFUNC) miw_is_open, 0);
-  rb_define_method(cMediaInfo, "streams", (RUBYFUNC) miw_streams, 0);
+  rb_define_method(cMediaInfo, "close", RUBY_METHOD_FUNC(miw_close), 0);
+  rb_define_method(cMediaInfo, "open", RUBY_METHOD_FUNC(miw_open), 1);
+  rb_define_method(cMediaInfo, "is_open?", RUBY_METHOD_FUNC(miw_is_open), 0);
+  rb_define_method(cMediaInfo, "streams", RUBY_METHOD_FUNC(miw_streams), 0);
 
-  rb_define_method(cMediaInfo, "inform", (RUBYFUNC) miw_inform, 1);
-  rb_define_method(cMediaInfo, "option", (RUBYFUNC) miw_option, 0);
+  rb_define_method(cMediaInfo, "inform", RUBY_METHOD_FUNC(miw_inform), 1);
+  rb_define_method(cMediaInfo, "option", RUBY_METHOD_FUNC(miw_option), 0);
 }
 
 /* ************************** MediaInfoWrapper ****************************** */
@@ -157,6 +167,9 @@ MediaInfoDLL::stream_t convertToMediaInfoStreamType(StreamType type)
     return MediaInfoDLL::Stream_Image;
   case MENU:
     return MediaInfoDLL::Stream_Menu;
+  default:
+    rb_raise(rb_eRuntimeError, "Invalid stream type: %d", (int)type);
+    __builtin_unreachable();
   }
 }
 

data/lib/mediainfo-native/attr_readers.rb

@@ -10,20 +10,22 @@ module MediaInfoNative
     end
 
     def mediainfo_attr_reader(attribute, mediainfo_key)
-      attribute_before_type_cast = "#{attribute}_before_type_cast"
+      # Sanitize for instance variable (remove ?)
+      ivar_name = attribute.to_s.tr('?', '')
+      attribute_before_type_cast = "#{ivar_name}_before_type_cast"
 
-      define_method attribute_before_type_cast do
+      define_method "#{attribute}_before_type_cast" do
         instance_variable_get("@#{attribute_before_type_cast}") || instance_variable_set("@#{attribute_before_type_cast}", lookup(mediainfo_key))
       end
 
       define_method attribute do
-        if v = instance_variable_get("@#{attribute}")
+        if v = instance_variable_get("@#{ivar_name}")
           v
         else
-          v = send(attribute_before_type_cast)
+          v = send("#{attribute}_before_type_cast")
           v = yield v if v and block_given?
 
-          instance_variable_set("@#{attribute}", v)
+          instance_variable_set("@#{ivar_name}", v)
         end
       end
 

data/lib/mediainfo-native/base_stream_with_framerate.rb

@@ -0,0 +1,9 @@
+module MediaInfoNative
+  class BaseStreamWithFramerate < BaseStream
+    mediainfo_attr_reader :frame_rate, 'FrameRate'
+    def fps
+      frame_rate[/[\d.]+/].to_f if frame_rate
+    end
+    alias_method :framerate, :fps
+  end
+end

data/lib/mediainfo-native/streams/general.rb

@@ -16,6 +16,9 @@ module MediaInfoNative
     mediainfo_int_reader :datasize, 'DataSize'
     mediainfo_int_reader :footersize, 'FooterSize'
     alias_method :writing_application, :encoded_application_string
+    mediainfo_attr_reader :streamable?, 'IsStreamable' do |value|
+      value.empty? ? nil : value == 'Yes'
+    end
 
     # Since MediaInfo v0.7.76 encoded_application is replaced by
     # encoded_application_string. So lets check which one is empty.

data/lib/mediainfo-native/streams/other.rb

@@ -1,5 +1,5 @@
 module MediaInfoNative
-  class OtherStream < BaseStream
+  class OtherStream < BaseStreamWithFramerate
     mediainfo_attr_reader :stream_id, 'ID'
     mediainfo_attr_reader :type, 'Type'
     mediainfo_attr_reader :timecode, 'TimeCode_FirstFrame'

data/lib/mediainfo-native/streams/video.rb

@@ -1,5 +1,5 @@
 module MediaInfoNative
-  class VideoStream < BaseStream
+  class VideoStream < BaseStreamWithFramerate
     mediainfo_attr_reader :stream_id, 'ID'
     
     mediainfo_duration_reader :duration, 'Duration'
@@ -57,12 +57,6 @@ module MediaInfoNative
     mediainfo_attr_reader :codec, 'Codec'
     alias_method :codec_id_info, :codec_info
 
-    mediainfo_attr_reader :frame_rate, 'FrameRate'
-    def fps
-      frame_rate[/[\d.]+/].to_f if frame_rate
-    end
-    alias_method :framerate, :fps
-
     mediainfo_attr_reader :nominal_frame_rate, 'FrameRate_Nominal'
     def nominal_fps
       nominal_frame_rate[/[\d.]+/].to_f if nominal_frame_rate

data/lib/mediainfo-native/version.rb

@@ -1,3 +1,3 @@
 module MediaInfoNative
-  VERSION = '0.2.8'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/lib/mediainfo-native.rb

@@ -2,6 +2,7 @@ require 'mediainfo_native.so'
 
 require 'mediainfo-native/attr_readers'
 require 'mediainfo-native/base_stream'
+require 'mediainfo-native/base_stream_with_framerate'
 require 'mediainfo-native/streams/audio'
 require 'mediainfo-native/streams/general'
 require 'mediainfo-native/streams/image'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mediainfo-native
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Projective Technology GmbH
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -57,6 +56,7 @@ files:
 - lib/mediainfo-native.rb
 - lib/mediainfo-native/attr_readers.rb
 - lib/mediainfo-native/base_stream.rb
+- lib/mediainfo-native/base_stream_with_framerate.rb
 - lib/mediainfo-native/mediainfo.rb
 - lib/mediainfo-native/streams/audio.rb
 - lib/mediainfo-native/streams/general.rb
@@ -70,7 +70,6 @@ homepage: https://github.com/projectivetech/mediainfo-native
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -85,8 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Native bindings for mediainfo
 test_files: []