[patch] Backport from mythtv CVS: let nuvexport work with newer ffmpeg

nuvexport-0.5-ffmpeg.patch (text/plain), 4.87 KB, created by Christopher Byrne on 2010-01-26 23:49:45 UTC

diff -u -r nuvexport-0.5/export/ffmpeg/DivX.pm.new nuvexport-0.5-r1/export/ffmpeg/DivX.pm.new
--- nuvexport-0.5/export/ffmpeg/DivX.pm.new	2007-07-01 01:43:13.000000000 -0500
+++ nuvexport-0.5-r1/export/ffmpeg/DivX.pm.new	2010-01-26 17:36:27.000000000 -0600
@@ -136,7 +136,8 @@
                                    . ' -bufsize 65535'
                                    #. ' -lumi_mask 0.05 -dark_mask 0.02 -scplx_mask 0.5'
                                    . ' -mbd rd'
-                                   . ' -flags +4mv+trell+aic'
+                                   . ' -flags +4mv+aic'
+                                   . ' -trellis 1'
                                    . ' -cmp 2 -subcmp 2'
                                    #. ' -mv4'
                                    . ' -part'
@@ -154,7 +155,8 @@
                                    . ' -bufsize 65535'
                                    #. ' -lumi_mask 0.05 -dark_mask 0.02 -scplx_mask 0.5'
                                    . ' -mbd rd'
-                                   . ' -flags +4mv+trell+aic'
+                                   . ' -flags +4mv+aic'
+                                   . ' -trellis 1'
                                    . ' -cmp 2 -subcmp 2'
                                    #. ' -mv4'
                                    . ' -part'
diff -u -r nuvexport-0.5/export/ffmpeg/MP4.pm nuvexport-0.5-r1/export/ffmpeg/MP4.pm
--- nuvexport-0.5/export/ffmpeg/MP4.pm	2008-02-16 22:57:50.000000000 -0600
+++ nuvexport-0.5-r1/export/ffmpeg/MP4.pm	2010-01-26 17:34:46.000000000 -0600
@@ -223,7 +223,7 @@
     # Options required for the codecs separately
         if ($self->{'mp4_codec'} eq 'h264') {
             $ffmpeg_xtra .= ' -level 30'
-                           .' -loop 1'
+                           .' -flags loop+splice'
                            .' -g 250 -keyint_min 25'
                            .' -sc_threshold 40'
                            .' -rc_eq \'blurCplx^(1-qComp)\''
@@ -233,11 +233,12 @@
                            .$self->param('i_quant_factor',     0.71428572)
                            .$self->param('b_quant_factor',     0.76923078)
                            .$self->param('max_b_frames',       0)
-                           .' -me umh'   # this will eventually be me_method, but not all ffmpeg versions support it yet
+                           .' -me_method umh'
                            ;
         }
         else {
-           $ffmpeg_xtra .= ' -flags +mv4+trell+loop'
+           $ffmpeg_xtra .= ' -flags +mv4+loop+aic'
+                          .' -trellis 1'
                           .' -aic 1'
                           .' -mbd 1'
                           .' -cmp 2 -subcmp 2'
@@ -290,11 +291,9 @@
             $ffmpeg_xtra .= ' -refs '.($self->val('ipod') ? 2 : 7)
                            .' -subq 7'
                            .' -partitions parti4x4+parti8x8+partp4x4+partp8x8+partb8x8'
-                           .' -flags2 +bpyramid+wpred+mixed_refs+8x8dct+brdo'
+                           .' -flags2 +bpyramid+wpred+mixed_refs+8x8dct'
                            .' -me_range 21'
                            .' -trellis 2'
-                           .' -chroma 1'
-                           .' -slice 2'
                            .' -cmp 1'
                            # These should match the defaults:
                            .' -deblockalpha 0 -deblockbeta 0'
diff -u -r nuvexport-0.5/export/ffmpeg/PSP.pm nuvexport-0.5-r1/export/ffmpeg/PSP.pm
--- nuvexport-0.5/export/ffmpeg/PSP.pm	2008-02-16 19:19:22.000000000 -0600
+++ nuvexport-0.5-r1/export/ffmpeg/PSP.pm	2010-01-26 17:37:12.000000000 -0600
@@ -172,7 +172,7 @@
                                  .' -bufsize 65535'
                                  .$self->param('ab', 32)
                                  .' -acodec '.$acodec
-                                 ." -f psp -title $safe_title";
+                                 ." -f psp";
     # Execute the parent method
         $self->SUPER::export($episode, '.MP4');
 
diff -u -r nuvexport-0.5/export/ffmpeg/XviD.pm nuvexport-0.5-r1/export/ffmpeg/XviD.pm
--- nuvexport-0.5/export/ffmpeg/XviD.pm	2008-02-19 22:50:28.000000000 -0600
+++ nuvexport-0.5-r1/export/ffmpeg/XviD.pm	2010-01-26 17:34:49.000000000 -0600
@@ -150,11 +150,10 @@
                              . $self->param('bit_rate_tolerance', 32)
                              . ' -bufsize 65535'
                             : '')
-                          .' -flags +mv4+trell+loop'
-                          .' -aic 1'
+                          .' -flags +mv4+loop+aic+cgop'
+                          .' -trellis 1'
                           .' -mbd 1'
                           .' -cmp 2 -subcmp 2'
-                          .' -cgop 1'
                            .$self->param('b_quant_factor',     150)
                            .$self->param('b_quant_offset',     100)
                            .$self->param('max_b_frames',       1)