video_converter 0.6.10 → 0.6.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -30,24 +30,16 @@ module VideoConverter
30
30
  @metadata = {}
31
31
  # common metadata
32
32
  s = Command.new(self.class.metadata_command, :ffprobe_bin => Ffmpeg.ffprobe_bin, :input => input).capture
33
- if m = s.match(/Stream\s#(\d:\d).*?Audio:\s*(\w+).*?(\d+)\s*Hz.*?(\d+)\s*kb\/s.*?$/)
34
- @metadata[:audio_stream] = m[1]
35
- @metadata[:audio_codec] = m[2]
36
- @metadata[:audio_sample_rate] = m[3].to_i
37
- @metadata[:audio_bitrate_in_kbps] = m[4].to_i
38
- end
39
33
  @metadata[:channels] = s.scan(/Stream #\d+:\d+/).count
40
34
  if m = s.match(/Duration:\s+(\d+):(\d+):([\d.]+).*?bitrate:\s*(\d+)\s*kb\/s/)
41
35
  @metadata[:duration_in_ms] = ((m[1].to_i * 3600 + m[2].to_i * 60 + m[3].to_f) * 1000).to_i
42
36
  @metadata[:total_bitrate_in_kbps] = m[4].to_i
43
37
  end
44
- if m = s.match(/Stream\s#(\d:\d).*?Video:\s([[:alnum:]]+).*?,\s*((\d+)x(\d+))(?:.*?(\d+)\s*kb\/s.*?([\d.]+)\s*fps)?/)
45
- @metadata[:video_stream] = m[1]
46
- @metadata[:video_codec] = m[2]
47
- @metadata[:width] = m[4].to_i
48
- @metadata[:height] = m[5].to_i
49
- @metadata[:video_bitrate_in_kbps] = m[6].to_i
50
- @metadata[:frame_rate] = m[7].to_f
38
+ @metadata[:audio_streams] = s.scan(/Stream\s#(\d:\d).*?Audio:\s*(\w+).*?(\d+)\s*Hz.*?(\d+)\s*kb\/s.*?$/).map do |stream|
39
+ Hash[[:map, :audio_codec, :audio_sample_rate, :audio_bitrate_in_kbps].zip(stream)]
40
+ end
41
+ @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|
42
+ Hash[[:map, :video_codec, :width, :height, :video_bitrate_in_kbps, :frame_rate].zip(stream)]
51
43
  end
52
44
  if m = s.match(/rotate\s*\:\s*(\d+)/)
53
45
  @metadata[:rotate] = m[1].to_i
@@ -1,3 +1,3 @@
1
1
  module VideoConverter
2
- VERSION = "0.6.10"
2
+ VERSION = "0.6.12"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: video_converter
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.10
4
+ version: 0.6.12
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-07-29 00:00:00.000000000 Z
12
+ date: 2014-07-30 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: video_screenshoter
@@ -140,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
140
140
  version: '0'
141
141
  segments:
142
142
  - 0
143
- hash: 1606847744820249000
143
+ hash: 2474846493432799317
144
144
  required_rubygems_version: !ruby/object:Gem::Requirement
145
145
  none: false
146
146
  requirements:
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
149
149
  version: '0'
150
150
  segments:
151
151
  - 0
152
- hash: 1606847744820249000
152
+ hash: 2474846493432799317
153
153
  requirements:
154
154
  - ffmpeg, version 1.2 or greated configured with libx264 and libfaac
155
155
  - live_segmenter to convert to hls