apple-tv-converter 0.5.3 → 0.5.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/CHANGELOG +4 -0
  2. data/Gemfile.lock +18 -16
  3. data/gems/streamio-ffmpeg/lib/ffmpeg/stream.rb +9 -1
  4. data/lib/apple_tv_converter/media_converter_adapter.rb +1 -1
  5. data/lib/apple_tv_converter/version.rb +1 -1
  6. metadata +2 -2
data/CHANGELOG CHANGED
@@ -1,3 +1,7 @@
1
+ v0.5.4
2
+ ------
3
+ * Convert DTS 6.1 audio to 6 channels when transcoding
4
+
1
5
  v0.5.3
2
6
  ------
3
7
  * Some transcoding fixes
data/Gemfile.lock CHANGED
@@ -1,44 +1,46 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- apple-tv-converter (0.5.0)
4
+ apple-tv-converter (0.5.4)
5
+ httparty
5
6
  imdb (~> 0.6.8)
6
7
  language_list (~> 0.0.3)
8
+ libxml-ruby
9
+ rubyzip (< 1.0.0)
7
10
  streamio-ffmpeg (~> 0.9.0)
8
11
 
9
12
  PATH
10
- remote: ./gems/streamio-ffmpeg
13
+ remote: gems/streamio-ffmpeg
11
14
  specs:
12
15
  streamio-ffmpeg (0.9.0)
13
16
 
14
17
  GEM
15
18
  remote: http://rubygems.org/
16
19
  specs:
17
- diff-lcs (1.1.3)
20
+ diff-lcs (1.2.5)
18
21
  hpricot (0.8.6)
19
- httparty (0.11.0)
20
- multi_json (~> 1.0)
22
+ httparty (0.12.0)
23
+ json (~> 1.8)
21
24
  multi_xml (>= 0.5.2)
22
25
  imdb (0.6.8)
23
26
  hpricot (~> 0.8.4)
27
+ json (1.8.1)
24
28
  language_list (0.0.3)
25
- libxml-ruby (2.3.3)
26
- multi_json (1.8.0)
29
+ libxml-ruby (2.7.0)
27
30
  multi_xml (0.5.5)
28
31
  rake (0.9.6)
29
- rspec (2.12.0)
30
- rspec-core (~> 2.12.0)
31
- rspec-expectations (~> 2.12.0)
32
- rspec-mocks (~> 2.12.0)
33
- rspec-core (2.12.2)
34
- rspec-expectations (2.12.1)
35
- diff-lcs (~> 1.1.3)
36
- rspec-mocks (2.12.2)
32
+ rspec (2.14.1)
33
+ rspec-core (~> 2.14.0)
34
+ rspec-expectations (~> 2.14.0)
35
+ rspec-mocks (~> 2.14.0)
36
+ rspec-core (2.14.7)
37
+ rspec-expectations (2.14.5)
38
+ diff-lcs (>= 1.1.3, < 2.0)
39
+ rspec-mocks (2.14.5)
37
40
  rubyzip (0.9.9)
38
41
 
39
42
  PLATFORMS
40
43
  ruby
41
- x86-mingw32
42
44
 
43
45
  DEPENDENCIES
44
46
  apple-tv-converter!
data/gems/streamio-ffmpeg/lib/ffmpeg/stream.rb CHANGED
@@ -9,7 +9,15 @@ module FFMPEG
9
9
 
10
10
  attr_writer :input_number, :stream_number, :language, :type
11
11
  attr_writer :video_codec, :video_bitrate, :colorspace, :resolution, :dar
12
- attr_writer :audio_channels, :audio_codec, :audio_bitrate, :audio_sample_rate
12
+ attr_writer :audio_codec, :audio_bitrate, :audio_sample_rate
13
13
  attr_writer :subtitle_codec, :subtitle_format
14
+
15
+ def audio_channels=(value)
16
+ if value.strip =~ /^(\d+)\.(\d+)$/
17
+ @audio_channels = [$1.to_i + $2.to_i, 6].min
18
+ else
19
+ @audio_channels = value
20
+ end
21
+ end
14
22
  end
15
23
  end
data/lib/apple_tv_converter/media_converter_adapter.rb CHANGED
@@ -104,7 +104,7 @@ module AppleTvConverter
104
104
  audio_bitrate ||= media.ffmpeg_data.audio_bitrate || 448
105
105
 
106
106
  options[:extra] << " -af volume=2.000000" # Increase the volume when transcoding
107
- options[:extra] << " -ac #{media.ffmpeg_data.audio_channels} -ar #{media.ffmpeg_data.audio_sample_rate}"
107
+ options[:extra] << " -ac #{media.ffmpeg_data.audio_channels || media.audio_streams.first.audio_channels} -ar #{media.ffmpeg_data.audio_sample_rate}"
108
108
  options[:extra] << " -ab #{[audio_bitrate, (media.ffmpeg_data.audio_bitrate || 1000000)].min}k"
109
109
  end
110
110
 
data/lib/apple_tv_converter/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module AppleTvConverter
2
- VERSION = "0.5.3"
2
+ VERSION = "0.5.4"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: apple-tv-converter
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.3
4
+ version: 0.5.4
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: 2013-12-26 00:00:00.000000000 Z
12
+ date: 2014-02-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rspec