make "crop" an option, instead of forcing it

filename illegal-char fixes perform tmpfile-wipe after each encode, instead of just at END, to keep un-muxed files from piling up.
MythTV · Sep 29, 2004 · a8db678 · a8db678
1 parent 2d004bf
commit a8db678
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 24 deletions.
diff --git a/trunk/export/DVCD.pm b/trunk/export/DVCD.pm
@@ -26,6 +26,7 @@ package export::DVCD;
                     # Transcode-related settings
                      'denoise'         => 1,
                      'deinterlace'     => 1,
+                     'crop'            => 1,
                     };
         bless($self, $class);
 

diff --git a/trunk/export/DVD.pm b/trunk/export/DVD.pm
@@ -29,6 +29,7 @@ package export::DVD;
                     # Transcode-related settings
                      'denoise'         => 1,
                      'deinterlace'     => 1,
+                     'crop'            => 1,
                     # DVD-specific settings
                      'quantisation'    => 5,		# 4 through 6 is probably right...
                      'a_bitrate'       => 384,

diff --git a/trunk/export/SVCD.pm b/trunk/export/SVCD.pm
@@ -29,6 +29,7 @@ package export::SVCD;
                     # Transcode-related settings
                      'denoise'         => 1,
                      'deinterlace'     => 1,
+                     'crop'            => 1,
                     # SVCD-specific settings
                      'quantisation'    => 5,		# 4 through 6 is probably right...
                      'a_bitrate'       => 192,

diff --git a/trunk/export/VCD.pm b/trunk/export/VCD.pm
@@ -26,6 +26,7 @@ package export::VCD;
                     # Transcode-related settings
                      'denoise'         => 1,
                      'deinterlace'     => 1,
+                     'crop'            => 1,
                     };
         bless($self, $class);
 

diff --git a/trunk/export/XviD.pm b/trunk/export/XviD.pm
@@ -32,6 +32,7 @@ package export::XviD;
                     # Transcode-related settings
                      'denoise'         => 1,
                      'deinterlace'     => 1,
+                     'crop'            => 1,
                     # VBR-specific settings
                      'vbr'             => 1,        # This enables vbr, and the multipass/quantisation options
                      'multipass'       => 0,        # You get multipass or quantisation, multipass will override

diff --git a/trunk/export/transcode.pm b/trunk/export/transcode.pm
@@ -23,6 +23,7 @@ package export::transcode;
     $cli_args{'denoise|noise_reduction:s'} = 1; # Enable noise reduction
     $cli_args{'deinterlace:s'}             = 1; # Transcode-related settings
     $cli_args{'zoom_filter:s'}             = 1; # Which zoom filter to use
+    $cli_args{'crop'}                      = 1; # Crop out broadcast overscan
 
 # This superclass defines several object variables:
 #
@@ -71,9 +72,14 @@ package export::transcode;
                                             'yesno',
                                             $self->{'deinterlace'} ? 'Yes' : 'No');
     # Crop video to get rid of broadcast padding
-    #    $self->{'crop'} = query_text('Crop ',
-    #                                 'yesno',
-    #                                 $self->{'crop'} ? 'Yes' : 'No');
+        if ($Args{'crop'}) {
+            $self->{'crop'} = 1;
+        }
+        else {
+            $self->{'crop'} = query_text('Crop broadcast overscan (2% border)?',
+                                         'yesno',
+                                         $self->{'crop'} ? 'Yes' : 'No');
+        }
     }
 
     sub export {
@@ -117,7 +123,7 @@ package export::transcode;
                          ;
         }
     # Crop?
-        if (1 || $self->{'crop'}) {
+        if ($self->{'crop'}) {
             my $w = sprintf('%.0f', .02 * $episode->{'finfo'}{'width'});
             my $h = sprintf('%.0f', .02 * $episode->{'finfo'}{'height'});
             $transcode .= " -j $h,$w,$h,$w" if ($h || $w);

diff --git a/trunk/mythtv/recordings.pm b/trunk/mythtv/recordings.pm
@@ -91,16 +91,17 @@ package mythtv::recordings;
         $description = 'No Description' unless ($description =~ /\S/);
     # Build a clean filename
         my $outfile = 'Untitled';
-		if ($show ne 'Untitled' and $episode ne 'Untitled') {
-			$outfile = "$show - $episode";
-		}
-		elsif($show ne 'Untitled') {
-			$outfile = $show;
-		}
-		elsif($episode ne 'Untitled') {
-			$outfile = $episode;
-		}
-        $outfile =~ s/(?:[:\?&\/]+\s*?)+\s?/-/sg;
+        if ($show ne 'Untitled' and $episode ne 'Untitled') {
+            $outfile = "$show - $episode";
+        }
+        elsif($show ne 'Untitled') {
+            $outfile = $show;
+        }
+        elsif($episode ne 'Untitled') {
+            $outfile = $episode;
+        }
+        $outfile =~ s/(?:[\/\\\:\*\?\<\>\|\-]+\s*?)+\s?/-/sg;
+        $outfile =~ tr/"/'/s;
     #$description =~ s/(?:''|``)/"/sg;
         push @{$Shows{$show}}, {'filename'       => "$video_dir/$file",
                                 'channel'        => $channel,

diff --git a/trunk/nuv_export/shared_utils.pm b/trunk/nuv_export/shared_utils.pm
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-#Last Updated: 2004.09.24 (xris)
+#Last Updated: 2004.09.28 (xris)
 #
 #  nuv_export::shared_utils
 #
@@ -14,7 +14,7 @@ package nuv_export::shared_utils;
         use Exporter;
         our @ISA = qw/ Exporter /;
 
-        our @EXPORT = qw/ &clear &find_program &num_cpus &shell_escape &wrap &system
+        our @EXPORT = qw/ &clear &find_program &num_cpus &shell_escape &wrap &system &wipe_tmpfiles
                           @Exporters %Prog %Args %cli_args $DEBUG
                           $is_child
                           @tmpfiles %children
@@ -37,14 +37,7 @@ package nuv_export::shared_utils;
     END {
         if (!$is_child) {
         # Clean up temp files/directories
-            foreach my $file (@tmpfiles) {
-                if (-d $file) {
-                    rmdir $file;
-                }
-                elsif (-e $file) {
-                    unlink $file;
-                }
-            }
+            wipe_tmpfiles();
         # Make sure any child processes also go away
             if (%children) {
                 foreach my $child (keys %children) {
@@ -202,5 +195,18 @@ package nuv_export::shared_utils;
         }
     }
 
+# Remove tmpfiles
+    sub wipe_tmpfiles {
+        foreach my $file (@tmpfiles) {
+            if (-d $file) {
+                rmdir $file;
+            }
+            elsif (-e $file) {
+                unlink $file;
+            }
+        }
+        @tmpfiles = ();
+    }
+
 
 # vim:ts=4:sw=4:ai:et:si:sts=4
diff --git a/trunk/nuvexport b/trunk/nuvexport
@@ -91,6 +91,8 @@
             my $start = time();
         # Encode
             $exporter->export($episode);
+        # Remove tmpfiles
+            wipe_tmpfiles();
         # Report how long the encode lasted
             print "\nEncode finished:  ".localtime()."\n";
             my $seconds = time() - $start;