video_transcoding 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02c06ade0e781a2114c61c7023f8f1bd4b27ebf7183e4930ebb8b7d7b29f6b49
-  data.tar.gz: f40706b9d74e78dc5b8c089723961f9af8d6bbb349e68d879c4ae0cbf8719fc7
+  metadata.gz: eee67d682d1fca2bcf4fc34cf8fe9e3c5d907af8a92bfb31f5d260378992f14c
+  data.tar.gz: a4dbf00b048a9e123d519dffe6b2ffdd99a7d44019ce39f4c95be83e5e5156e0
 SHA512:
-  metadata.gz: 2710530ebbf264ed4fb257fd46ad04c1af06ee3aeab6ea3e6e65b00331f44403b6b15714c6afd6bd68fc00afd54a2aba43d87339c9ace176193a1f15738ca130
-  data.tar.gz: 7091576337ca4291da6cdc52e4eaffabd540304c1949bae43548e901c5e55f9761c1223bce6dd9cd7487864066b583b338ed438e1c4b9b2b03b35c257823893d
+  metadata.gz: 91d460a5108997257acbbfab99d4249a492928d2b449314ad18f82159206332bc48283866c7e1f079ac766faf63ef4d00f3a5f6b87e8cb059c8a44f454896076
+  data.tar.gz: 1b23cf95baea10e7fa91f3fd88602de7864a2c33716a180cc9fa04e32cc4a87a7ea1654c053cc48c06489785289f89bef407e539f8315185a8c5ca06aaafc59a

data/README.md

@@ -689,6 +689,15 @@ For a few problematic videos, I have to apply options like `--force-rate 23.976
 
 ## History
 
+### [0.21.0](https://github.com/donmelton/video_transcoding/releases/tag/0.21.0)
+
+Friday, November 9, 2018
+
+* Modify `transcode-video` to create "sparse" `.log` files by removing overwritten progress information, often making those files an order of magnitude (i.e. `10x`) smaller. Via [ #213](https://github.com/donmelton/video_transcoding/issues/213).
+* Replace code in `transcode-video` which used `mkvpropedit` or `mp4track` in a post-transcoding step to sanitize audio titles containing commas, with much simpler code leveraging a comma escaping mechanism only available in `HandBrakeCLI` version 1.0.0 or later.
+* Fix bug in `transcode-video` where the level was not set when using the `x264_10bit` encoder.
+* Remove support the non-existent `x265_16bit` encoder in `transcode-video`. This might have been available last year in some development builds of `HandBrakeCLI`, but it's definitely not in any release.
+
 ### [0.20.1](https://github.com/donmelton/video_transcoding/releases/tag/0.20.1)
 
 Sunday, October 21, 2018

data/bin/transcode-video

@@ -801,13 +801,12 @@ HERE
       handbrake_options['title'] = title.to_s unless title == 1
       encoder_options = {}
       prepare_video(media, handbrake_options, encoder_options)
-      renamed_audio = {}
-      prepare_audio(media, handbrake_options, renamed_audio)
+      prepare_audio(media, handbrake_options)
       prepare_subtitle(media, handbrake_options)
       prepare_srt(media, handbrake_options)
       prepare_options(handbrake_options, encoder_options)
       transcode(handbrake_options)
-      adjust_metadata(handbrake_options['output'], renamed_audio)
+      adjust_metadata(handbrake_options['output'])
 
       unless @dry_run
         seconds = Time.now.tv_sec - seconds
@@ -901,7 +900,18 @@ HERE
       end
 
       encoder = @handbrake_options.fetch('encoder', 'x264')
-      return unless encoder =~ /^x264(?:_10bit)?$/ or encoder =~ /^x265(?:_1[026]bit)?$/
+      return unless encoder =~ /^x264(?:_10bit)?$/ or encoder =~ /^x265(?:_1[02]bit)?$/
+
+      case encoder
+      when 'x264'
+        handbrake_options['encoder-profile'] = 'high'
+      when 'x264_10bit'
+        handbrake_options['encoder-profile'] = 'high10'
+      when 'x265'
+        handbrake_options['encoder-profile'] = 'main'
+      when 'x265_10bit', 'x265_12bit'
+        handbrake_options['encoder-profile'] = 'main10'
+      end
 
       if width > 1920 or height > 1080
         encoder_level = '5.1'
@@ -917,19 +927,8 @@ HERE
         bitrate = @target_bitrate_480p
       end
 
-      case encoder
-      when 'x264'
-        handbrake_options['encoder-profile'] = 'high'
-
-        if @handbrake_options.fetch('rate', '30').to_f <= 30.0
+      if encoder =~ /^x264(?:_10bit)?$/ and @handbrake_options.fetch('rate', '30').to_f <= 30.0
           handbrake_options['encoder-level'] = encoder_level
-        end
-      when 'x264_10bit'
-        handbrake_options['encoder-profile'] = 'high10'
-      when 'x265'
-        handbrake_options['encoder-profile'] = 'main'
-      when 'x265_10bit', 'x265_12bit', 'x265_16bit'
-        handbrake_options['encoder-profile'] = 'main10'
       end
 
       if @target_bitrate.nil?
@@ -955,7 +954,7 @@ HERE
         encoder_options['vbv-maxrate']  = ((bitrate * 1.5).to_i).to_s
         encoder_options['vbv-bufsize']  = ((bitrate * 2).to_i).to_s
         encoder_options['nal-hrd']      = 'vbr' if encoder =~ /^x264(?:_10bit)?$/
-        encoder_options['hrd']          = '1'   if encoder =~ /^x265(?:_1[026]bit)?$/
+        encoder_options['hrd']          = '1'   if encoder =~ /^x265(?:_1[02]bit)?$/
       else
         handbrake_options['quality']    = '1'
         encoder_options['vbv-maxrate']  = bitrate.to_s
@@ -1011,7 +1010,7 @@ HERE
       end
     end
 
-    def prepare_audio(media, handbrake_options, renamed_audio)
+    def prepare_audio(media, handbrake_options)
       return if @handbrake_options.fetch('audio', '') == 'none' or media.info[:audio].empty?
       main_track = resolve_main_audio(media)
       @audio_width[main_track] ||= @audio_width[:main]
@@ -1077,14 +1076,7 @@ HERE
           name = ''
         end
 
-        name = @audio_name.fetch(track, name)
-
-        if name =~ /,/
-          sanitized_name = name.gsub(/,/, '_')
-          renamed_audio[sanitized_name] = name
-          name = sanitized_name
-        end
-
+        name = @audio_name.fetch(track, name).gsub(/,/, '","')
         names << name
 
         case @audio_width.fetch(track, @audio_width[:other])
@@ -1266,7 +1258,8 @@ HERE
       end
 
       Console.debug handbrake_command.inspect
-      log_file = @log ? File.new(handbrake_options['output'] + '.log', 'wb') : nil
+      log_file_path = handbrake_options['output'] + '.log'
+      log_file = @log ? File.new(log_file_path, 'wb') : nil
       Console.info 'Transcoding with HandBrakeCLI...'
 
       begin
@@ -1286,9 +1279,27 @@ HERE
 
       log_file.close unless log_file.nil?
       fail "transcoding failed: #{handbrake_options['input']}" unless $CHILD_STATUS.exitstatus == 0
+
+      unless log_file.nil?
+        timestamp = File.mtime(log_file_path)
+        content = ''
+
+        begin
+          File.foreach(log_file_path) do |line|
+            content += line
+          end
+        rescue SystemCallError => e
+          raise "reading failed: #{e}"
+        end
+
+        log_file = File.new(log_file_path, 'wb')
+        log_file.print content.gsub(/^.*\r(.)/, '\1')
+        log_file.close
+        FileUtils.touch log_file_path, :mtime => timestamp
+      end
     end
 
-    def adjust_metadata(output, renamed_audio)
+    def adjust_metadata(output)
       return if @dry_run
       media = Media.new(path: output, allow_directory: false)
       Console.debug media.info.inspect
@@ -1316,56 +1327,6 @@ HERE
 
         fail "forcing subtitle: #{output}" if $CHILD_STATUS.exitstatus == 2
       end
-
-      return if renamed_audio.empty?
-
-      media.info[:audio].each do |track, info|
-        original_name = renamed_audio[info[:name]]
-
-        unless original_name.nil?
-          if media.info[:mkv]
-            Console.info 'Renaming audio with mkvpropedit...'
-
-            begin
-              IO.popen([
-                MKVpropedit.command_name,
-                '--edit', "track:a#{track}",
-                '--set', "name=#{original_name}",
-                output,
-              ], 'rb', :err=>[:child, :out]) do |io|
-                io.each do |line|
-                  Console.debug line
-                end
-              end
-            rescue SystemCallError => e
-              raise "renaming audio failed: #{e}"
-            end
-
-            fail "renaming audio: #{output}" if $CHILD_STATUS.exitstatus == 2
-          elsif media.info[:mp4]
-            Console.info 'Renaming audio with mp4track...'
-
-            ['hdlrname', 'udtaname'].each do |property|
-              begin
-                IO.popen([
-                  MP4track.command_name,
-                  '--track-index', track.to_s,
-                  "--#{property}", original_name,
-                  output,
-                ], 'rb', :err=>[:child, :out]) do |io|
-                  io.each do |line|
-                    Console.debug line
-                  end
-                end
-              rescue SystemCallError => e
-                raise "renaming audio failed: #{e}"
-              end
-
-              fail "renaming audio: #{output}" unless $CHILD_STATUS.exitstatus == 0
-            end
-          end
-        end
-      end
     end
 
     def terminate

data/lib/video_transcoding/version.rb

@@ -5,5 +5,5 @@
 #
 
 module VideoTranscoding
-  VERSION = '0.20.1'
+  VERSION = '0.21.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: video_transcoding
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Don Melton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-21 00:00:00.000000000 Z
+date: 2018-11-09 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Video Transcoding is a package of tools to transcode, inspect
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Tools to transcode, inspect and convert videos.