first start of support for ffmpeg 0.5.. includes fixing trellis parameter to close #5923

Author: ex-nerd

nuvexport/export/ffmpeg.pm

@@ -72,24 +72,29 @@ package export::ffmpeg;
     # Check the ffmpeg version
         if (!defined $self->{'ffmpeg_vers'}) {
             $data = `$ffmpeg -version 2>&1`;
-            if ($data =~ m/ffmpeg\sversion\s0.4.9-\d+_r(\d+)\.\w+\.at/si) {
-                $self->{'ffmpeg_vers'}  = 'svn';
-                $self->{'ffmpeg_build'} = $1;
+            if ($data =~ m/ffmpeg\sversion\s0.5-/si) {
+                $self->{'ffmpeg_vers'}  = '0.5';
             }
-            elsif ($data =~ m/ffmpeg\sversion\s(.+?),(?:\sbuild\s(\d+))?/si) {
-                $self->{'ffmpeg_vers'}  = lc($1);
-                $self->{'ffmpeg_build'} = $2;
-                if ($self->{'ffmpeg_vers'} =~ /^svn-r(.+?)$/) {
-                    $self->{'ffmpeg_vers'}  = 'svn';
-                    $self->{'ffmpeg_build'} = $1;
-                }
+            # Disabled unti I need the formatting again to detect wacky ffmpeg
+            # versions if they go back to releasing things the old way.
+            #elsif ($data =~ m/ffmpeg\sversion\s0.4.9-\d+_r(\d+)\.\w+\.at/si) {
+            #    $self->{'ffmpeg_vers'}  = 'svn';
+            #    $self->{'ffmpeg_build'} = $1;
+            #}
+            #elsif ($data =~ m/ffmpeg\sversion\s(.+?),(?:\sbuild\s(\d+))?/si) {
+            #    $self->{'ffmpeg_vers'}  = lc($1);
+            #    $self->{'ffmpeg_build'} = $2;
+            #    if ($self->{'ffmpeg_vers'} =~ /^svn-r(.+?)$/) {
+            #        $self->{'ffmpeg_vers'}  = 'svn';
+            #        $self->{'ffmpeg_build'} = $1;
+            #    }
             }
             else {
                 push @{$self->{'errors'}}, 'Unrecognizeable ffmpeg version string.';
             }
         }
-        if ($self->{'ffmpeg_vers'} !~ /cvs|svn/) {
-            die "This version of nuvexport requires either the cvs or svn version of ffmpeg.\n";
+        if ($self->{'ffmpeg_vers'} ne '0.5') {
+            die "This version of nuvexport requires ffmpeg 0.5.\n";
         }
     # Audio only?
         $self->{'audioonly'} = $audioonly;

nuvexport/export/ffmpeg/MP4.pm

@@ -113,25 +113,19 @@ package export::ffmpeg::MP4;
                                          'yesno',
                                          $self->val('ipod'));
         # Video codec
-            if ($self->{'ffmpeg_vers'} eq 'svn') {
-                while (1) {
-                    my $codec = query_text('Video codec (mpeg4 or h264)?',
-                                           'string',
-                                           $self->{'mp4_codec'});
-                    if ($codec =~ /^m/) {
-                        $self->{'mp4_codec'} = 'mpeg4';
-                        last;
-                    }
-                    elsif ($codec =~ /^h/) {
-                        $self->{'mp4_codec'} = 'h264';
-                        last;
-                    }
-                    print "Please choose either mpeg4 or h264\n";
+            while (1) {
+                my $codec = query_text('Video codec (mpeg4 or h264)?',
+                                       'string',
+                                       $self->{'mp4_codec'});
+                if ($codec =~ /^m/) {
+                    $self->{'mp4_codec'} = 'mpeg4';
+                    last;
                 }
-            }
-            else {
-                $self->{'mp4_codec'} = 'mpeg4';
-                print "Using the mpeg4 codec (h.264 mp4/ipod encoding requires the svn version of ffmpeg.)\n";
+                elsif ($codec =~ /^h/) {
+                    $self->{'mp4_codec'} = 'h264';
+                    last;
+                }
+                print "Please choose either mpeg4 or h264\n";
             }
         # Video bitrate options
             $self->{'vbr'} = query_text('Variable bitrate video?',
@@ -166,10 +160,6 @@ package export::ffmpeg::MP4;
                                               'int',
                                               $self->val('v_bitrate'));
         }
-    # Complain about h264
-        if ($self->{'mp4_codec'} eq 'h264' && $self->{'ffmpeg_vers'} ne 'svn') {
-            die "h.264 mp4/ipod encoding requires the svn version of ffmpeg.\n";
-        }
     # Loop, in case we need to verify ipod compatibility
         while (1) {
         # Query the resolution
@@ -237,7 +227,8 @@ package export::ffmpeg::MP4;
                            ;
         }
         else {
-           $ffmpeg_xtra .= ' -flags +mv4+trell+loop'
+           $ffmpeg_xtra .= ' -flags +mv4+loop'
+                          .' -trellis 1'
                           .' -aic 1'
                           .' -mbd 1'
                           .' -cmp 2 -subcmp 2'

nuvexport/export/ffmpeg/XviD.pm

@@ -150,7 +150,8 @@ package export::ffmpeg::XviD;
                              . $self->param('bit_rate_tolerance', 32)
                              . ' -bufsize 65535'
                             : '')
-                          .' -flags +mv4+trell+loop'
+                          .' -flags +mv4+loop'
+                          .' -trellis 1'
                           .' -aic 1'
                           .' -mbd 1'
                           .' -cmp 2 -subcmp 2'

nuvexport/nuvexport.spec

@@ -4,7 +4,7 @@
 
 Name:       nuvexport
 Version:    0.5
-Release:    0.20080311.svn
+Release:    0.20090409.svn
 License:    GPL
 Summary:    mythtv nuv video file conversion script
 URL:        http://forevermore.net/nuvexport/
@@ -21,8 +21,8 @@ Requires:  perl-DateManip
 Requires:  perl-DBD-MySQL
 Requires:  perl-DBI
 Requires:  perl-MythTV >= 0.21
-Requires:  transcode   >= 0.6.12
-Requires:  ffmpeg      >= 0.4.9
+Requires:  transcode   >= 1.0
+Requires:  ffmpeg      >= 0.5
 Requires:  mjpegtools  >= 1.6.2
 Requires:  mplayer