video2gif 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4e0acee1fd59d611f97a41816906dbbb332ced3fbaaf90b0801e0736c2d00f9
-  data.tar.gz: dc29a597398d407ab48bacdbde2bbd281602583a68e0a04c9423029a0b1ab01c
+  metadata.gz: f906c9980bbe4a0dacb015c1a6b0a1af786d1f82b252ea8963d71ff46a53acc9
+  data.tar.gz: 6d948e892703ff81ecce6395074efc6486a97f7348c3378369c2712476d8fb35
 SHA512:
-  metadata.gz: b8e804320c36b811ca32f06a454484019d3e84d2b084aa90e7229d35e177a8d226126d02c2ea1d2b581c91a5a623fae6683865e543fe41f2c488d9bc159b0c44
-  data.tar.gz: 7f87f0e27e7f8931b7579d773c8f0e516506df02d0b992ac62e025a17fa482b066f4716404e230002fcabc9c7e41a7bd7b846777795cbe23462d6b1eaa055c1b
+  metadata.gz: f83e62d9f5ee2f592d1bf9e5ea6b5ea93bf1e5fea7ad004399f611312985ba540c63fd1ee9e29d7b3e74017140cb55630f4f66aa2c4833de091d231b40c2ebce
+  data.tar.gz: c36ffa22c9fa87c45f318210eff0603d02d4be084d29d0f141c8e49fcdcf9e2e20db73edfd76984da3434dafe923beb586b38ac8653ae47f2d04ca28814b7dae

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    video2gif (0.0.21)
+    video2gif (0.0.22)
 
 GEM
   remote: https://rubygems.org/

data/lib/video2gif/cli.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'json'
 require 'logger'
 require 'open3'
 require 'video2gif'
@@ -11,18 +12,45 @@ module Video2gif
       logger = Logger.new(STDOUT)
       options = Video2gif::Options.parse(ARGV)
 
+      if options[:subtitles]
+        lines = []
+
+        Open3.popen2e(*Video2gif::FFmpeg.ffprobe_command(options, logger)) do |stdin, stdout_stderr, thread|
+          stdin.close
+          stdout_stderr.each do |line|
+            logger.info(line.chomp) if options[:verbose] unless options[:quiet]
+            lines << line
+          end
+          stdout_stderr.close
+
+          unless thread.value.success?
+            # TODO: more info, output lines with errors?
+            raise "Process #{thread.pid} failed! Try again with --verbose to see error."
+          end
+        end
+
+        options[:probe_infos] = JSON.parse(lines.join, symbolize_names: true)
+
+      if options[:subtitles] && !options[:probe_infos][:streams].any? do |s|
+        s[:codec_type] == 'subtitle'
+      end
+          logger.warn('Could not find subtitles in the file, they will be omitted') unless options[:quiet]
+        end
+      end
+
       if options[:autocrop]
         Open3.popen2e(*Video2gif::FFmpeg.cropdetect_command(options, logger)) do |stdin, stdout_stderr, thread|
           stdin.close
           stdout_stderr.each do |line|
             logger.info(line.chomp) if options[:verbose] unless options[:quiet]
             if line.include?('Parsed_cropdetect')
-              options[:autocrop] = line.match('crop=([0-9]+\:[0-9]+\:[0-9]+\:[0-9]+)')
+              options[:autocrop] = line.match(Video2Gif::FFmpeg::CROP_REGEX)
             end
           end
           stdout_stderr.close
 
           unless thread.value.success?
+            # TODO: more info, output lines with errors?
             raise "Process #{thread.pid} failed! Try again with --verbose to see error."
           end
         end
@@ -36,6 +64,7 @@ module Video2gif
         stdout_stderr.close
 
         unless thread.value.success?
+          # TODO: more info, output lines with errors?
           raise "Process #{thread.pid} failed! Try again with --verbose to see error."
         end
       end

data/lib/video2gif/ffmpeg/subtitles.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+
+module Video2gif
+  module FFmpeg
+    module Subtitles
+      KNOWN_TEXT_FORMATS = %w[
+        ass
+        dvb_teletext
+        eia_608
+        hdmv_text_subtitle
+        jacosub
+        microdvd
+        mov_text
+        mpl2
+        pjs
+        realtext
+        sami
+        srt
+        ssa
+        stl
+        subrip
+        subviewer
+        subviewer1
+        text
+        ttml
+        vplayer
+        webvtt
+      ]
+
+      KNOWN_BITMAP_FORMATS = %w[
+        dvb_subtitle
+        dvd_subtitle
+        hdmv_pgs_subtitle
+        xsub
+      ]
+    end
+  end
+end
+

data/lib/video2gif/ffmpeg.rb

@@ -3,14 +3,30 @@
 
 module Video2gif
   module FFmpeg
+    CROP_REGEX = /crop=([0-9]+\:[0-9]+\:[0-9]+\:[0-9]+)/
+
     def self.filtergraph(options)
       filtergraph = []
 
-      # Subtitle overlay has to be first due to sync problems.
-      if options[:subtitles] && options[:subtitles].is_a?(TrueClass)
-        filtergraph << '[0:v][0:s:0]overlay=format=auto'
-      elsif options[:subtitles] && options[:subtitles].match(/\A\d+\z/)
-        filtergraph << "[0:v][0:s:#{options[:subtitles]}]overlay=format=auto"
+      if options[:subtitles] && options[:probe_infos][:streams].any? do |s|
+        s[:codec_type] == 'subtitle'
+      end
+        video_info = options[:probe_infos][:streams].find { |s| s[:codec_type] == 'video' }
+        subtitle_info = options[:probe_infos][:streams].find_all { |s| s[:codec_type] == 'subtitle' }[options[:subtitle_index]]
+
+        if Video2gif::FFmpeg::Subtitles::KNOWN_TEXT_FORMATS.include?(subtitle_info[:codec_name])
+          filtergraph << "setpts=PTS+#{Video2gif::Utils.duration_to_seconds(options[:seek])}/TB"
+          filtergraph << "subtitles='#{options[:input_filename]}':si=#{options[:subtitle_index]}"
+          filtergraph << 'setpts=PTS-STARTPTS'
+        elsif Video2gif::FFmpeg::Subtitles::KNOWN_BITMAP_FORMATS.include?(subtitle_info[:codec_name])
+          filtergraph << "[0:s:#{options[:subtitle_index]}]scale=" + %W[
+            flags=lanczos
+            sws_dither=none
+            width=#{video_info[:width]}
+            height=#{video_info[:height]}
+          ].join(':') + '[subs]' if options[:width]
+          filtergraph << "[0:v][subs]overlay=format=auto"
+        end
       end
 
       # Set 'fps' filter first, drop unneeded frames instead of
@@ -114,6 +130,18 @@ module Video2gif
       filtergraph << "[paletteuse][palette]paletteuse=dither=#{options[:dither] || 'floyd_steinberg'}:diff_mode=rectangle"
     end
 
+    def self.ffprobe_command(options, logger, executable: 'ffprobe')
+      command = [executable]
+      command << '-v' << 'error'
+      command << '-show_entries' << 'stream'
+      command << '-print_format' << 'json'
+      command << '-i' << options[:input_filename]
+
+      logger.info(command.join(' ')) if options[:verbose] unless options[:quiet]
+
+      command
+    end
+
     def self.ffmpeg_command(options, executable: 'ffmpeg')
       command = [executable]
       command << '-y'

data/lib/video2gif/options.rb

@@ -148,14 +148,27 @@ module Video2gif
           options[:tonemap] = t || 'hable'
         end
 
-        parser.on('--subtitles [SELECTION INDEX]',
-                  'Attempt to use the subtitles built into the video to',
-                  'overlay text on the resulting GIF. Takes an optional',
-                  'integer value to choose the subtitle stream. (Defaults',
-                  'to the first subtitle stream, 0) (ONLY WORKS WITH BITMAP',
-                  'SUBTITLES AT THIS TIME)') do |s|
-                    options[:subtitles] = s || true
-                  end
+        parser.on('--subtitles [INDEX]',
+                  '(Experimental, requires ffprobe) Attempt to use the',
+                  'subtitles built into the video to overlay text on the',
+                  'resulting GIF. Takes an optional integer value to',
+                  'choose the subtitle stream (defaults to the first',
+                  'subtitle stream, index 0)') do |s|
+          unless Video2gif::Utils.is_executable?('ffprobe')
+            puts 'ERROR: Requires FFmpeg utils to be installed (for ffprobe)!'
+            exit 1
+          end
+
+          options[:subtitles] = s || true
+          options[:subtitle_index] =  if options[:subtitles].is_a?(TrueClass)  # default to first stream
+                                        0
+                                      elsif options[:subtitles].match?(/\A\d+\z/)  # select stream by index
+                                        options[:subtitles].to_i
+                                      elsif options[:subtitles].is_a?(String)  # open subtitles file
+                                        puts 'ERROR: Selecting subtitles by filename is not yet supported!'
+                                        exit 1
+                                      end
+        end
 
         parser.separator ''
         parser.separator 'Text overlay options (only used if text is defined):'

data/lib/video2gif/utils.rb

@@ -10,5 +10,14 @@ module Video2gif
         end
       end.flatten.any?
     end
+
+    # Convert "[-][HH:]MM:SS[.m...]" to "[-]S+[.m...]".
+    # https://ffmpeg.org/ffmpeg-utils.html#time-duration-syntax
+    def self.duration_to_seconds(duration)
+      return duration unless duration.include?(?:)
+      m = duration.match(/(?<sign>-)?(?<hours>\d+:)?(?<minutes>\d+):(?<seconds>\d+)(?<millis>\.\d+)?/)
+      seconds = m[:hours].to_i * 60 * 60 + m[:minutes].to_i * 60 + m[:seconds].to_i
+      duration = "#{m[:sign]}#{seconds}#{m[:millis]}"
+    end
   end
 end

data/lib/video2gif/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Video2gif
-  VERSION = '0.0.21'
+  VERSION = '0.0.22'
 end

data/lib/video2gif.rb

@@ -4,6 +4,7 @@
 # them in
 require 'video2gif/cli'
 require 'video2gif/ffmpeg'
+require 'video2gif/ffmpeg/subtitles'
 require 'video2gif/options'
 require 'video2gif/utils'
 require 'video2gif/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: video2gif
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Emily St.
@@ -103,6 +103,7 @@ files:
 - lib/video2gif.rb
 - lib/video2gif/cli.rb
 - lib/video2gif/ffmpeg.rb
+- lib/video2gif/ffmpeg/subtitles.rb
 - lib/video2gif/options.rb
 - lib/video2gif/utils.rb
 - lib/video2gif/version.rb