r7streamio_ffmpeg 2.0.0 → 2.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/lib/ffmpeg/encoding_options.rb +1 -1
- data/lib/ffmpeg/movie.rb +5 -4
- data/lib/ffmpeg/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
YmEyNmEzNWE4MzEzNTIzNzU4NzBmOWZmOWRiNzNlOTc2YmMxMGY5ZQ==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
MmUzYjVlMGY1Mzg5ZTNhMTliMjRjZjMzMDIxYTBiNWYzY2ViMDYzOQ==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
NWUxMjliZjIzNDNjNzdiOWE2MzRlZjk4NjJiNTFjMjhlNGFjM2RkMGYzZmJm
|
10
|
+
YTRkM2ZlMTg4NzZhMzlmODUxNDc1OGRhZmQ2ZjM0OTFmMTY3ODA5ODEwNzI0
|
11
|
+
ODE5NjVkZWM5NzFlNTczNDcxYzhlZjBiMmY4MjZkMWNhMzgzOTU=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
M2U0N2ZiYjFlNGUwMTRlODM0NWQwYmIyMWY5M2UyYWNlM2MwN2ZjMzI4ZTUw
|
14
|
+
ZDIwNzE0NmJlZTM3NmMzZDU0NDg2NzE2ZmEzMDljZWQwNWIyYjU5Zjk2OTk5
|
15
|
+
ODhlMGYxMmQ3YjdhN2I0ODgyMjRkNTA3Mzk2NjI5OWVlM2QwMGQ=
|
@@ -150,7 +150,7 @@ module FFMPEG
|
|
150
150
|
"-filter_complex 'scale=#{self[:resolution]},overlay=x=#{value[:padding_x]}:y=main_h-overlay_h-#{value[:padding_y]}'"
|
151
151
|
when "RB"
|
152
152
|
"-filter_complex 'scale=#{self[:resolution]},overlay=x=main_w-overlay_w-#{value[:padding_x]}:y=main_h-overlay_h-#{value[:padding_y]}'"
|
153
|
-
end
|
153
|
+
end
|
154
154
|
end
|
155
155
|
|
156
156
|
def convert_custom(value)
|
data/lib/ffmpeg/movie.rb
CHANGED
@@ -5,7 +5,7 @@ module FFMPEG
|
|
5
5
|
attr_reader :path, :duration, :time, :bitrate, :rotation, :creation_time
|
6
6
|
attr_reader :video_stream, :video_codec, :video_bitrate, :colorspace, :resolution, :sar, :dar
|
7
7
|
attr_reader :audio_stream, :audio_codec, :audio_bitrate, :audio_sample_rate
|
8
|
-
attr_reader :container
|
8
|
+
attr_reader :container, :sizep
|
9
9
|
|
10
10
|
def initialize(path)
|
11
11
|
raise Errno::ENOENT, "the file '#{path}' does not exist" unless File.exists?(path)
|
@@ -46,9 +46,10 @@ module FFMPEG
|
|
46
46
|
commas_except_in_parenthesis = /(?:\([^()]*\)|[^,])+/ # regexp to handle "yuv420p(tv, bt709)" colorspace etc from http://goo.gl/6oi645
|
47
47
|
@video_codec, @colorspace, resolution, video_bitrate = @video_stream.scan(commas_except_in_parenthesis).map(&:strip)
|
48
48
|
@video_bitrate = video_bitrate =~ %r(\A(\d+) kb/s\Z) ? $1.to_i : nil
|
49
|
-
@resolution
|
50
|
-
@
|
51
|
-
@
|
49
|
+
@resolution = resolution.split(" ").first rescue nil # get rid of [PAR 1:1 DAR 16:9]
|
50
|
+
@sizep = @resolution.split("x").last.to_i rescue nil
|
51
|
+
@sar = $1 if @video_stream[/SAR (\d+:\d+)/]
|
52
|
+
@dar = $1 if @video_stream[/DAR (\d+:\d+)/]
|
52
53
|
end
|
53
54
|
|
54
55
|
if @audio_stream
|
data/lib/ffmpeg/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: r7streamio_ffmpeg
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Rodrigo Martins
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-07-
|
11
|
+
date: 2014-07-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rspec
|