X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;ds=sidebyside;f=merge_videos_by_day;h=27f2e2bbd7fed6673ae9f2e441ac85f9fe79eca6;hb=c99a50a0fd63d9bb9eb0fa9d1232366e9e2d444f;hp=4cf293ddea47cbd2b699faf4febcaa0fbe22fff7;hpb=70d3ba3c710f3fe234188d492b42338aa2069513;p=videoscripts%2F.git

diff --git a/merge_videos_by_day b/merge_videos_by_day
index 4cf293d..27f2e2b 100755
--- a/merge_videos_by_day
+++ b/merge_videos_by_day
@@ -9,7 +9,7 @@ use File::stat;
 use Time::localtime;
 
 # Early command line options processing
-getopts("qkh:tvs:");
+getopts("qzkh:tvs:");
 my $srcpathname = $opt_s;
 
 ####################################################################################################
@@ -23,19 +23,20 @@ if( -f "$mydir/organize_videos.conf.local") { require "organize_videos.conf.loca
 ####################################################################################################
 
 sub usage {
-    print "usage: $0 [-tvrh] -s <srcpath>\n";
+    print "usage: $0 [-tvrhz] -s <srcpath>\n";
     print "   -s <srcpath>          specify the path to search for videos to merge under\n";
     print "   -h <compute host>     specify the remote compute host to submit the mkvmerge job to\n";
     print "   -v                    verbose mode; print extra information about what is being found/merged\n";
     print "   -t                    test mode; print what will happen, but don't do anything\n";
     print "   -k                    keep the individual video files that are merged. By default, after a merge, individual video files that were merged are removed\n";
-    print "   -q                    Requantize MTS input videos to decrease output video size (requires HandBrakeCLI)\n";
+    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";
     return 1;
 }
 if(defined $opt_h) { usage(); exit 1; }
 
 # Sanity checks
-if(defined $opt_q && !$use_compute_host) { die "-E- Unable to find required program: handbrake\n"; }
+if((defined $opt_q || defined $opt_z) && !$use_compute_host && ! -x "$handbrake") { die "-E- Unable to find required program: handbrake\n"; }
 if(! -d $srcpathname) { &usage; print "-E- Can't find srcpath: $srcpathname\n"; exit 1; }
 if(defined $opt_h) { $compute_host = $opt_h; }
 
@@ -93,7 +94,7 @@ foreach $file (sort `$find_cmd`) {
     $date_taken = ctime(stat("$srcdir/$srcfile")->mtime);
 
     # Get the date taken from the filename
-    if($srcfile =~ /^(\d+)-(\d+)-(\d+)/) {
+    if(!$merge_by_modification_date && $srcfile =~ /^(\d+)-(\d+)-(\d+)/) {
 	$year = $1;
 	$month = $2;
 	$day = sprintf("%02d",$3);
@@ -133,24 +134,6 @@ foreach $file (sort `$find_cmd`) {
     push(@{$videos{"$srcext"}{"$dstfile"}}, "\"$srcdir/$srcfile\"");
 }
 
-# For single videos, with the re-quantize option given, rename the destination file to mp4
-foreach $ext (sort keys %videos) {
-    foreach $video (sort keys %{$videos{$ext}}) {	
-	# Get a count of the number of videos for this date
-	# If we only have a single video, its extension will actually be mp4 if opt_q is specified
-	my $num_videos = $#{$videos{$ext}{$video}} + 1;
-	if((defined $opt_q) && ($num_videos <= 1)) {
-	    if($video =~ /(.*?)\.(\d+)\.(\w+)$/) {
-		$dstfile = $1;
-		$dstnum = $2;
-		$new_dstvideo = "$1.$2.mp4";
-		$videos{$ext}{$new_dstvideo} = $videos{$ext}{$video}; # make a new dst video entry with the src video being the same
-		delete $videos{$ext}{$video}; # delete the old destination video from the hash
-	    }
-	}
-    }
-}
-
 # Check for duplicate filenames in the dstfiles being created for other exts
 foreach $ext (sort keys %videos) {
     foreach $video (sort keys %{$videos{$ext}}) {	
@@ -176,76 +159,11 @@ foreach $ext (sort keys %videos) {
     }
 }
 
-# Only merge the videos if there is more than 1 video to merge on a given day for a given ext
-# If there is only 1 video for a given day for a given ext, re-quantize it here if that option was given
-foreach $ext (sort keys %videos) {
-    foreach $video (sort keys %{$videos{$ext}}) {
-	
-	# Get a count of the number of videos for this date
-	my $num_videos = $#{$videos{$ext}{$video}} + 1;
-
-	# Process any single videos now
-	if($num_videos <= 1) {
-
-	    # Store the srcvideo name
-	    my $srcvideo = $videos{$ext}{$video}[0];
-	    my $pwd = `pwd`; chomp($pwd);
-
-	    # Make a note if this video is interlaced or not
-	    my $ffmpeg_cmd = "";
-	    if($use_compute_host) { $ffmpeg_cmd .= "ssh $compute_host 'cd \"$pwd\";"; }
-	    $ffmpeg_cmd .= "$ffmpeg -i $srcvideo 2>&1 | grep -q \"frame rate differs\"";
-	    if($use_compute_host) { $ffmpeg_cmd .= "'"; }
-	    my $progressive = system('$ffmpeg_cmd');
-	    if(!$progressive) { print "   Detected interlaced video content: $srcvideo\n"; }
-	    
-	    # Re-quantize the input video to reduce the resulting output filesize
-	    # This also gives us a chance to deinterlace the video as well
-	    # Only do this for .MTS videos
-	    if((defined $opt_q) && ($ext =~ /mts/i)) {
-		
-		# Set our requantize factor accordingly
-		my $requantize_option = "";
-		if(!$progressive) { $requantize_option = "-q $interlaced_requantize_quality"; }
-		else { $requantize_option = "-q $progressive_requantize_quality"; }
-		
-		# Set our de-interlace option accordingly
-		my $deinterlace_option = "";
-		if(!$progressive) { $deinterlace_option = "-d"; }
-		
-		# Use HandBrake to requantize/deinterlace the input video
-		print "   Re-quantizing input video content: $video\n";
-		my $handbrake_cmd = "";
-		if($use_compute_host) { $handbrake_cmd .= "ssh $compute_host 'cd \"$pwd\";"; }
-		$handbrake_cmd .= "$handbrake $deinterlace_option $requantize_option $handbrake_options -i $srcvideo -o \"$video\" > /dev/null 2>&1";
-		if($use_compute_host) { $handbrake_cmd .= "'"; }
-		if(! defined $opt_t) { 
-		    my $errno = system("$handbrake_cmd");
-		    $errno = $errno >> 8;
-		    if($errno > 1) {
-			unlink "$video";
-			die "-E- handbrake encountered some errors with exit code $errno\n";
-		    } else {
-			# Remove the original srcvideo since we created a new version of it that we are going to keep instead
-			if(!defined $opt_k) { 
-			    system("rm -f $srcvideo\n");
-			}
-		    }
-		}
-	    }
-
-	    # Remove the video from the array since we already processed it above
-	    delete $videos{$ext}{$video};
-	    next;
-	}
-    }
-}
-
 # Tell the user which videos we are going to merge
 foreach $ext (sort keys %videos) {
     foreach $video (sort keys %{$videos{$ext}}) {
 	foreach $srcfile (@{$videos{$ext}{$video}}) { 
-	    print "   merging \"$srcfile\" into \"$video\"\n";
+	    print "   merging $srcfile into \"$video\"\n";
 	}
     }
 }
@@ -268,13 +186,21 @@ foreach $ext (sort keys %videos) {
 	if($use_compute_host) { $cmd .= "ssh $compute_host 'cd \"$pwd\";"; }
 	$cmd .= "$make_mkv -t \"$video_title_prefix $year-$month-$day\" -o \"$video\" -i $videos";
 	if($requantize_input_video) { $cmd .= ' -q'; }
+	if($recompress_input_video) { $cmd .= ' -z'; }
 	if($use_compute_host) { $cmd .= "'"; }
 	if(defined $opt_t) {
+	    # Print what will be done, but don't actually do it
 	    print "\n-> Creating \"$video\"\n";
 	    print "$cmd\n";
 	    if(!defined $opt_k) { 
 		foreach $video (@{$videos{$ext}{$video}}) {
-		    print("rm -f $video\n");
+		    if(($save_originals) && ($video =~ /\.$originals_file_ext/)) {
+			print "-> Saving the original video $video\n";
+			print("mv $video \"$origpathname/".basename(dirname($video))."_".basename($video)."\n");
+		    } else {
+			print "-> Removing the original video $video\n";
+			print("/bin/bash -c '[[ -e $video ]] && rm -f $video'\n");
+		    }
 		}
 	    }
 	} else {
@@ -290,7 +216,13 @@ foreach $ext (sort keys %videos) {
 	    # Remove the individual video files
 	    if(!defined $opt_k) { 
 		foreach $srcvideo (@{$videos{$ext}{$video}}) {
-		    system("rm -f $srcvideo");
+		    if(($save_originals) && ($srcvideo =~ /\.$originals_file_ext/)) {
+			print "-> Saving the original video $srcvideo to $origpathname\n";
+			system("mv $srcvideo \"$origpathname/".basename(dirname($srcvideo))."_".basename($srcvideo));
+		    } else {
+			print "-> Removing the original video $srcvideo\n";
+			system("/bin/bash -c '[[ -e $srcvideo ]] && rm -f $srcvideo'");
+		    }
 		}
 	    }
 	}