vcs_ruby 1.1.5 → 1.1.6

data/lib/FFmpeg/ffmpeg.rb

@@ -82,40 +82,18 @@ private
       return nil, false, false
     end
 
-    def probe_meta_information
-      check_cache
-      parse_meta_info
-      return true
-    rescue Exception => e
-      puts e
-      return false
-    end
-
     def check_cache
       unless @cache
         @cache = @ffprobe.execute("\"#{@video.full_path}\"  -show_format -show_streams", "2>&1")
       end
     end
 
-    def get_hash defines
-      result = {}
-      defines.lines.each do |line|
-        kv = line.split("=")
-        result[kv[0].strip] = kv[1].strip if kv.count == 2
-      end
-      result
-    end
-
-    def parse_meta_info
-      parse_format
-      parse_audio_streams
-      parse_video_streams
-    end
-
     def parse_format
       @cache.scan(/\[FORMAT\](.*?)\[\/FORMAT\]/m) do |format|
         @info = FFmpegMetaInfo.new(get_hash(format[0]))
+        return true
       end
+      false
     end
 
     def parse_audio_streams
@@ -126,6 +104,7 @@ private
           @audio_streams << FFmpegAudioStream.new(info)
         end
       end
+      true
     end
 
     def parse_video_streams
@@ -136,6 +115,7 @@ private
           @video_streams << FFmpegVideoStream.new(info)
         end
       end
+      true
     end
   end
 end

data/lib/FFmpeg/ffmpeg_video_stream.rb

@@ -42,7 +42,11 @@ module VCSRuby
 
 
     def frame_rate
-      Rational(@raw['r_frame_rate'])
+      if @raw['r_frame_rate']
+        @raw['r_frame_rate'].to_r
+      elsif @raw['avg_frame_rate']
+        @raw['avg_frame_rate'].to_r
+      end
     end
 
     def aspect_ratio

data/lib/MPlayer/mplayer.rb

@@ -63,14 +63,6 @@ module VCSRuby
     def format_split line
       name = line.strip.split(' ', 2).first
     end
-    def probe_meta_information
-      check_cache
-      parse_meta_info
-      return true
-    rescue Exception => e
-      puts e
-      return false
-    end
 
     def check_cache
       unless @cache
@@ -78,24 +70,24 @@ module VCSRuby
       end
     end
 
-    def get_hash defines
-      result = {}
-      defines.lines.each do |line|
-        kv = line.split("=")
-        result[kv[0].strip] = kv[1].strip if kv.count == 2
-      end
-      result
+    def parse_format
+      mplayer_hash = get_hash(@cache)
+      @info = MPlayerMetaInfo.new(mplayer_hash, File.size(@video.full_path))
+      return true
     end
 
-    def parse_meta_info
+    def parse_audio_streams
+      @audio_streams = []
       mplayer_hash = get_hash(@cache)
-      @info = MPlayerMetaInfo.new(mplayer_hash, File.size(@video.full_path))
+      @audio_streams << MPlayerAudioStream.new(mplayer_hash)
+      return true
+    end
 
-      # Todo: Handling of multiple streams
+    def parse_video_streams
       @video_streams = []
+      mplayer_hash = get_hash(@cache)
       @video_streams << MPlayerVideoStream.new(mplayer_hash)
-      @audio_streams = []
-      @audio_streams << MPlayerAudioStream.new(mplayer_hash)
+      return true
     end
 
     def file_pattern n

data/lib/MPlayer/mplayer_audio_stream.rb

@@ -9,7 +9,6 @@ module VCSRuby
 
     def initialize audio_stream
       @raw = audio_stream
-
     end
 
     def codec short = false

data/lib/capturer.rb

@@ -43,5 +43,27 @@ module VCSRuby
         raise "Capturer '#{name}' does not support format: '#{format}'"
       end
     end
+
+  private
+    def probe_meta_information
+      check_cache
+      return parse_meta_info
+    rescue Exception => e
+      puts e
+      return false
+    end
+
+    def parse_meta_info
+      parse_format && parse_audio_streams && parse_video_streams
+    end
+
+    def get_hash defines
+      result = {}
+      defines.lines.each do |line|
+        kv = line.split("=")
+        result[kv[0].strip] = kv[1].strip if kv.count == 2
+      end
+      result
+    end
   end
 end

data/lib/contact_sheet.rb

@@ -337,7 +337,7 @@ private
         convert << create_highlight(montage) if @highlight
         convert << montage.path
         convert.append
-        if @signature
+        if @signature && @signature.length > 0
           convert.stack do |a|
             a.size "#{montage.width}x#{signature_height}"
             a.gravity 'Center'

data/lib/libAV/libav.rb

@@ -84,90 +84,68 @@ private
       return nil, false, false
     end
 
-    def probe_meta_information
-      check_cache
-      return parse_meta_info
-    rescue Exception => e
-      puts e
-      return false
-    end
-
     def check_cache
       unless @cache
         @cache = @avprobe.execute("\"#{@video.full_path}\"  -show_format -show_streams", "2>&1")
       end
     end
 
-    def get_hash defines
-      result = {}
-      defines.lines.each do |line|
-        kv = line.split("=")
-        result[kv[0].strip] = kv[1].strip if kv.count == 2
+    def extract_format regexp
+      @cache.scan() do |format|
+        @info = LibAVMetaInfo.new(get_hash(format[0]))
+        return true
       end
-      result
-    end
-
-    def parse_meta_info
-      parse_format && parse_audio_streams && parse_video_streams
+      false
     end
 
     def parse_format
-      parsed = false
-      @cache.scan(/\[FORMAT\](.*?)\[\/FORMAT\]/m) do |format|
-        @info = LibAVMetaInfo.new(get_hash(format[0]))
-        parsed = true
-      end
+      parsed = extract_format(/\[FORMAT\](.*?)\[\/FORMAT\]/m)
       unless parsed
-        @cache.scan(/\[format\](.*?)\n\n/m) do |format|
-          @info = LibAVMetaInfo.new(get_hash(format[0]))
-          parsed = true
-        end
+        parsed = extract_format(/\[format\](.*?)\n\n/m)
       end
       return parsed
     end
 
-    def parse_audio_streams
+    def extract_audio_streams regexp
       parsed = false
-      @audio_streams = []
-      @cache.scan(/\[STREAM\](.*?)\[\/STREAM\]/m) do |stream|
+      @cache.scan(regexp) do |stream|
         info = get_hash(stream[0])
         if info['codec_type'] == 'audio'
           @audio_streams << LibAVAudioStream.new(info)
           parsed = true
         end
       end
+      parsed
+    end
+
+    def parse_audio_streams
+      @audio_streams = []
+      parsed = extract_audio_streams(/\[STREAM\](.*?)\[\/STREAM\]/m)
       unless parsed
-        @cache.scan(/\[streams.stream.\d\](.*?)\n\n/m) do |stream|
-          info = get_hash(stream[0])
-          if info['codec_type'] == 'audio'
-            @audio_streams << LibAVAudioStream.new(info)
-            parsed = true
-          end
-        end
+        extract_audio_streams(/\[streams.stream.\d\](.*?)\n\n/m)
       end
-      return parsed
+      true
     end
 
-    def parse_video_streams
+    def extract_video_streams regexp
       parsed = false
-      @video_streams = []
-      @cache.scan(/\[STREAM\](.*?)\[\/STREAM\]/m) do |stream|
+      @cache.scan(regexp) do |stream|
         info = get_hash(stream[0])
         if info['codec_type'] == 'video'
           @video_streams << LibAVVideoStream.new(info)
           parsed = true
         end
       end
+      parsed
+    end
+
+    def parse_video_streams
+      @video_streams = []
+      parsed = extract_video_streams(/\[STREAM\](.*?)\[\/STREAM\]/m)
       unless parsed
-        @cache.scan(/\[streams.stream.\d\](.*?)\n\n/m) do |stream|
-          info = get_hash(stream[0])
-          if info['codec_type'] == 'video'
-            @video_streams << LibAVVideoStream.new(info)
-            parsed = true
-          end
-        end
+        parsed = extract_video_streams(/\[streams.stream.\d\](.*?)\n\n/m)
       end
-      return parsed
+      true
     end
   end
 end

data/lib/libAV/libav_video_stream.rb

@@ -42,7 +42,11 @@ module VCSRuby
 
 
     def frame_rate
-      Rational(@raw['r_frame_rate'])
+      if @raw['r_frame_rate']
+        @raw['r_frame_rate'].to_r
+      elsif @raw['avg_frame_rate']
+        @raw['avg_frame_rate'].to_r
+      end
     end
 
     def aspect_ratio

data/lib/version.info

@@ -1 +1 @@
-1.1.5
+1.1.6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcs_ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick