video_converter 0.3.0 → 0.3.1

data/lib/video_converter/ffmpeg.rb

@@ -13,9 +13,9 @@ module VideoConverter
     
     self.one_pass_command = "%{bin} -i %{input} -y -acodec copy -vcodec %{video_codec} -g 100 -keyint_min 50 -b:v %{video_bitrate}k -bt %{video_bitrate}k %{vf} %{frame_rate} -progress %{progressfile} -f mp4 %{local_path} 1>%{log} 2>&1 || exit 1"
 
-    self.first_pass_command = "%{bin} -i %{input} -y -an -vcodec %{video_codec} -g %{keyframe_interval} -keyint_min 25 -pass 1 -passlogfile %{passlogfile} -progress %{progressfile} -b:v 3000k %{vf} %{frame_rate} -threads %{threads} -f mp4 /dev/null 1>>%{log} 2>&1 || exit 1"
+    self.first_pass_command = "%{bin} -i %{input} -y -an -vcodec %{video_codec} -g %{keyframe_interval} -keyint_min 25 -pass 1 -passlogfile %{passlogfile} -progress %{progressfile} -b:v 3000k %{vf} %{frame_rate} -threads %{threads} -pix_fmt yuv420p -f mp4 /dev/null 1>>%{log} 2>&1 || exit 1"
 
-    self.second_pass_command = "%{bin} -i %{input} -y -pass 2 -passlogfile %{passlogfile} -progress %{progressfile} -c:a %{audio_codec} -b:a %{audio_bitrate}k -c:v %{video_codec} -g %{keyframe_interval} -keyint_min 25 %{frame_rate} -b:v %{video_bitrate}k %{vf} -threads %{threads} -f mp4 %{local_path} 1>%{log} 2>&1 || exit 1"
+    self.second_pass_command = "%{bin} -i %{input} -y -pass 2 -passlogfile %{passlogfile} -progress %{progressfile} -c:a %{audio_codec} -b:a %{audio_bitrate}k -ac 2 -c:v %{video_codec} -g %{keyframe_interval} -keyint_min 25 %{frame_rate} -b:v %{video_bitrate}k %{vf} -threads %{threads} -pix_fmt yuv420p -f mp4 %{local_path} 1>%{log} 2>&1 || exit 1"
 
     attr_accessor :input_array, :output_array, :one_pass, :paral, :log, :process
 

data/lib/video_converter/hls.rb

@@ -24,7 +24,8 @@ module VideoConverter
       `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
-      chunks.each do |chunk|
+      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
@@ -36,6 +37,9 @@ module VideoConverter
           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
@@ -45,7 +49,10 @@ module VideoConverter
       end
       raise "Cannot download chunks from #{input}" unless File.exists?(concat_file) && File.size(concat_file) > 0
       puts "Convert #{concat_file}" if verbose
-      `#{ffmpeg_bin} -i #{concat_file} -vcodec copy -acodec copy -f mpegts pipe:1 2>>/dev/null | #{ffmpeg_bin} -y -i - -acodec copy -vcodec copy -absf aac_adtstoasc -f mp4 #{output} 1>>#{log} 2>&1`
+      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

data/lib/video_converter/input.rb

@@ -38,7 +38,7 @@ module VideoConverter
     def metadata
       metadata = {}
       s = `#{Command.new self.class.metadata_command, common_params}`.encode!('UTF-8', 'UTF-8', :invalid => :replace)
-      if (m = s.match(/Stream.*?Audio:\s*(\w+).*?(\d+)\s*Hz.*?(\d+)\s*kb\/s$/).to_a).any?
+      if (m = s.match(/Stream.*?Audio:\s*(\w+).*?(\d+)\s*Hz.*?(\d+)\s*kb\/s.*?$/).to_a).any?
         metadata[:audio_codec] = m[1]
         metadata[:audio_sample_rate] = m[2].to_i
         metadata[:audio_bitrate_in_kbps] = m[3].to_i

data/lib/video_converter/live_segmenter.rb

@@ -3,7 +3,7 @@
 module VideoConverter
   class LiveSegmenter
     class << self
-      attr_accessor :bin, :ffprobe_bin, :chunks_command, :chunk_prefix, :encoding_profile, :log, :paral
+      attr_accessor :bin, :ffprobe_bin, :chunks_command, :chunk_prefix, :encoding_profile, :log, :paral, :select_streams
     end
     
     self.bin = '/usr/local/bin/live_segmenter'
@@ -12,6 +12,7 @@ module VideoConverter
     self.encoding_profile = 's'
     self.log = '/dev/null'
     self.paral = true
+    self.select_streams = 'v'
 
     self.chunks_command = '%{ffmpeg_bin} -f mp4 -i %{local_path} -vcodec copy -acodec copy -f mpegts -bsf h264_mp4toannexb pipe:1 2>>/dev/null | %{bin} %{segment_seconds} %{chunks_dir} %{chunk_prefix} %{encoding_profile} 1>>%{log} 2>&1'
 
@@ -53,10 +54,20 @@ module VideoConverter
     def gen_quality_playlist output
       res = ''
       durations = []
-      Dir::glob(File.join(output.chunks_dir, "#{chunk_prefix}-*[0-9].ts")).sort { |c1, c2| File.basename(c1).match(/\d+/).to_s.to_i <=> File.basename(c2).match(/\d+/).to_s.to_i }.each do |chunk|
-        durations << (duration = chunk_duration chunk)
-        res += "#EXTINF:%0.2f,\n" % duration
-        res += File.join(File.basename(output.chunks_dir), File.basename(chunk)) + "\n"
+      # order desc
+      chunks = Dir::glob(File.join(output.chunks_dir, "#{chunk_prefix}-*[0-9].ts")).sort do |c1, c2| 
+        File.basename(c2).match(/\d+/).to_s.to_i <=> File.basename(c1).match(/\d+/).to_s.to_i
+      end
+      # chunk duration = (pts of first frame of the next chunk - pts of first frame of current chunk) / time_base
+      # for the last chunks the last two pts are used
+      prl_pts, l_pts = `#{self.class.ffprobe_bin} -show_frames -select_streams #{self.class.select_streams} -print_format csv -loglevel fatal #{chunks.first} | tail -n2 2>&1`.split("\n").map { |l| l.split(',')[3].to_i }
+      next_chunk_pts = 2 * l_pts - prl_pts
+      chunks.each do |chunk|
+        durations << (duration = (next_chunk_pts - (next_chunk_pts = 
+          `#{self.class.ffprobe_bin} -show_frames -select_streams #{self.class.select_streams} -print_format csv -loglevel fatal #{chunk} | head -n1 2>&1`.split(',')[3].to_i
+        )) / `#{self.class.ffprobe_bin} -show_streams -select_streams #{self.class.select_streams} -loglevel fatal #{chunk} 2>&1`.match(/\ntime_base=1\/(\d+)/)[1].to_f)
+        res = File.join(File.basename(output.chunks_dir), File.basename(chunk)) + "\n" + res
+        res = "#EXTINF:%0.2f,\n" % duration + res
       end
       res = "#EXTM3U\n#EXT-X-VERSION:3\n#EXT-X-TARGETDURATION:#{durations.max}\n#EXT-X-MEDIA-SEQUENCE:0\n" + res + "#EXT-X-ENDLIST"
       File.open(File.join(output.work_dir, output.filename), 'w') { |f| f.write res }
@@ -76,9 +87,5 @@ module VideoConverter
     def common_params
       { :ffmpeg_bin => Ffmpeg.bin, :bin => self.class.bin, :log => log, :chunk_prefix => chunk_prefix, :encoding_profile => encoding_profile }
     end
-
-    def chunk_duration chunk
-      s = `#{self.class.ffprobe_bin} #{chunk} 2>&1`.match(/Duration:.*(?:[0-9]{2}):(?:[0-9]{2}):([0-9]{2}(?:\.[0-9]{2})?)/).to_a[1].to_f
-    end
   end
 end

data/lib/video_converter/process.rb

@@ -11,7 +11,7 @@ module VideoConverter
     self.collect_progress_interval = 10
 
     def self.find uid
-      if Dir.exists?(File.join(process_dir, uid))
+      if Dir.exists?(File.join(process_dir, uid.to_s))
         new uid
       else
         nil
@@ -19,7 +19,7 @@ module VideoConverter
     end
 
     def initialize uid, output_array = nil
-      self.uid = uid
+      self.uid = uid.to_s
       self.process_dir = File.join(self.class.process_dir, uid)
 
       unless Dir.exists? process_dir

data/lib/video_converter/version.rb

@@ -1,3 +1,3 @@
 module VideoConverter
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: video_converter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: video_screenshoter
@@ -137,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -805925364969050678
+      hash: 3814024992440192523
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -805925364969050678
+      hash: 3814024992440192523
 requirements:
 - ffmpeg, version 1.2 or greated configured with libx264 and libfaac
 - live_segmenter to convert to hls