dvdvrconv 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c05c88e2cd69df800f143dc2a9754a4f9b04ee5c64756fff8ed09faad6e2fc4f
-  data.tar.gz: d189810613ef0a7ff5b7e243fd0a10d258bce0486a82f81d83a68f2661ea777d
+  metadata.gz: caab8f34b81f4361edbdb9cb50ef5215f3809efc46de355af8dda0aa0b58538a
+  data.tar.gz: 781cd817f0f4e0852d555b3fc368e08bb008ccf89ccb379b6db2654fa37127e4
 SHA512:
-  metadata.gz: b2e0fb30eb6087997fc6faaf09c4ef6e5b7917cddbe4a9ea926adcf8d6c58b68029243bca095a3929cb56eb95cb98585b35eb9222693e3368e5e333e0c37e7fe
-  data.tar.gz: c0a664e7eb8a6689f6030a10a46de495c8da114c50beabbab085d3fa7d08d980048a11fe3d81410151e3fff91eff460a27d097b4cb64d0ad4bfb2a7c612addfb
+  metadata.gz: 8681b1d376df42b185f0b7c550cbada833ca920fa62e380290fdc74522f5fd2b9c6154b9f5a7ab0cea2126381eb4f8cad41378fec72606a3894142b82b0037e3
+  data.tar.gz: efacfa73e7ccc4c7a80d365165dee9ac6882a410a2987dca79482f0deb202d447ab8f713b122d45e7b843abb55e1e16e5c04cfaa4e47fd113240de3248a28d6b

data/README.md

@@ -92,6 +92,9 @@ dvdvrconv reads `default_dvdvrconv.yml` in the current working directory as dvdv
 *  use_customize_title
 *  base_dst_name
 *  number_list
+*  hardware_encode
+*  global_quality
+*  h264_crf
 
 ## vr_mangr_ifo, vr_movie_vro
 
@@ -175,7 +178,37 @@ In this case, "concat_mode" can be disabled.
 concat_mode: false
 ```
 
+## hardware_encode
 
+FFmpeg encode option. You can select the encoding mode from 'normal' or 'qsv'.
+
+if you want to use a software encoder (default)
+```
+hardware_encode: 'normal'
+```
+
+If you want to use a hardware encoder(intel QSV LA_ICQ)
+```
+hardware_encode: 'qsv'
+```
+
+## global_quality
+
+FFmpeg hardware encode(QSV) option:
+
+if you want to set Global Quality (default 25)
+```
+global_quality: 28
+```
+
+## h264_crf
+
+FFmpeg software encode option:
+
+if you want to set h264 Constant Rate Factor (default 25)
+```
+h264_crf: 28
+```
 
 
 # Install dependent libraries for WSL(ubuntu)
@@ -285,6 +318,7 @@ After compile success, you will get the following files.
 *  [FFmpeg](https://www.ffmpeg.org/download.html)
 From the Windows EXE Files link above, select the following website.
 *  [Releases · BtbN/FFmpeg-Builds](https://github.com/BtbN/FFmpeg-Builds/releases) (daily auto-build).
+*  [Releases · GyanD/codexffmpeg](https://github.com/GyanD/codexffmpeg/releases)
 
 As an example, download Auto-Build 2021-09-28 12:22.
 *  [ffmpeg-N-103899-g855014ff83-win64-gpl.zip 100MB](https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2021-09-28-12-22/ffmpeg-N-103899-g855014ff83-win64-gpl.zip)

data/lib/dvdvrconv/command.rb

@@ -68,6 +68,12 @@ module Dvdvrconv
         dvd.vrdisc.global_quality = @options[:global_quality]
       end
 
+      if @options[:h264_crf].nil?
+        dvd.vrdisc.h264_crf = Dvdvrconv::DEFAULT_H264_CRF
+      else
+        dvd.vrdisc.h264_crf = @options[:h264_crf]
+      end
+
       # View the path of each files
       puts '== Use these paths =='
       puts "  => VR_MANGR.IFO:        #{dvd.vrdisc.opts_ifo}"
@@ -80,6 +86,7 @@ module Dvdvrconv
       puts "  => concat_mode:         #{@options[:concat_mode]}"
       puts "  => hardware_encode:     #{@options[:hardware_encode]}"
       puts "  => global_quality:      #{@options[:global_quality]}"
+      puts "  => h264_crf:            #{@options[:h264_crf]}"
 
       dvd.read_info
 
@@ -195,6 +202,12 @@ module Dvdvrconv
       else
         @options[:global_quality] = config['global_quality']
       end
+
+      if config['h264_crf'].nil?
+        @options[:h264_crf] = Dvdvrconv::DEFAULT_H264_CRF
+      else
+        @options[:h264_crf] = config['h264_crf']
+      end
     end
 
     def dvdpath

data/lib/dvdvrconv/dvdvr.rb

@@ -20,7 +20,8 @@ module Dvdvrconv
     :default_cmd,       # @param [String]
     :concat_mode,       # @param [Boolean]
     :hardware_encode,   # @param [String]
-    :global_quality     # @param [Integer]
+    :global_quality,    # @param [Integer]
+    :h264_crf,          # @param [Integer]
   )
 
   BASE_NAME = 'DVD'
@@ -28,6 +29,8 @@ module Dvdvrconv
   DEFAULT_CONCAT_MODE = true
   DEFAULT_HARDWARE_ENCODE = 'normal'
   DEFAULT_GLOBAL_QUALITY = 25
+  DEFAULT_H264_CRF = 25
+
 
   # Default DVD drive is "d".
   # If you want to use a different drive, you need to set up a "default_dvdvrconv.yml" file.
@@ -60,50 +63,39 @@ module Dvdvrconv
       @vrdisc.concat_mode = Dvdvrconv::DEFAULT_CONCAT_MODE
       @vrdisc.hardware_encode = Dvdvrconv::DEFAULT_HARDWARE_ENCODE
       @vrdisc.global_quality = Dvdvrconv::DEFAULT_GLOBAL_QUALITY
+      @vrdisc.h264_crf = Dvdvrconv::DEFAULT_H264_CRF
     end
 
     # Read VRO file from dvd-ram disc in dvd-vr format, and output vob files.
     def str_dvdvr_cmd
-      %(#{@vrdisc.cmd} --name=#{Dvdvrconv::BASE_NAME} #{@vrdisc.opts_ifo} #{@vrdisc.opts_vro})
+      Shellwords.shellsplit(%("#{@vrdisc.cmd}" --name="#{Dvdvrconv::BASE_NAME}" "#{@vrdisc.opts_ifo}" "#{@vrdisc.opts_vro}"))
     end
 
     # Make a concatenation command string for FFmpeg.
     def str_concat_cmd(file_name, base_name)
-      %(ffmpeg -f concat -safe 0 -i #{file_name} -c copy #{base_name}.vob)
+      Shellwords.shellsplit(%(ffmpeg -f concat -safe 0 -i "#{file_name}" -c copy "#{base_name}.vob"))
     end
 
     # File convert command, vob to mp4 for FFmpeg.
     # * Change the aspect ratio to 16:9.
     # * Delete a closed caption.
+    # * Use deinterlace (bwdif)
+    # * Use Constant Rate Factor mode insted of CBR mode
+    # * Use analyze and probe option
     def ffmeg_normal_cmd(file_name)
-      cmd = 'ffmpeg '
-      cmd += "-i #{file_name}.vob "
-      cmd += '-filter:v "crop=704:474:0:0" '
-      cmd += '-vcodec libx264 '
-      cmd += '-b:v 500k '
-      cmd += '-aspect 16:9 '
-      cmd += '-acodec copy '
-      cmd += '-bsf:v "filter_units=remove_types=6" '
-      cmd + "#{file_name}.mp4"
+      Shellwords.shellsplit(%(ffmpeg -analyzeduration 2000M -probesize 2G -i "#{file_name}.vob" -vf "bwdif=0:-1:0,crop=704:474:0:0,scale=704:480,setdar=16/9" -c:v libx264 -crf "#{@vrdisc.h264_crf}" -preset medium -bsf:v "filter_units=remove_types=6" -map 0:v:0 -map 0:a:0 -c:a copy "#{file_name}.mp4"))
     end
 
     # File convert command, vob to mp4 for FFmpeg.
     # * FFmpeg with QSV(Intel Quick Sync Video)
     # * Change the aspect ratio to 16:9.
     # * Delete a closed caption.
+    # * Support for FFmpeg 8
+    # * Software decode, cropp and deinterlace + h264 qsv(LA_ICQ) encode
+    # * Use ICQ Look_ahead mode
+    # * Use analyze and probe option
     def ffmpeg_qsv_cmd(file_name)
-      cmd = 'ffmpeg '
-      cmd += '-hwaccel qsv '
-      cmd += '-hwaccel_output_format qsv '
-      cmd += "-i #{file_name}.vob "
-      cmd += '-filter:v "crop=704:474:0:0" '
-      cmd += '-c:v h264_qsv '
-      cmd += "-global_quality #{@vrdisc.global_quality} "
-      cmd += '-look_ahead 1 '
-      cmd += '-aspect 16:9 '
-      cmd += '-acodec copy '
-      cmd += '-bsf:v "filter_units=remove_types=6" '
-      cmd + "#{file_name}.mp4"
+      Shellwords.shellsplit(%(ffmpeg -analyzeduration 2000M -probesize 2G -i "#{file_name}.vob" -vf "bwdif=0:-1:0,crop=704:474:0:0,scale=704:480,setdar=16/9" -c:v h264_qsv -global_quality "#{@vrdisc.global_quality}" -look_ahead 1 -look_ahead_depth 30 -aspect 16:9 -bsf:v "filter_units=remove_types=6" -map 0:v:0 -map 0:a:0 -c:a copy "#{file_name}.mp4"))
     end
 
     # File convert command, vob to mp4 for FFmpeg.
@@ -205,8 +197,8 @@ module Dvdvrconv
     def vro2vob
       cmd = str_dvdvr_cmd
       puts '----- convert file VRO to VOB -----'
-      puts "> cmd:\n  #{cmd}"
-      system(cmd)
+      puts "> cmd:\n  #{cmd.join(' ')}"
+      system(*cmd)
       puts ''
     end
 
@@ -329,7 +321,10 @@ module Dvdvrconv
         file_name = "concat_#{base_name}.txt"
 
         names = @vrdisc.output_title.select { |x| x.match(/#{base_name}_\d\d/) }
-        names.each { |line| contents += "file '#{line}.vob'\n" }
+        names.each do |line|
+          escaped_line = "#{line}.vob".gsub("'") {"'\\''"}
+          contents += "file '#{escaped_line}'\n"
+        end
         concat_list << [file_name, contents, base_name]
       end
 
@@ -359,8 +354,8 @@ module Dvdvrconv
 
         cmd = str_concat_cmd(file_name, base_name)
         puts '----- concat vob files -----'
-        puts "run cmd:\n  #{cmd}"
-        system(cmd)
+        puts "run cmd:\n  #{cmd.join(' ')}"
+        system(*cmd)
 
         begin
           File.delete(file_name)
@@ -372,7 +367,7 @@ module Dvdvrconv
 
     def vrdisc_status
       puts "\n< < < < < @vrdisc status > > > > >"
-      %w[num title output_title duplicate_name vob_titles concat_mode hardware_encode global_quality].each do |item|
+      %w[num title output_title duplicate_name vob_titles concat_mode hardware_encode global_quality h264_crf].each do |item|
         puts "#{item}=> #{@vrdisc[item]}"
       end
       puts "< < < < < @vrdisc status > > > > >\n"
@@ -396,8 +391,8 @@ module Dvdvrconv
         else
           cmd = str_convert_cmd(file_name)
           puts "----- convert #{file_name}.vob to mp4 file -----"
-          puts "run cmd:\n  #{cmd}"
-          system(cmd)
+          puts "run cmd:\n  #{cmd.join(' ')}"
+          system(*cmd)
         end
       end
     end

data/lib/dvdvrconv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dvdvrconv
-  VERSION = '1.3.1'
+  VERSION = '1.3.3'
 end

data/lib/dvdvrconv.rb

@@ -3,6 +3,7 @@
 require 'open3'
 require 'optparse'
 require 'yaml'
+require 'shellwords'
 
 require_relative 'dvdvrconv/command'
 require_relative 'dvdvrconv/options'

data/sample_default_dvdvrconv.yml

@@ -47,3 +47,38 @@ base_dst_name:
   - title_three
 
 number_list: []
+
+
+##################################################
+# 
+# FFmpeg encode option
+#
+# You can select the encoding mode from 'normal' or 'qsv'.
+#
+# if you want to use a software encoder (default)
+#   
+#   hardware_encode: 'normal'
+# 
+# 
+# If you want to use a hardware encoder(intel QSV LA_ICQ)
+# 
+#   hardware_encode: 'qsv'
+# 
+#
+##################################################
+# 
+# software encode option
+# 
+# if you want to set h264 Constant Rate Factor (default 25)
+# 
+#   h264_crf: 28
+# 
+# 
+# hardware encode option
+#
+# if you want to set Global Quality (default 25)
+# 
+#   global_quality: 28
+# 
+# 
+##################################################

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dvdvrconv
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
 platform: ruby
 authors:
 - icm7216
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 4.0.15
 specification_version: 4
 summary: DVD-VR utility
 test_files: []