apple-tv-converter 0.5.3 → 0.5.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.5.4
+------
+* Convert DTS 6.1 audio to 6 channels when transcoding
+
 v0.5.3
 ------
 * Some transcoding fixes

data/Gemfile.lock

@@ -1,44 +1,46 @@
 PATH
   remote: .
   specs:
-    apple-tv-converter (0.5.0)
+    apple-tv-converter (0.5.4)
+      httparty
       imdb (~> 0.6.8)
       language_list (~> 0.0.3)
+      libxml-ruby
+      rubyzip (< 1.0.0)
       streamio-ffmpeg (~> 0.9.0)
 
 PATH
-  remote: ./gems/streamio-ffmpeg
+  remote: gems/streamio-ffmpeg
   specs:
     streamio-ffmpeg (0.9.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.5)
     hpricot (0.8.6)
-    httparty (0.11.0)
-      multi_json (~> 1.0)
+    httparty (0.12.0)
+      json (~> 1.8)
       multi_xml (>= 0.5.2)
     imdb (0.6.8)
       hpricot (~> 0.8.4)
+    json (1.8.1)
     language_list (0.0.3)
-    libxml-ruby (2.3.3)
-    multi_json (1.8.0)
+    libxml-ruby (2.7.0)
     multi_xml (0.5.5)
     rake (0.9.6)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.5)
     rubyzip (0.9.9)
 
 PLATFORMS
   ruby
-  x86-mingw32
 
 DEPENDENCIES
   apple-tv-converter!

data/gems/streamio-ffmpeg/lib/ffmpeg/stream.rb

@@ -9,7 +9,15 @@ module FFMPEG
 
       attr_writer :input_number, :stream_number, :language, :type
       attr_writer :video_codec, :video_bitrate, :colorspace, :resolution, :dar
-      attr_writer :audio_channels, :audio_codec, :audio_bitrate, :audio_sample_rate
+      attr_writer :audio_codec, :audio_bitrate, :audio_sample_rate
       attr_writer :subtitle_codec, :subtitle_format
+
+      def audio_channels=(value)
+        if value.strip =~ /^(\d+)\.(\d+)$/
+          @audio_channels = [$1.to_i + $2.to_i, 6].min
+        else
+          @audio_channels = value
+        end
+      end
   end
 end

data/lib/apple_tv_converter/media_converter_adapter.rb

@@ -104,7 +104,7 @@ module AppleTvConverter
           audio_bitrate ||= media.ffmpeg_data.audio_bitrate || 448
 
           options[:extra] << " -af volume=2.000000" # Increase the volume when transcoding
-          options[:extra] << " -ac #{media.ffmpeg_data.audio_channels} -ar #{media.ffmpeg_data.audio_sample_rate}"
+          options[:extra] << " -ac #{media.ffmpeg_data.audio_channels || media.audio_streams.first.audio_channels} -ar #{media.ffmpeg_data.audio_sample_rate}"
           options[:extra] << " -ab #{[audio_bitrate, (media.ffmpeg_data.audio_bitrate || 1000000)].min}k"
         end
 

data/lib/apple_tv_converter/version.rb

@@ -1,3 +1,3 @@
 module AppleTvConverter
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apple-tv-converter
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec