lib/mkv2m4v/transcoder.rb in mkv2m4v-0.3.0 vs lib/mkv2m4v/transcoder.rb in mkv2m4v-0.3.1
- old
+ new
@@ -30,11 +30,11 @@
puts "==> Extracting #{video_id}:video.#{video_ext} #{audio_id}:audio.#{audio_ext} ".magenta
command = "mkvextract tracks"
command << " #{escape(@file.filename)}"
command << " #{video_id}:#{escape(video_file)}"
command << " #{audio_id}:#{escape(audio_file)}"
- system command
+ sh command
end
def transcode_avc
if video_format == "AVC"
puts "==> Assuming pass through for h.264 video track".yellow.on_black
@@ -50,11 +50,11 @@
puts "==> Transcoding #{audio_format} to Stereo AAC audio track".magenta
command = "ffmpeg"
command << " -i #{escape(audio_file)}"
command << " -acodec libfaac -ac 2 -ab 160k"
command << " #{escape(audio_basename)}.aac"
- system command
+ sh command
end
end
def transcode_ac3
if audio_format == "AC-3"
@@ -66,11 +66,11 @@
puts "==> Transcoding #{audio_format} to Surround AC-3 audio track".magenta
command = "ffmpeg"
command << " -i #{escape(audio_file)}"
command << " -acodec ac3 -ac #{max_audio_channels} -ab #{max_audio_bit_rate}k"
command << " #{escape(audio_basename)}.ac3"
- system command
+ sh command
end
end
def remux
puts "==> Remuxing everything into an M4V container".magenta
@@ -79,12 +79,11 @@
command << " -add #{escape(audio_basename)}.aac:lang=#{audio_language.alpha3_terminology}:group=1:delay=84:name=\"Stereo\""
unless @skip_ac3
command << " -add #{escape(audio_basename)}.ac3:lang=#{audio_language.alpha3_terminology}:group=1:delay=84:disable:name=\"AC3\" "
end
command << " -new #{escape(m4v_file)}"
- puts command
- system command
+ sh command
end
def cleanup
FileUtils.rm_rf tmp_dir
end
@@ -161,9 +160,14 @@
::File.join(dir, ::File.basename(@file.name, ".*") + ".m4v")
end
def escape(str)
Shellwords.escape(str)
+ end
+
+ def sh(command)
+ puts command
+ system command
end
UnknownLanguage = Iso639::Language.new("", "", "", "", "")
end
end