mediainfo-native 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf002bc10633a3fd63ea58f448f68cf18fb64d3e
-  data.tar.gz: ffe64131588e071342e0b75f9c3193dd194c1b0d
+  metadata.gz: f64beab22d1edc8263d33f3e97f7bf8da57749a7
+  data.tar.gz: 1b9344a3f4e2b334a4fb9ddd8a94446b84716dc2
 SHA512:
-  metadata.gz: 816058893a382fcf5302d943ca8a3f0c72d496cb84f3b12e5a56eb38cb41affd4d62cb3b8455b96b71e1f93f5c41b61f2c75af81029f070640e7e73da2eda550
-  data.tar.gz: a26023d714e88311ce05a4a8d5318d0c20157ebfbd7e5f86bc6242da8e7afa3b1cdeefc3b6199030bed9bd149e35b50fe3d854ef127277809f8870e2527f57e3
+  metadata.gz: 09d1198564b03a3e6d9a2457a1852ce0ebf248cf36b073258fe7ce6967ffb691ba45e3525c66cce8dc61b817f209f39f57e18ad958fcbf5e1e6aa5b9dc77ff02
+  data.tar.gz: de2b77e3187849a19c84d66bd5b12307604537a9949aa3cceec7bc849d4d31d2f220f6c77d1d9abf646d4fb80b6fc9171494ce81609ec43a917b4ecf0fd43a8e

data/ext/mediainfo_native/MediaInfoDLL.h

@@ -15,6 +15,10 @@
 #ifndef MediaInfoDLLH
 #define MediaInfoDLLH
 
+
+#undef UNICODE
+#undef _UNICODE
+
 //***************************************************************************
 // Platforms (from libzen)
 //***************************************************************************

data/ext/mediainfo_native/basestream.cpp

@@ -1,4 +1,3 @@
-#include "MediaInfoDLL.h"
 #include "basestream.h"
 #include "mediainfo_wrapper.h"
 
@@ -27,28 +26,28 @@ extern "C"
 
 }
 
-VALUE stream_klasses[MediaInfoDLL::Stream_Max];
+VALUE stream_klasses[STREAM_TYPE_MAX];
 
 void Init_BaseStream(VALUE mMediaInfoNative)
 {
   VALUE cBaseStream = rb_define_class_under(mMediaInfoNative, "BaseStream", rb_cObject);
 
-  stream_klasses[MediaInfoDLL::Stream_General] = rb_define_class_under(mMediaInfoNative, "GeneralStream", cBaseStream);
-  stream_klasses[MediaInfoDLL::Stream_Video]   = rb_define_class_under(mMediaInfoNative, "VideoStream", cBaseStream);
-  stream_klasses[MediaInfoDLL::Stream_Audio]   = rb_define_class_under(mMediaInfoNative, "AudioStream", cBaseStream);
-  stream_klasses[MediaInfoDLL::Stream_Text]    = rb_define_class_under(mMediaInfoNative, "TextStream", cBaseStream);
-  stream_klasses[MediaInfoDLL::Stream_Other]   = rb_define_class_under(mMediaInfoNative, "OtherStream", cBaseStream);
-  stream_klasses[MediaInfoDLL::Stream_Image]   = rb_define_class_under(mMediaInfoNative, "ImageStream", cBaseStream);
-  stream_klasses[MediaInfoDLL::Stream_Menu]    = rb_define_class_under(mMediaInfoNative, "MenuStream", cBaseStream);
+  stream_klasses[GENERAL] = rb_define_class_under(mMediaInfoNative, "GeneralStream", cBaseStream);
+  stream_klasses[VIDEO]   = rb_define_class_under(mMediaInfoNative, "VideoStream", cBaseStream);
+  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[IMAGE]   = rb_define_class_under(mMediaInfoNative, "ImageStream", cBaseStream);
+  stream_klasses[MENU]    = rb_define_class_under(mMediaInfoNative, "MenuStream", cBaseStream);
 
-  for(unsigned int st = 0; st < MediaInfoDLL::Stream_Max; ++st) {
+  for(unsigned int st = 0; st < STREAM_TYPE_MAX; ++st) {
     rb_define_method(stream_klasses[st], "lookup", (VALUE(*)(...)) bs_lookup, 1);
   }
 }
 
 /* ************************** BaseStream ************************************ */
 
-BaseStream::BaseStream(MediaInfoDLL::stream_t _type, unsigned int _idx, MediaInfoWrapper* _wrapper)
+BaseStream::BaseStream(StreamType _type, unsigned int _idx, MediaInfoWrapper* _wrapper)
 : valid(true), type(_type), idx(_idx), wrapper(_wrapper)
 {
 }
@@ -80,9 +79,7 @@ VALUE BaseStream::lookup(VALUE key) const
   if(!valid)
     rb_raise(rb_eStandardError, "stream is invalid");
 
-
-  MediaInfoDLL::String mi_key(StringValueCStr(key));
-  return rb_str_new2(wrapper->getMediaInfo()->Get(type, idx, mi_key).c_str());
+  return wrapper->get(type, idx, key);
 }
 
 } /* namespace MediaInfoNative */

data/ext/mediainfo_native/basestream.h

@@ -2,17 +2,28 @@
 #define MEDIAINFO_NATIVE_BASESTREAM_H
 
 #include <ruby.h>
-#include "MediaInfoDLL.h"
 
 namespace MediaInfoNative
 {
 
+enum StreamType
+{
+  GENERAL,
+  VIDEO,
+  AUDIO,
+  TEXT,
+  OTHER,
+  IMAGE,
+  MENU,
+  STREAM_TYPE_MAX
+};
+
 class MediaInfoWrapper;
 
 class BaseStream
 {
 public:
-  BaseStream(MediaInfoDLL::stream_t _type, unsigned int _idx, MediaInfoWrapper* _wrapper);
+  BaseStream(StreamType _type, unsigned int _idx, MediaInfoWrapper* _wrapper);
   ~BaseStream();
   void notifyOfWrapperDestruction();
   void invalidate();
@@ -22,7 +33,7 @@ public:
 
 private:
   bool valid;
-  const MediaInfoDLL::stream_t type;
+  const StreamType type;
   const unsigned int idx;
   MediaInfoWrapper* wrapper;
 };

data/ext/mediainfo_native/extconf.rb

@@ -1,7 +1,17 @@
 require 'mkmf'
 
-unless have_library('mediainfo') || pkg_config('libmediainfo')
-  abort 'Failed to locate libmediainfo. Please install it from https://mediaarea.net/en/MediaInfo/Download/Source.'
+unless (mediainfo_cfg = pkg_config('libmediainfo'))
+  abort 'Failed to locate pkg-config file for libmediainfo.'
 end
 
-create_makefile('mediainfo_native')
+unless have_library('mediainfo')
+  abort 'Failed to test-link against libmediainfo.'
+end
+
+location = (mediainfo_cfg.detect { |flag| flag =~ /^-L/ }).gsub('-L', '')
+$LDFLAGS << " -Wl,-rpath,#{location}"
+message "embedding path to library into libmediainfo.so: #{location}\n"
+
+with_cppflags("#{(mediainfo_cfg.detect { |flag| flag =~ /^-I/ })}") do
+  create_makefile('mediainfo_native')
+end

data/ext/mediainfo_native/mediainfo_wrapper.cpp

@@ -1,6 +1,6 @@
 #include "MediaInfoDLL.h"
 #include "mediainfo_wrapper.h"
-#include "basestream.h"
+#include "unicode.h"
 
 namespace MediaInfoNative
 {
@@ -87,6 +87,31 @@ void Init_MediaInfoWrapper(VALUE mMediaInfoNative)
 #define CHECK_OPEN  \
   if(!file_opened) rb_raise(rb_eStandardError, "no file opened")
 
+MediaInfoDLL::stream_t convertToMediaInfoStreamType(StreamType type)
+{
+  switch(type) {
+  case GENERAL:
+    return MediaInfoDLL::Stream_General;
+  case VIDEO:
+    return MediaInfoDLL::Stream_Video;
+  case AUDIO:
+    return MediaInfoDLL::Stream_Audio;
+  case TEXT:
+    return MediaInfoDLL::Stream_Text;
+  case OTHER:
+    return MediaInfoDLL::Stream_Other;
+  case IMAGE:
+    return MediaInfoDLL::Stream_Image;
+  case MENU:
+    return MediaInfoDLL::Stream_Menu;
+  }
+}
+
+MediaInfoDLL::stream_t convertToMediaInfoStreamType(unsigned int type)
+{
+  return convertToMediaInfoStreamType((StreamType) type);
+}
+
 MediaInfoWrapper::MediaInfoWrapper()
 : file_opened(false)
 {
@@ -114,7 +139,7 @@ void MediaInfoWrapper::open(VALUE path)
   if(file_opened)
     rb_raise(rb_eStandardError, "already opened a file");
 
-  MediaInfoDLL::String mi_path(StringValuePtr(path));
+  MediaInfoDLL::String mi_path = value_to_ansi_string(path);
 
   if(mi->Open(mi_path) != 1)
     rb_raise(rb_eStandardError, "failed to open");
@@ -140,9 +165,9 @@ VALUE MediaInfoWrapper::wrapStreams()
   CHECK_OPEN;
 
   VALUE ary = rb_ary_new();
-  for(unsigned int st = 0; st < ((unsigned int) MediaInfoDLL::Stream_Max); ++st) {
-    for(unsigned int count = 0; count < mi->Count_Get((MediaInfoDLL::stream_t) st); ++count) {
-      BaseStream* bs = new BaseStream((MediaInfoDLL::stream_t) st, count, this);
+  for(unsigned int st = 0; st < ((unsigned int) STREAM_TYPE_MAX); ++st) {
+    for(unsigned int count = 0; count < mi->Count_Get(convertToMediaInfoStreamType(st)); ++count) {
+      BaseStream* bs = new BaseStream((StreamType) st, count, this);
       rb_ary_push(ary, bs->wrap());
     }
   }
@@ -150,11 +175,17 @@ VALUE MediaInfoWrapper::wrapStreams()
   return ary;
 }
 
+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));
+}
+
 VALUE MediaInfoWrapper::inform() const
 {
   CHECK_OPEN;
 
-  return rb_str_new2(mi->Inform().c_str());
+  return ansi_string_to_value(mi->Inform());
 }
 
 void MediaInfoWrapper::notifyOfStreamDestruction(BaseStream* stream)
@@ -162,23 +193,4 @@ void MediaInfoWrapper::notifyOfStreamDestruction(BaseStream* stream)
   streams.remove(stream);
 }
 
-MediaInfoDLL::MediaInfo* MediaInfoWrapper::getMediaInfo()
-{
-  return mi;
-}
-
-void MediaInfoWrapper::lzld() const
-{
-  /*
-   * NOTE: Due to the weird manual way of lazy runtime linking
-   *       used in MediaInfoDLL.h, this useless function is needed
-   *       to tell the compiler to load the MediaInfo_Get symbol
-   *       from the shared library (probably on MediaInfoWrapper
-   *       class instantiation). If this is commented out, calls
-   *       to Get() in the BaseStream will fail with a segmentation
-   *       fault.
-   */
-  mi->Get((MediaInfoDLL::stream_t) 0, 0, "");
-}
-
 } /* namespace MediaInfoNative */

data/ext/mediainfo_native/mediainfo_wrapper.h

@@ -3,13 +3,13 @@
 
 #include <list>
 #include <ruby.h>
-#include "MediaInfoDLL.h"
+#include "basestream.h"
+
+namespace MediaInfoDLL { class MediaInfo; }
 
 namespace MediaInfoNative
 {
 
-class BaseStream;
-
 class MediaInfoWrapper
 {
 public:
@@ -19,17 +19,16 @@ public:
   void  open(VALUE path);
   void  close();
   VALUE wrapStreams();
+
   VALUE inform() const;
+  VALUE get(StreamType type, unsigned int idx, VALUE key) const;
 
   void notifyOfStreamDestruction(BaseStream* stream);
-  MediaInfoDLL::MediaInfo* getMediaInfo();
 
 private:
-  void  lzld() const;
-
   bool                     file_opened;
   MediaInfoDLL::MediaInfo* mi;
-  std::list<BaseStream*> streams;
+  std::list<BaseStream*>   streams;
 };
 
 void Init_MediaInfoWrapper(VALUE mMediaInfoNative);

data/ext/mediainfo_native/unicode.cpp

@@ -0,0 +1,15 @@
+#include <ruby.h>
+#include <ruby/encoding.h>
+#include "unicode.h"
+
+MediaInfoDLL::String value_to_ansi_string(VALUE s)
+{
+  rb_encoding* enc = rb_enc_find("ANSI");
+  VALUE exported = rb_str_export_to_enc(s, enc);
+  return MediaInfoDLL::String(StringValueCStr(exported));
+}
+
+VALUE ansi_string_to_value(MediaInfoDLL::String s)
+{
+  return rb_external_str_new_with_enc(s.c_str(), s.length(), rb_enc_find("ANSI"));
+}

data/ext/mediainfo_native/unicode.h

@@ -0,0 +1,10 @@
+#ifndef MEDIAINFO_NATIVE_UNICODE_H
+#define MEDIAINFO_NATIVE_UNICODE_H
+
+#include <ruby.h>
+#include "MediaInfoDLL.h"
+
+MediaInfoDLL::String value_to_ansi_string(VALUE s);
+VALUE ansi_string_to_value(MediaInfoDLL::String s);
+  
+#endif /* MEDIAINFO_NATIVE_UNICODE_H */

data/lib/mediainfo-native/version.rb

@@ -1,3 +1,3 @@
 module MediaInfoNative
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mediainfo-native
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -57,7 +57,9 @@ files:
 - lib/mediainfo-native/streams/text.rb
 - lib/mediainfo-native/streams/general.rb
 - lib/mediainfo-native/mediainfo.rb
+- ext/mediainfo_native/unicode.cpp
 - ext/mediainfo_native/MediaInfoDLL.h
+- ext/mediainfo_native/unicode.h
 - ext/mediainfo_native/extconf.rb
 - ext/mediainfo_native/mediainfo_wrapper.cpp
 - ext/mediainfo_native/basestream.h