video_converter 0.5.0 → 0.6.0

data/lib/video_converter/base.rb

@@ -16,14 +16,41 @@ module VideoConverter
     end
 
     def run
+      success = convert && faststart && make_screenshots && segment
+      clear if clear_tmp && success
+      success
+    end
+
+    def convert
       success = true
       inputs.each do |input|
         input.output_groups.each do |group|
           success &&= Ffmpeg.new(input, group).run
-          group.each do |output|
-            success &&= Faststart.new(output).run if output.faststart
-            success &&= VideoScreenshoter.new(output.thumbnails.merge(:input => output.ffmpeg_output, :output_dir => File.join(output.work_dir, 'thumbnails'))).run if output.thumbnails
-          end
+        end
+      end
+      success
+    end
+
+    def faststart
+      success = true
+      outputs.each do |output|
+        success &&= Faststart.new(output).run if output.faststart
+      end
+      success
+    end
+
+    def make_screenshots
+      success = true
+      outputs.each do |output|
+        success &&= VideoScreenshoter.new(output.thumbnails.merge(:input => output.ffmpeg_output, :output_dir => File.join(output.work_dir, 'thumbnails'))).run if output.thumbnails
+      end
+      success
+    end
+
+    def segment
+      success = true
+      inputs.each do |input|
+        input.output_groups.each do |group|
           if playlist = group.detect { |output| output.type == 'playlist' }
             success &&= if playlist.format == 'm3u8'
               LiveSegmenter.new(input, group).run
@@ -33,11 +60,20 @@ module VideoConverter
           end
         end
       end
-      clear if clear_tmp && success
-      success
     end
 
-    private
+    def split
+      Ffmpeg.new(inputs.first, outputs).split
+    end
+
+    def concat
+      list = File.join(outputs.first.work_dir, 'list.txt')
+      # NOTE ffmpeg concat list requires unescaped files
+      File.write(list, inputs.map { |input| "file '#{File.absolute_path(input.unescape)}'" }.join("\n"))
+      success = Ffmpeg.new(list, outputs).concat
+      FileUtils.rm list if success
+      success
+    end
 
     def clear
       `cat #{outputs.first.log} >> #{VideoConverter.log} && rm #{outputs.first.log}`

data/lib/video_converter/ffmpeg.rb

@@ -3,12 +3,13 @@
 module VideoConverter
   class Ffmpeg
     class << self
-      attr_accessor :bin, :ffprobe_bin, :options, :one_pass_command, :first_pass_command, :second_pass_command, :keyframes_command
+      attr_accessor :bin, :ffprobe_bin, :options, :one_pass_command, :first_pass_command, :second_pass_command, :keyframes_command, :split_command, :concat_command
     end
 
     self.bin = '/usr/local/bin/ffmpeg'
     self.ffprobe_bin = '/usr/local/bin/ffprobe'
     self.options = {
+      :codec => '-c',
       :video_codec => '-c:v',
       :audio_codec => '-c:a',
       :frame_rate => '-r',
@@ -24,12 +25,17 @@ module VideoConverter
       :format => '-f',
       :bitstream_format => '-bsf',
       :pixel_format => '-pix_fmt',
-      :deinterlace => '-deinterlace'
+      :deinterlace => '-deinterlace',
+      :map => '-map',
+      :segment_time => '-segment_time',
+      :reset_timestamps => '-reset_timestamps'
     }
     self.one_pass_command = '%{bin} -i %{input} -y %{options} %{output} 1>>%{log} 2>&1 || exit 1'
     self.first_pass_command = '%{bin} -i %{input} -y -pass 1 -an %{options} /dev/null 1>>%{log} 2>&1 || exit 1'
     self.second_pass_command = '%{bin} -i %{input} -y -pass 2 %{options} %{output} 1>>%{log} 2>&1 || exit 1'
     self.keyframes_command = '%{ffprobe_bin} -show_frames -select_streams v:0 -print_format csv %{input} | grep frame,video,1 | cut -d\',\' -f5 | tr "\n" "," | sed \'s/,$//\''
+    self.split_command = '%{bin} -fflags +genpts -i %{input} -segment_time %{segment_time} -reset_timestamps 1 -c copy -map 0 -f segment %{output} 1>>%{log} 2>&1 || exit 1'
+    self.concat_command = "%{bin} -f concat -i %{input} -c %{codec} %{output} 1>>%{log} 2>&1 || exit 1"
 
     attr_accessor :input, :group
 
@@ -77,6 +83,16 @@ module VideoConverter
       success
     end
 
+    def split
+      Command.new(self.class.split_command, prepare_params(input, group.first)).execute
+    end
+
+    def concat
+      output = group.first
+      output.codec ||= 'copy'
+      Command.new(self.class.concat_command, prepare_params(input, output)).execute
+    end
+
     private 
 
     def prepare_params input, output
@@ -91,6 +107,8 @@ module VideoConverter
         :input => input.to_s,
         :log => output.log,
         :output => output.ffmpeg_output,
+        :codec => output.codec,
+        :segment_time => output.segment_time,
         :options => self.class.options.map do |output_option, ffmpeg_option|
           if output.send(output_option).present?
             if output.send(output_option) == true

data/lib/video_converter/input.rb

@@ -60,6 +60,10 @@ module VideoConverter
       input
     end
 
+    def unescape
+      input.gsub(/\\+([^n])/, '\1')
+    end
+
     private
 
     def exists?

data/lib/video_converter/output.rb

@@ -17,9 +17,9 @@ module VideoConverter
 
     attr_accessor :uid, :work_dir, :log, :threads, :passlogfile
     attr_accessor :type, :filename
-    attr_accessor :format, :ffmpeg_output, :video_codec, :audio_codec, :bitstream_format, :pixel_format
+    attr_accessor :format, :ffmpeg_output, :codec, :video_codec, :audio_codec, :bitstream_format, :pixel_format, :map
     attr_accessor :one_pass, :video_bitrate, :audio_bitrate
-    attr_accessor :streams, :path, :chunks_dir
+    attr_accessor :streams, :path, :chunks_dir, :segment_time, :reset_timestamps
     attr_accessor :frame_rate, :keyint_min, :keyframe_interval, :force_keyframes
     attr_accessor :size, :width, :height, :video_filter
     attr_accessor :thumbnails
@@ -45,14 +45,16 @@ module VideoConverter
         self.format = 'mpegts'
         self.ffmpeg_output = File.join(work_dir, File.basename(filename, '.*') + '.ts')
       else
-        self.format = File.extname(filename).sub('.', '')
+        self.format = params[:format] || File.extname(filename).sub('.', '')
         self.ffmpeg_output = File.join(work_dir, filename)
         raise ArgumentError.new('Invalid playlist extension') if type == 'playlist' && !['f4m', 'm3u8'].include?(format)
       end
-      self.video_codec = params[:video_codec] || self.class.video_codec
-      self.audio_codec = params[:audio_codec] || self.class.audio_codec
+      self.codec = params[:codec]
+      self.video_codec = params[:video_codec] || self.class.video_codec unless codec
+      self.audio_codec = params[:audio_codec] || self.class.audio_codec unless codec
       self.bitstream_format = params[:bitstream_format]
       self.pixel_format = params[:pixel_format] || self.class.pixel_format
+      self.map = params[:map]
 
       # Rate controle
       self.one_pass = !!params[:one_pass]
@@ -66,6 +68,8 @@ module VideoConverter
         self.chunks_dir = File.join(work_dir, File.basename(filename, '.*'))
         FileUtils.mkdir_p(chunks_dir)
       end
+      self.segment_time = params[:segment_time]
+      self.reset_timestamps = params[:reset_timestamps]
 
       # Frame rate
       self.frame_rate = params[:frame_rate]

data/lib/video_converter/version.rb

@@ -1,3 +1,3 @@
 module VideoConverter
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/test/video_converter_test.rb

@@ -123,4 +123,34 @@ class VideoConverterTest < Test::Unit::TestCase
       end
     end
   end
+
+  context 'split' do
+    setup do
+      (@c = VideoConverter.new(
+        :input => "test/fixtures/test (1).mp4",
+        :output => { :segment_time => 2, :filename => '%01d.nut' }
+      )).split
+    end
+    should 'segment file' do
+      assert_equal %w(0.nut 1.nut 2.nut 3.nut converter.log), Dir.entries(@c.outputs.first.work_dir).delete_if { |e| %w(. ..).include?(e) }.sort
+    end
+  end
+
+  context 'concat' do
+    setup do
+      FileUtils.cp("test/fixtures/test (1).mp4", "test/fixtures/test (2).mp4")
+      (@c = VideoConverter.new(
+        :input => ["test/fixtures/test (1).mp4", "test/fixtures/test (2).mp4"],
+        :output => { :filename => 'concat.mp4' }
+      )).concat
+      FileUtils.rm("test/fixtures/test (2).mp4")
+    end
+    should 'concat inputs' do
+      assert File.exists?(@c.outputs.first.ffmpeg_output)
+      assert_equal(
+        VideoConverter.new(:input => "test/fixtures/test (1).mp4").inputs.first.metadata[:duration_in_ms]/1000*2,
+        VideoConverter.new(:input => @c.outputs.first.ffmpeg_output).inputs.first.metadata[:duration_in_ms]/1000
+      )
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: video_converter
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: video_screenshoter
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 948361468017971705
+      hash: 1551295134079710729
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 948361468017971705
+      hash: 1551295134079710729
 requirements:
 - ffmpeg, version 1.2 or greated configured with libx264 and libfaac
 - live_segmenter to convert to hls