better way to detect mpeg stream type that should be language independent

Author: ex-nerd

trunk/export/transcode.pm

@@ -246,7 +246,7 @@ package export::transcode;
     # Is an mpeg
         else {
             $transcode .= " -i $episode->{'filename'} -x ";
-            if ($episode->{'finfo'}{'mpeg_stream_type'} eq 'pes') {
+            if ($episode->{'finfo'}{'mpeg_stream_type'} eq 'mpegpes') {
                 $transcode .= 'vob';
             }
             else {

trunk/mythtv/nuvinfo.pm

@@ -184,28 +184,23 @@ package mythtv::nuvinfo;
         ($info{'audio_bitrate'})         = $data =~ m/^ID_AUDIO_BITRATE=(\d+)/m;
         ($info{'audio_bits_per_sample'}) = $data =~ m/^AUDIO:.+?ch,\s*[su](8|16)/mi;
         ($info{'audio_channels'})        = $data =~ m/^ID_AUDIO_NCH=(\d+)/m;
-        ($info{'mpeg_stream_type'})      = $data =~ m/^ID_VIDEO_FPS=(\d+(?:\.\d*)?)/m;
+        ($info{'fps'})                   = $data =~ m/^ID_VIDEO_FPS=(\d+(?:\.\d*)?)/m;
         ($info{'aspect'})                = $data =~ m/^ID_VIDEO_ASPECT=(\d+(?:[\.\,]\d*)?)/m;
         ($info{'audio_type'})            = $data =~ m/^ID_AUDIO_CODEC=(\d+(?:\.\d*)?)/m;
+        ($info{'mpeg_stream_type'})      = $data =~ m/^ID_DEMUXER=(\w+)/mi;
     # Stream type
-        if ($data =~ m/\bMPEG-(PE?S) file format detected/m) {
-            $info{'mpeg_stream_type'} = lc($1);
-        }
-        elsif ($data =~ m/^TS file format detected/m) {
-            $info{'mpeg_stream_type'} = 'ts';
-        }
-    # French localisation
-        elsif ($data =~ m/Fichier de type MPEG-(PE?S) détecté./m) {
-            $info{'mpeg_stream_type'} = lc($1);
-        }
-        elsif ($data =~ m/Fichier de type TS détecté./m) {
-            $info{'mpeg_stream_type'} = 'ts';
+        $info{'mpeg_stream_type'} = lc($info{'mpeg_stream_type'});
+        if ($info{'mpeg_stream_type'} && $info{'mpeg_stream_type'} !~ /^mpeg/) {
+            die "Stream type '$info{'mpeg_stream_type'}' is not an mpeg, and will\n"
+               ."not work with this program.\n";
         }
         else {
-            die "Unrecognized mpeg stream type.  Please execute the following and see if you\n"
-               ."notice errors (make sure that you don't have the \"really quiet\" option set\n"
-               ."in your mplayer config).  If not, email the output to the nuvexport author.\n\n"
-               ."    $program -v -v -v -v -nolirc -nojoystick -vo null -ao null -frames 0 -identify '$file'\n\n";
+            die "Unrecognized stream type.  Please execute the following and see if you\n"
+               ."notice errors (make sure that you don't have the \"really quiet\" option\n"
+               ."set in your mplayer config).  If not, create a ticket at\n"
+               ."http://svn.mythtv.org/trac/newticket and attach the output from:\n\n"
+               ."    $program -v -v -v -v -nolirc -nojoystick -vo null -ao null \\\n"
+               ."             -frames 0 -identify '$file'\n\n";
         }
     # Cleanup
         $info{'aspect'}   = aspect_str($info{'aspect'});

trunk/nuvexport

@@ -5,7 +5,7 @@
 # $Author$
 
 # Version
-    $VERSION = '0.3 0.20060419.svn';
+    $VERSION = '0.3 0.20060420.svn';
 
 # Autoflush buffers
     $|++;

trunk/nuvexport.spec

@@ -4,7 +4,7 @@
 
 Name:       nuvexport
 Version:    0.3
-Release:    0.20060419.svn
+Release:    0.20060420.svn
 License:    GPL
 Summary:    mythtv nuv video file conversion script
 URL:        http://forevermore.net/nuvexport/