video_converter 0.6.5 → 0.6.6

data/lib/video_converter.rb

@@ -7,7 +7,6 @@ require "video_converter/command"
 require "video_converter/faststart"
 require "video_converter/ffmpeg"
 require "video_converter/hash"
-require "video_converter/hls"
 require "video_converter/input"
 require "video_converter/live_segmenter"
 require "video_converter/mp4frag"

data/lib/video_converter/ffmpeg.rb

@@ -156,10 +156,12 @@ module VideoConverter
       {
         :bin => bin,
         :input => input.to_s,
-        :options => output.options.map do |option, value|
-          if value && !output.respond_to?(option)
+        :options => output.options.map do |option, values|
+          unless output.respond_to?(option)
             option = '-' + (aliases[option] || option).to_s
-            value == true ? option : "#{option} #{value}"
+            Array.wrap(values).map do |value|
+              value == true ? option : "#{option} #{value}"
+            end.join(' ')
           end
         end.compact.join(' '),
         :output => output.ffmpeg_output,

data/lib/video_converter/version.rb

@@ -1,3 +1,3 @@
 module VideoConverter
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: video_converter
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: video_screenshoter
@@ -112,7 +112,6 @@ files:
 - lib/video_converter/faststart.rb
 - lib/video_converter/ffmpeg.rb
 - lib/video_converter/hash.rb
-- lib/video_converter/hls.rb
 - lib/video_converter/input.rb
 - lib/video_converter/live_segmenter.rb
 - lib/video_converter/mp4frag.rb
@@ -123,7 +122,6 @@ files:
 - test/fixtures/chunk1.ts
 - test/fixtures/test (1).mp4
 - test/fixtures/test_playlist.m3u8
-- test/hls_test.rb
 - test/test_helper.rb
 - test/video_converter_test.rb
 - video_converter.gemspec
@@ -142,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3277133630608671869
+      hash: -3100160635854991743
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3277133630608671869
+      hash: -3100160635854991743
 requirements:
 - ffmpeg, version 1.2 or greated configured with libx264 and libfaac
 - live_segmenter to convert to hls
@@ -165,6 +163,5 @@ test_files:
 - test/fixtures/chunk1.ts
 - test/fixtures/test (1).mp4
 - test/fixtures/test_playlist.m3u8
-- test/hls_test.rb
 - test/test_helper.rb
 - test/video_converter_test.rb

data/lib/video_converter/hls.rb

@@ -1,67 +0,0 @@
-# encoding: utf-8
-
-module VideoConverter
-  class Hls
-    attr_accessor :ffmpeg_bin, :input, :output, :chunks_dir, :replace_in_chunk, :log, :verbose
-
-    def initialize params
-      self.ffmpeg_bin = params[:ffmpeg_bin] || Ffmpeg.bin
-      %w(input output).each { |param| self.send("#{param}=", params[param.to_sym]) or raise "#{param} is needed" }
-      self.chunks_dir = if params[:chunks_dir]
-        params[:chunks_dir]
-      elsif !input.match(/^https?:\/\//)
-        File.dirname(input)
-      end
-      self.replace_in_chunk = params[:replace_in_chunk]
-      self.log = params[:log] || '/dev/null'
-      self.verbose = params[:verbose]
-    end
-
-    def concat
-      chunks = parse_playlist rescue []
-      raise "Empty or invalid playlist #{input}" if chunks.empty?
-      output_dir = File.dirname(output)
-      `mkdir -p #{output_dir}` unless Dir.exists?(output_dir)
-      concat_file = File.join(output_dir, 'concat.ts')
-      `rm #{concat_file}` if File.exists? concat_file
-      need_reconvert = false
-      chunks.each_with_index do |chunk, chunk_index|
-        local_chunk = if chunks_dir
-          File.join(chunks_dir, chunk)
-        elsif replace_in_chunk
-          chunk.sub(replace_in_chunk.first, replace_in_chunk.last)
-        end
-        if local_chunk && File.exists?(local_chunk)
-          message = "Copy #{local_chunk} to #{concat_file}"
-          puts message if verbose
-          yield message if block_given?
-          `cat #{local_chunk} >> #{concat_file}`
-        else
-          # NOTE because of troubles with timestamps
-          need_reconvert = true unless [0,chunks.count-1].include?(chunk_index)
-
-          chunk = File.join(File.dirname(input), chunk) unless chunk.match(/(^https?:\/\/)|(^\/)/)
-          message = "Download #{chunk} to #{concat_file}"
-          puts message if verbose
-          yield message if block_given?
-          `cd #{output_dir} && wget #{chunk} 1>>#{log} 2>&1 && cat #{File.basename(chunk)} >> #{concat_file} && rm #{File.basename(chunk)}` 
-        end
-      end
-      raise "Cannot download chunks from #{input}" unless File.exists?(concat_file) && File.size(concat_file) > 0
-      puts "Convert #{concat_file}" if verbose
-      cmd = "#{ffmpeg_bin} -i #{concat_file} -vcodec copy -acodec copy -f mpegts pipe:1 2>>/dev/null | #{ffmpeg_bin} -y -i - -acodec copy -vcodec #{need_reconvert ? 'libx264' : 'copy'} -absf aac_adtstoasc -f mp4 #{output} 1>>#{log} 2>&1"
-      puts cmd if verbose
-      yield cmd if block_given?
-      `#{cmd}`
-      `rm #{concat_file}`
-      output
-    end
-
-    private
-
-    def parse_playlist
-      require 'open-uri'
-      open(input) { |f| f.read }.scan(/EXTINF:[\d.]+.*?\n(.*?)\n/).flatten
-    end
-  end
-end

data/test/hls_test.rb

@@ -1,14 +0,0 @@
-require 'test_helper'
-
-class HlsTest < Test::Unit::TestCase
-	setup do
-		@concat = "tmp/test_concat.mp4"
-		VideoConverter::Hls.new({:input=>"test/fixtures/test_playlist.m3u8", :output=>@concat}).concat
-	end
-
-	should 'concat' do
-		metadata = VideoConverter.new(:input => @concat).inputs.first.metadata
-		assert metadata[:duration_in_ms] > 20_000
-		assert_equal 'mp4', metadata[:format]
-	end
-end