X-Git-Url: http://git.pippins.net/embedvideo/.git/%27%20%20%20%20.%20%24GLOBALS%5B%27phpgw%27%5D-%3Elink%28%27inc/jquery/jquery.tablesorter.css%27%29.%27?a=blobdiff_plain;f=make_mkv;h=805a7f5d9300de309c0e5a60e6a329a7e439816a;hb=c99a50a0fd63d9bb9eb0fa9d1232366e9e2d444f;hp=c5d1756f8ed57f40101ad09c71f21225659b9c42;hpb=9990cf64d87333417ab72d6e106fa53df6ad2943;p=videoscripts%2F.git
diff --git a/make_mkv b/make_mkv
index c5d1756..805a7f5 100755
--- a/make_mkv
+++ b/make_mkv
@@ -5,6 +5,7 @@
# Pre-requisites:
# mkvtoolnix - http://www.bunkus.org/videotools/mkvtoolnix/
# ffmpeg
+# avconv
####################################################################################################
# Includes
@@ -26,11 +27,13 @@ if( -f "$mydir/organize_videos.conf.local") { require "organize_videos.conf.loca
####################################################################################################
# Command Line Options
-getopts("sqzt:o:i:h");
+getopts("svqzt:o:i:h");
if(! defined $opt_t) { &usage(); die "-E- Missing required title: -t
\n"; }
if(! defined $opt_o) { &usage(); die "-E- Missing required argument output video names: -o \n"; }
if(! defined $opt_i) { &usage(); die "-E- Missing required argument input video names: -i \n"; }
+if(! -x $ffmpeg) { die "-E- Missing required executable for ffmpeg: $ffmpeg\n"; }
+if(! -x $avconv) { die "-E- Missing required executable for avconv: $avconv\n"; }
sub usage {
print "usage: $0 -t -o -i \n";
@@ -40,6 +43,7 @@ sub usage {
print " -q Requantize input videos to decrease output video size (requires HandBrakeCLI)\n";
print " -z Recompress input videos to decrease output video size (requires HandBrakeCLI)\n";
print " -s Simulate mode. Don't actually make the video, but tell us what you will do\n";
+ print " -v Increase verbosity for debug\n";
print "\n";
return 1;
}
@@ -117,15 +121,24 @@ foreach my $video (sort{$videos{$a} <=> $videos{$b}} keys %videos) {
# We will then merge this temporarily created mkv container into the final mkv container instead of the original interlaced video.
# http://ubuntuforums.org/showthread.php?t=1627194
# http://forum.doom9.org/showthread.php?t=155732&page=31
- my $progressive = system('$ffmpeg -i "$video" 2>&1 | grep -q "frame rate differs"');
+
+ # This is the best way to detect if content is interlaced or progressive:
+ # http://www.aktau.be/2013/09/22/detecting-interlaced-video-with-ffmpeg/
+ my $progressive = 0;
+ my $detect_cmd = "$ffmpeg -filter:v idet -frames:v 100 -an -f rawvideo -y /dev/null -i \"$video\" 2>&1 | grep Parsed_idet";
+ if($opt_v) { print " $detect_cmd\n"; }
+ my $detect_output = `$detect_cmd`;
+ if($detect_output !~ /Progressive:0/) { $progressive = 1; }
if(!$progressive) {
my $video_mkv = $video;
print " Detected interlaced video content: $video\n";
+ # We don't need to do this anymore since it is not an issue with the new mkvmerge
if($video_ext !~ /mkv/i) {
$video_mkv =~ s/\.[^.]*$//; $video_mkv .= ".ffmpeg.mkv";
print " Re-muxing the interlaced video content as an mkv file: $video_mkv\n";
- my $make_mkv_cmd = "$ffmpeg -y -i \"$video\" -scodec copy -acodec copy -vcodec copy -f matroska \"$video_mkv\" >> \"$tmpfile\" 2>&1";
- if(! defined $opt_s) {
+ my $make_mkv_cmd = "$avconv -y -i \"$video\" -scodec copy -acodec copy -vcodec copy -f matroska \"$video_mkv\" >> \"$tmpfile\" 2>&1";
+ if($opt_v) { print " $make_mkv_cmd\n"; }
+ if(! defined $opt_s) {
my $errno = system("$make_mkv_cmd");
$errno = $errno >> 8;
if($errno > 1) {
@@ -166,7 +179,8 @@ foreach my $video (sort{$videos{$a} <=> $videos{$b}} keys %videos) {
print " Re-compressing input video content to: $video_mp4\n";
$handbrake_options = $handbrake_recompress_options;
# We want our audio to be passed-through by default, so detect how the audio of the input is encoded, and tell handbrake to make the output match
- $AUDIO_CODEC=`$ffmpeg -i "$video" 2>&1 | grep "Audio" | sed -r -e 's/.*?Audio: (\\S+),.*?/\\1/'`; chomp($AUDIO_CODEC);
+ if($opt_v) { print " $ffmpeg -i \"$video\" 2>&1 | grep \"Audio\" | sed -r -e 's/.*?Audio: (\\S+).*?/\\1/'\n"; }
+ $AUDIO_CODEC=`$ffmpeg -i "$video" 2>&1 | grep "Audio" | sed -r -e 's/.*?Audio: (\\S+).*?/\\1/'`; chomp($AUDIO_CODEC);
if($AUDIO_CODEC eq "") { die "-E- Unable to extract audio track encoding from input video file: $video\n"; }
$handbrake_options .= " -E copy:$AUDIO_CODEC";
}
@@ -177,7 +191,7 @@ foreach my $video (sort{$videos{$a} <=> $videos{$b}} keys %videos) {
# Use HandBrake to requantize/recompress/deinterlace the input video
my $handbrake_cmd = "$handbrake $deinterlace_option $handbrake_options -i \"$video\" -o \"$video_mp4\" >> \"$tmpfile\" 2>&1";
- #print " $handbrake_cmd\n";
+ if($opt_v) { print " $handbrake_cmd\n"; }
if(! defined $opt_s) {
my $errno = system("$handbrake_cmd");
$errno = $errno >> 8;