[Quickrip-cvs] quickrip dvd.py,1.19,1.20

[<jh...@us...>]

Update of /cvsroot/quickrip/quickrip
In directory sc8-pr-cvs1:/tmp/cvs-serv2629

Modified Files:
	dvd.py 
Log Message:
Removed vratetol option and changed bitrate adjustment back to 0.98. vratetol
doesn't make much difference for one-pass and makes NO difference for two-
and three-pass file sizes.


Index: dvd.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/dvd.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** dvd.py	25 Jun 2003 12:51:37 -0000	1.19
--- dvd.py	26 Jun 2003 03:22:10 -0000	1.20
***************
*** 126,130 ****
  			self.audiobr = int(audiobr)
  			self.rate = ((((self.filesize*1024*8)/1000)*1024)-(self.audiobr*self.length))/(self.length);
! 			self.rate = self.rate * 0.98  # Correction based on addition of credits and usual error
  			return self.rate
  		except:
--- 126,130 ----
  			self.audiobr = int(audiobr)
  			self.rate = ((((self.filesize*1024*8)/1000)*1024)-(self.audiobr*self.length))/(self.length);
! 			self.rate = self.rate * 0.96  # Correction based on addition of credits and usual error
  			return self.rate
  		except:
***************
*** 294,298 ****
  
  			if self.config['passes'] is 1:
! 				all_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "cbr=" + str(self.track['abr']) + str(self.vol), "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vratetol=1000:vbitrate=", str(int(self.track['vbr']))]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  
  				if int(self.config['deinterlacing']) is 1:
--- 294,298 ----
  
  			if self.config['passes'] is 1:
! 				all_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "cbr=" + str(self.track['abr']) + str(self.vol), "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vbitrate=", str(int(self.track['vbr']))]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  
  				if int(self.config['deinterlacing']) is 1:
***************
*** 342,346 ****
  			elif not self.config['passes'] or self.config['passes'] is 2:
  				audio_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "".join(["cbr=", str(self.track['abr']), str(self.vol)]), "-ovc",  "frameno", "-o", "".join([self.outdir, "frameno.avi"]), "2>/dev/null"]
! 				video_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vratetol=1000:vbitrate=", str(int(self.track['vbr']))]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  				
  				if int(self.config['deinterlacing']) is 1:
--- 342,346 ----
  			elif not self.config['passes'] or self.config['passes'] is 2:
  				audio_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "".join(["cbr=", str(self.track['abr']), str(self.vol)]), "-ovc",  "frameno", "-o", "".join([self.outdir, "frameno.avi"]), "2>/dev/null"]
! 				video_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vbitrate=", str(int(self.track['vbr']))]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  				
  				if int(self.config['deinterlacing']) is 1:
***************
*** 421,426 ****
  			elif self.config['passes'] is 3:
  				audio_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "cbr=" + str(self.track['abr']) + str(self.vol), "-ovc",  "frameno", "-o", self.outdir + "frameno.avi", "2>/dev/null"]
! 				video_pass1 = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vratetol=1000:vbitrate=", str(int(self.track['vbr'])), ":vpass=1"]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", "/dev/null", "2>/dev/null"]
! 				video_pass2 = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vratetol=1000:vbitrate=", str(int(self.track['vbr'])), ":vpass=2"]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  
  				if int(self.config['deinterlacing']) is 1:
--- 421,426 ----
  			elif self.config['passes'] is 3:
  				audio_pass = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-alang", self.aLanguage, "-oac",  "mp3lame",  "-lameopts",  "cbr=" + str(self.track['abr']) + str(self.vol), "-ovc",  "frameno", "-o", self.outdir + "frameno.avi", "2>/dev/null"]
! 				video_pass1 = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vbitrate=", str(int(self.track['vbr'])), ":vpass=1"]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", "/dev/null", "2>/dev/null"]
! 				video_pass2 = [str(self.config['mencoder']), "-dvd", str(self.track['id']), "-sws", "2", "-oac", "copy", "-ovc", "lavc", "-lavcopts", "".join(["vcodec=mpeg4:vhq:vbitrate=", str(int(self.track['vbr'])), ":vpass=2"]), "-vop", "".join(["scale,crop=", self.track['crop']]), "-zoom", "-xy", resolution, "-o", self.output, "2>/dev/null"]
  
  				if int(self.config['deinterlacing']) is 1: