rff 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 246923c57cdd775302fc981bf79ed642effccf5f
-  data.tar.gz: a77efae571f4648bee009534e10f608d094d65a9
+  metadata.gz: d7f531623ad10e04e6d56a0239288a07c29496a0
+  data.tar.gz: d1ac919f17abb2c66c8852f3f6ab633112ed08b0
 SHA512:
-  metadata.gz: 3ffbd9f2fb140174e8c2e927b7fa4d5dd4ee4bf1529bbb51573be045d22ea2a95fef8e8b966e70c9b4ca2ab9f793ccabaff172cc1fadc026033498094f9d000d
-  data.tar.gz: 967e748b929e7c7121fa020b48065cf70426ed4944cbb5abd39eafee810ff18e4df3ad9ca59e4a728fc661d0a39d6256189df7a93e057b3e59b462ef19fccd2f
+  metadata.gz: 99470bb909ffbd3c8a6bb458bf04dc1d8af395e6824ff59bd54010b10d80bef347fdf63d42afffd028d842ef63761a71c16265579b969a898d536048cde21f52
+  data.tar.gz: 1966c047232f8f3940aba4a3533ebfaeb2fc9279d610eebceba3ffa6eb31827b7db7763c257fbdcb4a1a77a64d487e181dbd2e22c27e15ca17be721f208f31a7

data/lib/audio_handler.rb

@@ -15,9 +15,10 @@ module RFF
     # * <i>output_path</i> - a path to place the output file in. Defaults to nil, which means that the input' s directory path is used
     # * <i>custom_args</i> - passes custom arguments to FFmpeg. Defaults to nil, which means no custom arguments are given
     # * <i>recommended_audio_quality</i> - determines if recommended by FFmpeg community audio quality settings should be used. Defaults to true, which means audio conversion with good, recommended quality. Set to false if you are giving additional arguments that determine this quality.
+    # * <i>disable_subtitles_decoding</i> - in some formats subtitle decoding causes problems. This option disables this feature. Defaults to true to bypass problems by default.
     # All of the arguments are passed on to underlying Processor instances. This method also determines input type, initializes processing percentage and creates needed Processor instances.
     
-    def initialize input, output_path=nil, custom_args=nil, recommended_audio_quality=true
+    def initialize input, output_path=nil, custom_args=nil, recommended_audio_quality=true, disable_subtitles_decoding=true
       @input = input
       @input_type = File.basename(@input).split(".")[1]
       @output_path = output_path
@@ -29,7 +30,7 @@ module RFF
         types.delete(@input_type.to_sym)
       end
       types.each do |type|
-        @processors << RFF::Processor.new(@input, type, @output_path, nil, @custom_args, recommended_audio_quality)
+        @processors << RFF::Processor.new(@input, type, @output_path, nil, @custom_args, recommended_audio_quality, disable_subtitles_decoding)
       end
     end
     

data/lib/processor.rb

@@ -15,9 +15,10 @@ module RFF
     # * _quality_ - only affects video conversion. Sets the video conversion quality. Defaults to 5000k, which is tested value for good video conversion quality
     # * <i>custom_args</i> - passes custom arguments to FFmpeg. Defaults to nil, which means no custom arguments are given
     # * <i>recommended_audio_quality</i> - determines if recommended by FFmpeg community audio quality settings should be used. Defaults to true, which means audio conversion with good, recommended quality. Set to false if you are giving additional arguments that determine this quality.
+    # * <i>disable_subtitles_decoding</i> - in some formats subtitle decoding causes problems. This option disables this feature. Defaults to true to bypass problems by default.
     # This method also validates arguments, determines full output name, generates appropriate FFmpeg command, determines conversion type and initializes status (it is :pending at this point).
     
-    def initialize input, output_type, output_path=nil, quality="5000k", custom_args=nil, recommended_audio_quality=true
+    def initialize input, output_type, output_path=nil, quality="5000k", custom_args=nil, recommended_audio_quality=true, disable_subtitles_decoding=true
       if input.nil? || input.empty? || output_type.nil?
         raise RFF::ArgumentError.new("Input and output type can not be empty nor nil!")
       end
@@ -31,10 +32,10 @@ module RFF
       @quality = quality
       @custom_args = custom_args
       if [:mp3, :ogg, :wav].include?(@output_type)
-        @command = "ffmpeg -y -i #{@input} -acodec #{@output_type == :mp3 ? "libmp3lame" : (@output_type == :ogg ? "libvorbis" : "pcm_s16le")}#{recommended_audio_quality ? (@output_type == :mp3 ? " -aq 2" : (@output_type == :ogg ? " -aq 4" : "")) : ""}#{@custom_args.nil? ? "" : " #{@custom_args}"} #{@output_path}/#{@output_name}.#{@output_type.to_s}"
+        @command = "ffmpeg -y -i " + '"' + "#{@input}" + '"' + " -acodec #{@output_type == :mp3 ? "libmp3lame" : (@output_type == :ogg ? "libvorbis" : "pcm_s16le")}#{recommended_audio_quality ? (@output_type == :mp3 ? " -aq 2" : (@output_type == :ogg ? " -aq 4" : "")) : ""}#{disable_subtitles_decoding ? " -sn" : ""}#{@custom_args.nil? ? "" : " #{@custom_args}"} " + '"' + "#{@output_path}/#{@output_name}.#{@output_type.to_s}" + '"'
         @conversion_type = :audio
       else
-        @command = "ffmpeg -y -i #{@input} -acodec #{(@output_type == :webm || @output_type == :ogv) ? "libvorbis" : "aac"} -vcodec #{@output_type == :webm ? "libvpx" : (@output_type == :ogv ? "libtheora" : "mpeg4")}#{@output_type == :mp4 ? " -strict -2" : ""}#{(!@quality.nil? && !@quality.empty?) ? " -b:v #{@quality}" : ""}#{recommended_audio_quality ? (@output_type == :webm || @output_type == :ogv ? " -aq 4" : " -b:a 240k") : ""}#{@custom_args.nil? ? "" : " #{@custom_args}"} #{@output_path}/#{@output_name}.#{@output_type.to_s}"
+        @command = "ffmpeg -y -i " + '"' + "#{@input}" + '"' + " -acodec #{(@output_type == :webm || @output_type == :ogv) ? "libvorbis" : "aac"} -vcodec #{@output_type == :webm ? "libvpx" : (@output_type == :ogv ? "libtheora" : "mpeg4")}#{@output_type == :mp4 ? " -strict -2" : ""}#{(!@quality.nil? && !@quality.empty?) ? " -b:v #{@quality}" : ""}#{recommended_audio_quality ? (@output_type == :webm || @output_type == :ogv ? " -aq 4" : " -b:a 240k") : ""}#{disable_subtitles_decoding ? " -sn" : ""}#{@custom_args.nil? ? "" : " #{@custom_args}"} " + '"' + "#{@output_path}/#{@output_name}.#{@output_type.to_s}" + '"'
         @conversion_type = :video
       end
       @status = :pending

data/lib/video_handler.rb

@@ -12,9 +12,10 @@ module RFF
     # * _quality_ - only affects video conversion. Sets the video conversion quality. Defaults to 5000k, which is tested value for good video conversion quality
     # * <i>custom_args</i> - passes custom arguments to FFmpeg. Defaults to nil, which means no custom arguments are given
     # * <i>recommended_audio_quality</i> - determines if recommended by FFmpeg community audio quality settings should be used. Defaults to true, which means audio conversion with good, recommended quality. Set to false if you are giving additional arguments that determine this quality.
+    # * <i>disable_subtitles_decoding</i> - in some formats subtitle decoding causes problems. This option disables this feature. Defaults to true to bypass problems by default.
     # All of the arguments are passed on to underlying Processor instances. This method also determines input type, initializes processing percentage and creates needed Processor instances.
     
-    def initialize input, output_path=nil, quality="5000k", custom_args=nil, recommended_audio_quality=true
+    def initialize input, output_path=nil, quality="5000k", custom_args=nil, recommended_audio_quality=true, disable_subtitles_decoding=true
       @input = input
       @input_type = File.basename(@input).split(".")[1]
       @output_path = output_path
@@ -27,7 +28,7 @@ module RFF
         types.delete(@input_type.to_sym)
       end
       types.each do |type|
-        @processors << RFF::Processor.new(@input, type, @output_path, @quality, @custom_args, recommended_audio_quality)
+        @processors << RFF::Processor.new(@input, type, @output_path, @quality, @custom_args, recommended_audio_quality, disable_subtitles_decoding)
       end
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rff
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - Phitherek_