Attachment #217518 for bug #302132




                                   . ' -bufsize 65535'
                                   #. ' -lumi_mask 0.05 -dark_mask 0.02 -scplx_mask 0.5'
                                   . ' -mbd rd'
                                   . ' -flags +4mv+aic'
                                   . ' -trellis 1'
                                   . ' -cmp 2 -subcmp 2'
                                   #. ' -mv4'
                                   . ' -part'

                                   . ' -bufsize 65535'
                                   #. ' -lumi_mask 0.05 -dark_mask 0.02 -scplx_mask 0.5'
                                   . ' -mbd rd'
                                   . ' -flags +4mv+aic'
                                   . ' -trellis 1'
                                   . ' -cmp 2 -subcmp 2'
                                   #. ' -mv4'
                                   . ' -part'




    # Options required for the codecs separately
        if ($self->{'mp4_codec'} eq 'h264') {
            $ffmpeg_xtra .= ' -level 30'
                           .' -flags loop+splice'
                           .' -g 250 -keyint_min 25'
                           .' -sc_threshold 40'
                           .' -rc_eq \'blurCplx^(1-qComp)\''

                           .$self->param('i_quant_factor',     0.71428572)
                           .$self->param('b_quant_factor',     0.76923078)
                           .$self->param('max_b_frames',       0)
                           .' -me_method umh'
                           ;
        }
        else {
           $ffmpeg_xtra .= ' -flags +mv4+loop+aic'
                          .' -trellis 1'
                          .' -aic 1'
                          .' -mbd 1'
                          .' -cmp 2 -subcmp 2'

            $ffmpeg_xtra .= ' -refs '.($self->val('ipod') ? 2 : 7)
                           .' -subq 7'
                           .' -partitions parti4x4+parti8x8+partp4x4+partp8x8+partb8x8'
                           .' -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'

Lines 172-178 Link Here

(-)nuvexport-0.5/export/ffmpeg/PSP.pm (-1 / +1 lines)
172	.' -bufsize 65535'	172	.' -bufsize 65535'
173	.$self->param('ab', 32)	173	.$self->param('ab', 32)
174	.' -acodec '.$acodec	174	.' -acodec '.$acodec
175	." -f psp -title $safe_title";	175	." -f psp";
176	# Execute the parent method	176	# Execute the parent method
177	$self->SUPER::export($episode, '.MP4');	177	$self->SUPER::export($episode, '.MP4');
178		178

Lines 150-160 Link Here

(-)nuvexport-0.5/export/ffmpeg/XviD.pm (-3 / +2 lines)
150	. $self->param('bit_rate_tolerance', 32)	150	. $self->param('bit_rate_tolerance', 32)
151	. ' -bufsize 65535'	151	. ' -bufsize 65535'
152	: '')	152	: '')
153	.' -flags +mv4+trell+loop'	153	.' -flags +mv4+loop+aic+cgop'
154	.' -aic 1'	154	.' -trellis 1'
155	.' -mbd 1'	155	.' -mbd 1'
156	.' -cmp 2 -subcmp 2'	156	.' -cmp 2 -subcmp 2'
157	.' -cgop 1'
158	.$self->param('b_quant_factor', 150)	157	.$self->param('b_quant_factor', 150)
159	.$self->param('b_quant_offset', 100)	158	.$self->param('b_quant_offset', 100)
160	.$self->param('max_b_frames', 1)	159	.$self->param('max_b_frames', 1)

Return to bug 302132

Lines 223-229 Link Here

(-)nuvexport-0.5/export/ffmpeg/MP4.pm (-6 / +5 lines)
223	# Options required for the codecs separately	223	# Options required for the codecs separately
224	if ($self->{'mp4_codec'} eq 'h264') {	224	if ($self->{'mp4_codec'} eq 'h264') {
225	$ffmpeg_xtra .= ' -level 30'	225	$ffmpeg_xtra .= ' -level 30'
226	.' -loop 1'	226	.' -flags loop+splice'
227	.' -g 250 -keyint_min 25'	227	.' -g 250 -keyint_min 25'
228	.' -sc_threshold 40'	228	.' -sc_threshold 40'
229	.' -rc_eq \'blurCplx^(1-qComp)\''	229	.' -rc_eq \'blurCplx^(1-qComp)\''
Lines 233-243 Link Here
233	.$self->param('i_quant_factor', 0.71428572)	233	.$self->param('i_quant_factor', 0.71428572)
234	.$self->param('b_quant_factor', 0.76923078)	234	.$self->param('b_quant_factor', 0.76923078)
235	.$self->param('max_b_frames', 0)	235	.$self->param('max_b_frames', 0)
236	.' -me umh' # this will eventually be me_method, but not all ffmpeg versions support it yet	236	.' -me_method umh'
237	;	237	;
238	}	238	}
239	else {	239	else {
240	$ffmpeg_xtra .= ' -flags +mv4+trell+loop'	240	$ffmpeg_xtra .= ' -flags +mv4+loop+aic'
		241	.' -trellis 1'
241	.' -aic 1'	242	.' -aic 1'
242	.' -mbd 1'	243	.' -mbd 1'
243	.' -cmp 2 -subcmp 2'	244	.' -cmp 2 -subcmp 2'
Lines 290-300 Link Here
290	$ffmpeg_xtra .= ' -refs '.($self->val('ipod') ? 2 : 7)	291	$ffmpeg_xtra .= ' -refs '.($self->val('ipod') ? 2 : 7)
291	.' -subq 7'	292	.' -subq 7'
292	.' -partitions parti4x4+parti8x8+partp4x4+partp8x8+partb8x8'	293	.' -partitions parti4x4+parti8x8+partp4x4+partp8x8+partb8x8'
293	.' -flags2 +bpyramid+wpred+mixed_refs+8x8dct+brdo'	294	.' -flags2 +bpyramid+wpred+mixed_refs+8x8dct'
294	.' -me_range 21'	295	.' -me_range 21'
295	.' -trellis 2'	296	.' -trellis 2'
296	.' -chroma 1'
297	.' -slice 2'
298	.' -cmp 1'	297	.' -cmp 1'
299	# These should match the defaults:	298	# These should match the defaults:
300	.' -deblockalpha 0 -deblockbeta 0'	299	.' -deblockalpha 0 -deblockbeta 0'

Lines 136-142 Link Here

(-)nuvexport-0.5/export/ffmpeg/DivX.pm.new (-2 / +4 lines)
136	. ' -bufsize 65535'	136	. ' -bufsize 65535'
137	#. ' -lumi_mask 0.05 -dark_mask 0.02 -scplx_mask 0.5'	137	#. ' -lumi_mask 0.05 -dark_mask 0.02 -scplx_mask 0.5'
138	. ' -mbd rd'	138	. ' -mbd rd'
139	. ' -flags +4mv+trell+aic'	139	. ' -flags +4mv+aic'
		140	. ' -trellis 1'
140	. ' -cmp 2 -subcmp 2'	141	. ' -cmp 2 -subcmp 2'
141	#. ' -mv4'	142	#. ' -mv4'
142	. ' -part'	143	. ' -part'
Lines 154-160 Link Here
154	. ' -bufsize 65535'	155	. ' -bufsize 65535'
155	#. ' -lumi_mask 0.05 -dark_mask 0.02 -scplx_mask 0.5'	156	#. ' -lumi_mask 0.05 -dark_mask 0.02 -scplx_mask 0.5'
156	. ' -mbd rd'	157	. ' -mbd rd'
157	. ' -flags +4mv+trell+aic'	158	. ' -flags +4mv+aic'
		159	. ' -trellis 1'
158	. ' -cmp 2 -subcmp 2'	160	. ' -cmp 2 -subcmp 2'
159	#. ' -mv4'	161	#. ' -mv4'
160	. ' -part'	162	. ' -part'