add the better framecount calculation to mencoder, and update it overall -- no need for lastgop stuff anymore so just grab the last mark in the table

Author: ex-nerd

trunk/export/ffmpeg.pm

@@ -294,8 +294,9 @@ package export::ffmpeg;
         $frames = 0;
         $fps = 0.0;
         $start = time();
-        my $total_frames = $episode->{'lastgop'} * (($episode->{'finfo'}{'fps'} =~ /^2(?:5|4\.9)/) ? 12 : 15);
-        $total_frames -= $episode->{'cutlist_frames'} if ($total_frames > 0);
+        my $total_frames = $episode->{'last_frame'} > 0
+                            ? $episode->{'last_frame'} - $episode->{'cutlist_frames'}
+                            : 0;
     # Keep track of any warnings
         my $warnings    = '';
         my $death_timer = 0;

trunk/export/mencoder.pm

@@ -164,7 +164,9 @@ package export::mencoder;
         my ($frames, $fps);
         $frames = 0;
         $fps    = 0.0;
-        my $total_frames = $episode->{'lastgop'} * (($episode->{'finfo'}{'fps'} =~ /^2(?:5|4\.9)/) ? 12 : 15);
+        my $total_frames = $episode->{'last_frame'} > 0
+                            ? $episode->{'last_frame'} - $episode->{'cutlist_frames'}
+                            : 0;
     # Keep track of any warnings
         my $warnings    = '';
         my $death_timer = 0;
@@ -201,7 +203,7 @@ package export::mencoder;
                 while (has_data($mythtrans_h) and $l = <$mythtrans_h>) {
                     if ($l =~ /Processed:\s*(\d+)\s*of\s*(\d+)\s*frames\s*\((\d+)\s*seconds\)/) {
                         #$frames       = int($1);
-                        $total_frames = $2;
+                        $total_frames ||= $2 - $episode->{'cutlist_frames'};
                     }
                 }
             }

trunk/export/transcode.pm

@@ -324,8 +324,9 @@ package export::transcode;
         my ($frames, $fps);
         $frames = 0;
         $fps    = 0.0;
-        my $total_frames = $episode->{'lastgop'} * (($episode->{'finfo'}{'fps'} =~ /^2(?:5|4\.9)/) ? 12 : 15);
-        $total_frames -= $episode->{'cutlist_frames'} if ($total_frames > 0);
+        my $total_frames = $episode->{'last_frame'} > 0
+                            ? $episode->{'last_frame'} - $episode->{'cutlist_frames'}
+                            : 0;
     # Keep track of any warnings
         my $warnings    = '';
         my $death_timer = 0;

trunk/mythtv/recordings.pm

@@ -77,7 +77,7 @@ package mythtv::recordings;
         die "No valid recordings found!\n\n" unless (@files);
 
     # Prepare a query to look up GOP info used to determine mpeg recording length
-        $q = 'SELECT mark FROM recordedmarkup WHERE chanid=? AND starttime=? AND type=6 ORDER BY mark DESC LIMIT 1';
+        $q = 'SELECT MAX(mark) FROM recordedmarkup WHERE chanid=? AND starttime=?';
         $sh  = $dbh->prepare($q);
 
     # Prepare a query to pull out cutlist information
@@ -114,7 +114,7 @@ package mythtv::recordings;
         # Pull out GOP info for mpeg files
             $sh->execute($info{'chanid'}, $info{'starttime'})
                 or die "Could not execute ($q):  $!\n\n";
-            ($info{'lastgop'}) = $sh->fetchrow_array();
+            ($info{'last_frame'}) = $sh->fetchrow_array();
         # Cleanup
             $info{'starttime_sep'} = $info{'starttime'};
             $info{'starttime_sep'} =~ s/\D+/-/sg;
@@ -136,7 +136,7 @@ package mythtv::recordings;
                                              'transcoder'     => ($info{'transcoder'}    or 'autodetect'),
                                              'hostname'       => ($info{'hostname'}      or ''),
                                              'cutlist'        => ($info{'cutlist'}       or ''),
-                                             'lastgop'        => ($info{'lastgop'}       or 0),
+                                             'last_frame'     => ($info{'last_frame'}       or 0),
                                              'cutlist_frames' => ($cutlist_frames        or 0),
                                              'showtime'       => generate_showtime(split(/-/, $info{'starttime_sep'})),
                                             # This field is too slow to populate here, so it will be populated in ui.pm on-demand