mediainfo-native 0.2.2 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a0f56b4c58101337bd45b648203546d54f092327
-  data.tar.gz: b81cf0c184cffefc4c1a1d63054a7d153c36f7e3
+SHA256:
+  metadata.gz: 0b3c5ead23b741aff80e2ea9efa6080ac03ddca5f2d26985a09fb229854b2155
+  data.tar.gz: d3671fb23e058d954385fe5293bdf8bd7f4298231a90969139b3a2f9aac7059f
 SHA512:
-  metadata.gz: f8c714cabd82f191654d64a501af61c53b8814a725e35109ea219ca343d3142fb8179715ff689f5ccbcfc01382292a2c2d45291c8f0505ab3128c5944bc3c366
-  data.tar.gz: 88879bd09a869d7a9c0cbb20dcbdd8386c016d97fbfc7b45f7fd4f34f03625ce0ce62c78dd20d40a71733af3738693f072d76a1bc6677251cff7246d8d6022f7
+  metadata.gz: 220538dea36980db4a94406759b257d0381e21a815aa3030b0f9b85b75142fee5559f38d2504a49f40e998f1b02059c63fbc13d9af94c0e5cdb5eb5bf2548b19
+  data.tar.gz: afabd80d260bfa1bf6801c4a6c777619e10f0a3b298118be277a39ac73cdf0fd2ac9f20f98c853a68ab1cbe318c65cf2572c41b15b805f4d2f15decd1141ae30

data/ext/mediainfo_native/MediaInfoDLL.h

@@ -16,8 +16,8 @@
 #define MediaInfoDLLH
 
 
-#undef UNICODE
-#undef _UNICODE
+#define UNICODE
+#define _UNICODE
 
 //***************************************************************************
 // Platforms (from libzen)

data/ext/mediainfo_native/extconf.rb

@@ -1,20 +1,28 @@
 require 'mkmf'
 
-unless (mediainfo_cfg = pkg_config('libmediainfo'))
-  abort 'Failed to locate pkg-config file for libmediainfo.'
-end
+if (mediainfo_cfg = pkg_config('libmediainfo'))
 
-unless have_library('mediainfo')
-  abort 'Failed to test-link against libmediainfo.'
-end
+  unless have_library('mediainfo')
+    abort 'Failed to test-link against libmediainfo.'
+  end
 
-non_std_location = mediainfo_cfg.detect { |flag| flag =~ /^-L/ }
-if non_std_location
-  non_std_location.gsub!('-L', '')
-  $LDFLAGS << " -Wl,-rpath,#{non_std_location}"
-  message "embedding path to library into libmediainfo.so: #{non_std_location}\n"
-end
+  non_std_location = mediainfo_cfg.detect { |flag| flag =~ /^-L/ }
+  if non_std_location
+    non_std_location.gsub!('-L', '')
+    $LDFLAGS << " -Wl,-rpath,#{non_std_location}"
+    message "embedding path to library into libmediainfo.so: #{non_std_location}\n"
+  end
 
-with_cppflags("#{(mediainfo_cfg.detect { |flag| flag =~ /^-I/ })}") do
-  create_makefile('mediainfo_native')
+  with_cppflags("#{(mediainfo_cfg.detect { |flag| flag =~ /^-I/ })}") do
+    create_makefile('mediainfo_native')
+  end
+else
+  unless have_library('mediainfo')
+    abort 'Failed to test-link against libmediainfo.'
+  end
+
+  with_cppflags("-lmediainfo") do
+    create_makefile('mediainfo_native')
+  end
 end
+

data/ext/mediainfo_native/mediainfo_wrapper.cpp

@@ -68,7 +68,7 @@ extern "C"
     Check_Type(path, T_STRING);
     GET_WRAPPER(miw);
 
-    OpenParams params = { miw, value_to_ansi_string(path), 0 };
+    OpenParams params = { miw, value_to_mediainfo_string(path), 0 };
     rb_thread_call_without_gvl(miw_open_without_gvl, (void*) &params, NULL, NULL);
 
     switch(params.result) {
@@ -103,7 +103,7 @@ extern "C"
     Check_Type(path, T_STRING);
     GET_WRAPPER(miw);
 
-    miw->open(value_to_ansi_string(path));
+    miw->open(value_to_mediainfo_string(path));
     VALUE inform = miw->inform();
     miw->close();
 
@@ -169,9 +169,9 @@ MediaInfoWrapper::MediaInfoWrapper(bool ignore_continuous_file_names)
 : file_opened(false)
 {
   mi = new MediaInfoDLL::MediaInfo();
-  mi->Option("Inform", "XML");
-  mi->Option("Complete", "1");
-  mi->Option("File_TestContinuousFileNames", ignore_continuous_file_names ? "0" : "1");
+  mi->Option(L"Inform", L"XML");
+  mi->Option(L"Complete", L"1");
+  mi->Option(L"File_TestContinuousFileNames", ignore_continuous_file_names ? L"0" : L"1");
 }
 
 MediaInfoWrapper::~MediaInfoWrapper()
@@ -183,7 +183,7 @@ MediaInfoWrapper::~MediaInfoWrapper()
     delete mi;
 }
 
-int MediaInfoWrapper::open(std::string path)
+int MediaInfoWrapper::open(MediaInfoDLL::String path)
 {
   if(file_opened)
     return 1;
@@ -225,20 +225,20 @@ VALUE MediaInfoWrapper::wrapStreams()
 
 VALUE MediaInfoWrapper::get(StreamType type, unsigned int idx, VALUE key) const
 {
-  MediaInfoDLL::String mi_key(value_to_ansi_string(key));
-  return ansi_string_to_value(mi->Get(convertToMediaInfoStreamType(type), idx, mi_key));
+  MediaInfoDLL::String mi_key(value_to_mediainfo_string(key));
+  return mediainfo_string_to_value(mi->Get(convertToMediaInfoStreamType(type), idx, mi_key));
 }
 
 VALUE MediaInfoWrapper::inform() const
 {
   CHECK_OPEN;
 
-  return ansi_string_to_value(mi->Inform());
+  return mediainfo_string_to_value(mi->Inform());
 }
 
 VALUE MediaInfoWrapper::option() const
 {
-  return ansi_string_to_value(mi->Option("Info_Parameters"));
+  return mediainfo_string_to_value(mi->Option(L"Info_Parameters"));
 }
 
 } /* namespace MediaInfoNative */

data/ext/mediainfo_native/unicode.cpp

@@ -1,19 +1,36 @@
 #include <ruby.h>
-#include <ruby/encoding.h>
+#include <cstdlib>
 #include "unicode.h"
 
-MediaInfoDLL::String value_to_ansi_string(VALUE s)
+MediaInfoDLL::String value_to_mediainfo_string(VALUE s)
 {
-  rb_encoding* enc = rb_enc_find("ANSI");
-  VALUE exported = rb_str_export_to_enc(s, enc);
-  return MediaInfoDLL::String(StringValueCStr(exported));
+  size_t  nchars = RSTRING_LEN(s);
+  wchar_t buf[nchars + 1];
+
+  nchars = mbstowcs(buf, StringValueCStr(s), nchars);
+
+  if((size_t) (-1) == nchars)
+    rb_raise(rb_eArgError, "invalid multi-byte sequence in char array");
+  else
+    // According to mbstowcs(3), this is not nul-terminated when max characters
+    // have been written.
+    buf[nchars] = L'\0';
+
+  return MediaInfoDLL::String(buf);
 }
 
-VALUE ansi_string_to_value(MediaInfoDLL::String s)
+VALUE mediainfo_string_to_value(MediaInfoDLL::String s)
 {
-#ifdef RBX_RUBY_VERSION
-  return rb_external_str_new_with_enc(s.c_str(), s.length(), rb_enc_find("ANSI"));
-#else
-  return rb_external_str_new_with_enc(s.c_str(), s.length(), rb_ascii8bit_encoding());
-#endif
+  size_t nbytes = s.length() * 2;
+  char   buf[nbytes + 1];
+
+  nbytes = wcstombs(buf, s.data(), nbytes);
+
+  if((size_t) (-1) == nbytes)
+    rb_raise(rb_eArgError, "wide-char sequence not representable in char array");
+  else
+    // This should actually always be there, just to make sure.
+    buf[nbytes] = '\0';
+
+  return rb_locale_str_new_cstr(buf);
 }

data/ext/mediainfo_native/unicode.h

@@ -4,7 +4,7 @@
 #include <ruby.h>
 #include "MediaInfoDLL.h"
 
-MediaInfoDLL::String value_to_ansi_string(VALUE s);
-VALUE ansi_string_to_value(MediaInfoDLL::String s);
+MediaInfoDLL::String value_to_mediainfo_string(VALUE s);
+VALUE mediainfo_string_to_value(MediaInfoDLL::String s);
   
 #endif /* MEDIAINFO_NATIVE_UNICODE_H */

data/lib/mediainfo-native/attr_readers.rb

@@ -9,43 +9,36 @@ module MediaInfoNative
       @supported_attributes || []
     end
 
-    def mediainfo_attr_reader(attribute, mediainfo_key)     
+    def mediainfo_attr_reader(attribute, mediainfo_key)
       attribute_before_type_cast = "#{attribute}_before_type_cast"
-      
+
       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}")
           v
         else
           v = send(attribute_before_type_cast)
           v = yield v if v and block_given?
-          
+
           instance_variable_set("@#{attribute}", v)
         end
       end
 
       supported_attribute(attribute)
     end
-    
+
     def mediainfo_duration_reader(*a)
-      mediainfo_attr_reader *a do |v|
+      mediainfo_attr_reader(*a) do |v|
         case
-        when v.include?(":")
-          # If it is like 00:20:30.600
-          splitted = v.split(/:|\./)
-          (splitted[0].to_i * 60 * 60 * 1000) + 
-            (splitted[1].to_i * 60 * 1000) + 
-            (splitted[2].to_i * 1000) +
-            (splitted[3].to_i)
         when v.include?('ms')
           # If it is like '20mn 30s 600ms'
           t = 0
           v.split(/\s+/).each do |tf|
             case tf
-            # TODO: Haven't actually seen how they represent hours yet 
+            # TODO: Haven't actually seen how they represent hours yet
             # but hopefully this is ok.. :\
             when /\d+h/  then t += tf.to_i * 60 * 60 * 1000
             when /\d+mn/ then t += tf.to_i * 60 * 1000
@@ -65,7 +58,7 @@ module MediaInfoNative
         end
       end
     end
-    
+
     def mediainfo_date_reader(*a)
       # Mediainfo can return wrong timestamps, so we have to correct them before
       # we let ruby try to parse.
@@ -78,7 +71,7 @@ module MediaInfoNative
         end
       end
     end
-    
+
     def mediainfo_int_reader(*a)
       mediainfo_attr_reader(*a) { |v| v.gsub(/\D+/, "").to_i }
     end

data/lib/mediainfo-native/base_stream.rb

@@ -8,7 +8,7 @@ module MediaInfoNative
       /(\w+)Stream/.match(self.class.name)[1].downcase.to_sym
     end
 
-    TYPES.each do |type| 
+    TYPES.each do |type|
       define_method("#{type}?") { type == stream_type }
     end
   end

data/lib/mediainfo-native/mediainfo.rb

@@ -35,6 +35,8 @@ module MediaInfoNative
   end
 
   class StreamProxy
+    include Enumerable
+
     def initialize(streams)    
       @streams = streams
     end
@@ -46,6 +48,10 @@ module MediaInfoNative
     def [](idx); @streams[idx]; end
     def count; @streams.size; end
 
+    def each(&blk)
+      @streams.each(&blk)
+    end
+
     def respond_to?(meth, include_all = false)
       begin
         case @streams.size

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

@@ -28,6 +28,8 @@ module MediaInfoNative
     mediainfo_attr_reader :codec, 'Codec'
     mediainfo_attr_reader :codec_id_hint, 'CodecID/Hint'
     mediainfo_attr_reader :channel_positions, 'ChannelPositions'
+    mediainfo_attr_reader :muxing_mode, 'MuxingMode'
+    mediainfo_attr_reader :muxing_mode_info, 'MuxingMode_MoreInfo'
 
     mediainfo_int_reader :channels, 'Channel(s)'
     def stereo?; 2 == channels; end

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

@@ -12,6 +12,9 @@ module MediaInfoNative
     mediainfo_attr_reader :overall_bit_rate, 'OverallBitRate'
     mediainfo_attr_reader :encoded_application_string, 'Encoded_Application/String'
     mediainfo_attr_reader :encoded_application, 'Encoded_Application'
+    mediainfo_int_reader :headersize, 'HeaderSize'
+    mediainfo_int_reader :datasize, 'DataSize'
+    mediainfo_int_reader :footersize, 'FooterSize'
     alias_method :writing_application, :encoded_application_string
 
     # Since MediaInfo v0.7.76 encoded_application is replaced by

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

@@ -2,7 +2,6 @@ module MediaInfoNative
   class OtherStream < BaseStream
     mediainfo_attr_reader :stream_id, 'ID'
     mediainfo_attr_reader :type, 'Type'
-    mediainfo_duration_reader :timestamp_firstframe, 'TimeCode_FirstFrame'
-    alias_method :timecode, :timestamp_firstframe
+    mediainfo_attr_reader :timecode, 'TimeCode_FirstFrame'
   end
 end

data/lib/mediainfo-native/version.rb

@@ -1,3 +1,3 @@
 module MediaInfoNative
-  VERSION = '0.2.2'
+  VERSION = '0.2.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mediainfo-native
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.7
 platform: ruby
 authors:
-- FlavourSys Technology GmbH
+- Projective Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 description: Extracts metadata from media files with mediainfo shared library
-email: technology@flavoursys.com
+email: technology@projective.io
 executables: []
 extensions:
 - ext/mediainfo_native/extconf.rb
@@ -66,7 +66,7 @@ files:
 - lib/mediainfo-native/streams/text.rb
 - lib/mediainfo-native/streams/video.rb
 - lib/mediainfo-native/version.rb
-homepage: http://github.com/flavoursys/mediainfo-native
+homepage: https://github.com/projectivetech/mediainfo-native
 licenses:
 - MIT
 metadata: {}
@@ -85,8 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Native bindings for mediainfo