video_converter 0.6.10 → 0.6.12

data/lib/video_converter/input.rb

@@ -30,24 +30,16 @@ module VideoConverter
         @metadata = {}
         # common metadata
         s = Command.new(self.class.metadata_command, :ffprobe_bin => Ffmpeg.ffprobe_bin, :input => input).capture
-        if m = s.match(/Stream\s#(\d:\d).*?Audio:\s*(\w+).*?(\d+)\s*Hz.*?(\d+)\s*kb\/s.*?$/)
-          @metadata[:audio_stream] = m[1]
-          @metadata[:audio_codec] = m[2]
-          @metadata[:audio_sample_rate] = m[3].to_i
-          @metadata[:audio_bitrate_in_kbps] = m[4].to_i
-        end
         @metadata[:channels] = s.scan(/Stream #\d+:\d+/).count
         if m = s.match(/Duration:\s+(\d+):(\d+):([\d.]+).*?bitrate:\s*(\d+)\s*kb\/s/)
           @metadata[:duration_in_ms] = ((m[1].to_i * 3600 + m[2].to_i * 60 + m[3].to_f) * 1000).to_i
           @metadata[:total_bitrate_in_kbps] = m[4].to_i
         end
-        if m = s.match(/Stream\s#(\d:\d).*?Video:\s([[:alnum:]]+).*?,\s*((\d+)x(\d+))(?:.*?(\d+)\s*kb\/s.*?([\d.]+)\s*fps)?/)
-          @metadata[:video_stream] = m[1]
-          @metadata[:video_codec] = m[2]
-          @metadata[:width] = m[4].to_i
-          @metadata[:height] = m[5].to_i
-          @metadata[:video_bitrate_in_kbps] = m[6].to_i
-          @metadata[:frame_rate] = m[7].to_f
+        @metadata[:audio_streams] = s.scan(/Stream\s#(\d:\d).*?Audio:\s*(\w+).*?(\d+)\s*Hz.*?(\d+)\s*kb\/s.*?$/).map do |stream|
+          Hash[[:map, :audio_codec, :audio_sample_rate, :audio_bitrate_in_kbps].zip(stream)]
+        end
+        @metadata[:video_streams] = s.scan(/Stream\s#(\d:\d).*?Video:\s([[:alnum:]]+).*?,\s*((\d+)x(\d+))(?:.*?(\d+)\s*kb\/s.*?([\d.]+)\s*fps)?/).map do |stream|
+          Hash[[:map, :video_codec, :width, :height, :video_bitrate_in_kbps, :frame_rate].zip(stream)]
         end
         if m = s.match(/rotate\s*\:\s*(\d+)/)
           @metadata[:rotate] = m[1].to_i

data/lib/video_converter/version.rb

@@ -1,3 +1,3 @@
 module VideoConverter
-  VERSION = "0.6.10"
+  VERSION = "0.6.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: video_converter
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: video_screenshoter
@@ -140,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1606847744820249000
+      hash: 2474846493432799317
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1606847744820249000
+      hash: 2474846493432799317
 requirements:
 - ffmpeg, version 1.2 or greated configured with libx264 and libfaac
 - live_segmenter to convert to hls