Author: duncan
Date: Fri Jan 11 13:12:08 2008
New Revision: 10283
Log:
[ 1868942 ] fix reencode for complaining about nonexistant REENCODE_NUM
Patch from Jonathan Isom applied
Modified:
branches/rel-1-7/freevo/freevo_config.py
branches/rel-1-7/freevo/src/encodingcore.py
branches/rel-1-7/freevo/src/video/plugins/dvdbackup.py
branches/rel-1-7/freevo/src/video/plugins/reencode.py
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/src/encodingcore.py
branches/rel-1/freevo/src/video/plugins/dvdbackup.py
branches/rel-1/freevo/src/video/plugins/reencode.py
Modified: branches/rel-1-7/freevo/freevo_config.py
==============================================================================
--- branches/rel-1-7/freevo/freevo_config.py (original)
+++ branches/rel-1-7/freevo/freevo_config.py Fri Jan 11 13:12:08 2008
@@ -2024,8 +2024,8 @@
ENCODINGSERVER_MENCODER_VIDEO_MAPPING = {
'MPEG 4 (lavc)' : [ 'lavc', '-lavcopts',
'vcodec=mpeg4:mbd=2:trell:v4mv:last_pred=2:dia=-1:vmax_b_frames=2:vb_strategy=1:cmp=3:subcmp=3:precmp=0:vqcomp=0.6:vbitrate=%s:threads=%s%s%s'],
'MPEG 2 (lavc)' : [ 'lavc', '-lavcopts',
'vcodec=mpeg2video:vhq:vqmin=2:trell:vrc_buf_size=1835:vrc_maxrate=9800:keyint=18:vstrict=0:vbitrate=%s:threads=%s%s%s'],
- 'XviD' : [ 'xvid', '-xvidencopts',
'chroma_opt:vhq=4:bvhq=1:quant_type=mpeg:bitrate=%s:threads=%s%s%s'],
- 'H.264' : [ 'lavc', '-lavcopts',
'subq=5:8x8dct:frameref=2:bframes=3:b_pyramid:weight_b:vcodec=libx264:vbitrate=%s:threads=%s%s%s']
+ 'XviD' : [ 'xvid', '-xvidencopts',
'chroma_opt:vhq=4:bvhq=1:bitrate=%s:threads=%s%s%s'],
+ 'H.264' : [ 'x264', '-x264encopts',
'subq=5:8x8dct:frameref=2:bframes=3:b_pyramid:weight_b:bitrate=%s:threads=%s%s%s']
}
ENCODINGSERVER_MENCODER_FILE_MAPPING = {
@@ -2041,7 +2041,7 @@
'ac3' : ['lavc', '-lavcopts',
'acodec=ac3:abitrate=%s:aglobal=1'],
'MPEG 1 Layer 2 (mp2)' : ['lavc', '-lavcopts',
'acodec=mp2:abitrate=%s:aglobal=1'],
'vorbis' : ['lavc', '-lavcopts',
'acodec=vorbis:abitrate=%s:aglobal=1'],
- 'copy' : ['copy', '' ,'%s']
+ 'copy' : ['copy']
}
Modified: branches/rel-1-7/freevo/src/encodingcore.py
==============================================================================
--- branches/rel-1-7/freevo/src/encodingcore.py (original)
+++ branches/rel-1-7/freevo/src/encodingcore.py Fri Jan 11 13:12:08 2008
@@ -190,7 +190,7 @@
def getVideoFiltersList(self):
"""Return a list of possible video filters"""
- if self.fps == 29.970 :
+ if self.fps == 29.970:
return VideoFilters
else:
non_ivtcdict = VideoFilters.copy()
@@ -204,10 +204,10 @@
self.vfilters += [ MencoderFilters[option] ]
def setVideoRes(self, videores):
- if(videores == 'Optimal'):
- (self.resx, self.resy ) = (0, 0)
+ if videores == 'Optimal':
+ (self.resx, self.resy) = (0, 0)
else:
- (self.resx, self.resy ) = videores.split(':')
+ (self.resx, self.resy) = videores.split(':')
def setNumThreads(self, numthreads):
self.threads = numthreads
@@ -253,7 +253,6 @@
else:
self.length = 600
_debug_('Video length not found, using %s' % (self.length))
- #NI : maybe implement procedure to get resolution, handy for
scaling/manual cropping
self._CropDetect()
@@ -325,7 +324,7 @@
apro = ''
#deinterlacer test vf += ['pp=lb']
#set appropriate videopass, codec independant (lavc is vpass, xvid is
pass)
- if passnr > 0 :
+ if passnr > 0:
if self.vcodec == 'XviD':
passname = ':pass=%s'
else:
@@ -333,7 +332,7 @@
vpass = passname % passnr
- if self.vcodec == 'MPEG 4 (lavc)' and passnr == 1 :
+ if self.vcodec == 'MPEG 4 (lavc)' and passnr == 1:
vpass = vpass + ':turbo'
#generate videofilters first, NI completly yet
@@ -356,23 +355,24 @@
#new, calculate ideal res based on BPP
idealres = self._OptimalRes(self.cropres[0], int(yscaled))
_debug_('Rescaled, rounded yres is %sx%s' % (idealres[0],
idealres[1]))
- (self.resx, self.resy ) = (idealres[0], idealres[1])
+ (self.resx, self.resy) = (idealres[0], idealres[1])
# Check to see if generating a dvd complient mpeg
- elif(self.vcodec == 'MPEG 2 (lavc)' and self.resx == '720' ):
- if(self.fps == 25.000 or self.fps == 50):
+ elif self.vcodec == 'MPEG 2 (lavc)' and self.resx == '720':
+ if self.fps == 25.000 or self.fps == 50:
self.resx=720
self.resy=576
else:
self.resx=720
self.resy=480
- if(self.resx==0 and self.crop):
- (self.resx, self.resy ) = self._OptimalRes(self.cropres[0],
self.cropres[1])
- elif(self.resx==0):
- (self.resx, self.resy ) =
self._OptimalRes(self.info.video[0].width, self.info.video[0].height )
-
- vf += [ 'scale=%s:-3' % self.resx ]
- vf += [ 'expand=%s:%s' % (self.resx, self.resy ) ]
+ if self.resx==0 and self.crop:
+ (self.resx, self.resy) = self._OptimalRes(self.cropres[0],
self.cropres[1])
+ elif self.resx==0:
+ (self.resx, self.resy) =
self._OptimalRes(self.info.video[0].width, self.info.video[0].height )
+
+ if self.resx != None:
+ vf += [ 'scale=%s:-3' % self.resx ]
+ vf += [ 'expand=%s:%s' % (self.resx, self.resy) ]
_debug_('Video filters: %s' % vf)
@@ -380,25 +380,26 @@
#join vf options
if len(vf) > 1:
for vfopt in vf[0:-1]:
- vfilter += vfopt + ', '
+ vfilter += vfopt + ','
if len(vf) >= 1:
vfilter += vf[-1]
output=self.output
- aspect= ':autoaspect'
- if (self.vcodec=='MPEG 2 (lavc)' and self.cropres[0] != '720' ):
- if(self.ana == True ):
+ aspect= ''
+ if self.vcodec=='MPEG 2 (lavc)' and self.cropres[0] != '720':
+ if self.ana == True:
aspect=':aspect=16/9'
else:
aspect=':aspect=4/3'
+ elif self.vcodec!='H.264':
+ aspect = 'autoaspect'
- if( self.altprofile == None ):
+ if self.altprofile == None:
args = [
'-oac', MencoderAudioMapping[self.acodec][0],
'-ovc', MencoderVideoMapping[self.vcodec][0],
MencoderVideoMapping[self.vcodec][1],
MencoderVideoMapping[self.vcodec][2] % (self.vbrate,
self.threads, vpass, aspect ),
- MencoderAudioMapping[self.acodec][1],
(MencoderAudioMapping[self.acodec][2] % self.abrate),
'-o', output]
else: # Allow encoder options from client
apro = '%s:vbitrate=%s:threads=%s%s%s' % (self.altprofile,
self.vbrate, self.threads, vpass, aspect)
@@ -406,31 +407,36 @@
'-oac', MencoderAudioMapping[self.acodec][0],
'-ovc', MencoderVideoMapping[self.vcodec][0],
MencoderVideoMapping[self.vcodec][1],
apro,
- MencoderAudioMapping[self.acodec][1],
(MencoderAudioMapping[self.acodec][2] % self.abrate),
'-o', output]
+
+ args += [ '-oac', MencoderAudioMapping[self.acodec][0] ]
+ if self.acodec != 'copy':
+ args += [ MencoderAudioMapping[self.acodec][1],
(MencoderAudioMapping[self.acodec][2] % self.abrate)]
+
+
# don't pass video filter in we have none
- if (len(vfilter) != '') :
+ if len(vfilter) != '':
args += ['-vf', vfilter ]
- if passnr > 0 : # Remove when/if mencoder uses the same file name for
all codecs
+ if passnr > 0: # Remove when/if mencoder uses the same file name for
all codecs
args += [ '-passlogfile', 'x264_2pass.log' ]
#if we have a progressive ntsc file, lock the output fps (do this with
ivtc too)
- if ('ivtc=1' in vf) or (self.fps == 23.976):
+ if 'ivtc=1' in vf or self.fps == 23.976:
args = ['-ofps', '24000/1001'].append(args) # mencoder don't like
23.976
- if (hasattr(config, 'DVD_LANG_PREF') and config.DVD_LANG_PREF):
+ if hasattr(config, 'DVD_LANG_PREF') and config.DVD_LANG_PREF:
args += ['-alang', config.DVD_LANG_PREF ]
- if (self.vcodec=='MPEG 2 (lavc)'):
- if (self.fps == 25.000 or self.fps == 50.000):
+ if self.vcodec=='MPEG 2 (lavc)':
+ if self.fps == 25.000 or self.fps == 50.000:
args += ['-ofps', '25.000']
else:
args += ['-ofps', '30000/1001'] # mencoder don't like 29.97
# Set output file type
- if ('mp4' == self.container and 'iPodv' == self.vcodec):
+ if 'mp4' == self.container and 'iPodv' == self.vcodec:
args += ['-of', MencoderFileMapping[self.container][0],
MencoderFileMapping[self.container][1],
MencoderFileMapping[self.container][2],
MencoderFileMapping[self.container][3],
MencoderFileMapping[self.container][4] ]
@@ -513,13 +519,13 @@
if re_ana2.search(line):
self.ana = False
elif re_ana3.search(line):
- if not ( (self.info.video[0].haskey('width')/
self.info.video[0].haskey('height')) >1.3334) :
+ if not (self.info.video[0].haskey('width') /
self.info.video[0].haskey('height')) > 1.3334:
self.ana = False
else:
self.ana = True
if hasattr(self.info, 'aspect'):
- if (int(self.info.aspect*100)==1.33):
+ if int(self.info.aspect*100) == 1.33:
self.ana = False
else:
self.ana = True
@@ -756,7 +762,7 @@
_debug_('queue empty, stopping processing...', DINFO)
return
- _debug_('runQueue callback data : %s' % line)
+ _debug_('runQueue callback data: %s' % line)
#get the first queued object
self.currentjob = self.qlist[0]
@@ -796,7 +802,7 @@
if self.currentjob.status == status.notset:
#generate cli's
self.currentjob._generateCL()
- _debug_('CLIs : %s' % self.currentjob.cls)
+ _debug_('CLIs: %s' % self.currentjob.cls)
#clean out temporary files
self._removeTmp()
Modified: branches/rel-1-7/freevo/src/video/plugins/dvdbackup.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/plugins/dvdbackup.py (original)
+++ branches/rel-1-7/freevo/src/video/plugins/dvdbackup.py Fri Jan 11
13:12:08 2008
@@ -80,14 +80,18 @@
def encoding_profile_menu(self, menuw=None, arg=None):
#create a menu with a few encoding options (1cd, 2cd, xvid, mpeg4)
#args : tuple, (videocodec, size, multipass
- menu_items = [ menu.MenuItem("XviD, 700mb", self.create_job,
(1,700,False,0)) ]
- menu_items.append( menu.MenuItem("XviD, 700mb, High Quality",
self.create_job, (1,700,True,0)) )
- menu_items.append( menu.MenuItem("XviD, 1400mb", self.create_job,
(1,1400,False,0)) )
- menu_items.append( menu.MenuItem("XviD, 1400mb, High Quality",
self.create_job, (1,1400,True,0)) )
- menu_items.append( menu.MenuItem("DivX, 700mb", self.create_job,
(0,700,False,0)) )
- menu_items.append( menu.MenuItem("DivX, 700mb, High Quality",
self.create_job, (0,700,True,0)) )
- menu_items.append( menu.MenuItem("DivX, 1400mb", self.create_job,
(0,1400,False,0)) )
- menu_items.append( menu.MenuItem("DivX, 1400mb, High Quality",
self.create_job, (0,1400,True,0)) )
+ menu_items = [ menu.MenuItem("XviD, 700mb", self.create_job,
(2,700,False,0)) ]
+ menu_items.append( menu.MenuItem("XviD, 700mb, High Quality",
self.create_job, (2,700,True,0)) )
+ menu_items.append( menu.MenuItem("XviD, 1400mb", self.create_job,
(2,1400,False,0)) )
+ menu_items.append( menu.MenuItem("XviD, 1400mb, High Quality",
self.create_job, (2,1400,True,0)) )
+ menu_items.append( menu.MenuItem("MPEG4, 700mb", self.create_job,
(0,700,False,0)) )
+ menu_items.append( menu.MenuItem("MPEG4, 700mb, High Quality",
self.create_job, (0,700,True,0)) )
+ menu_items.append( menu.MenuItem("MPEG4, 1400mb", self.create_job,
(0,1400,False,0)) )
+ menu_items.append( menu.MenuItem("MPEG4, 1400mb, High Quality",
self.create_job, (0,1400,True,0)) )
+ menu_items.append( menu.MenuItem("h.264, 700mb", self.create_job,
(3,700,False,0)) )
+ menu_items.append( menu.MenuItem("h.264, 700mb, High Quality",
self.create_job, (3,700,True,0)) )
+ menu_items.append( menu.MenuItem("h.264, 1400mb", self.create_job,
(3,1400,False,0)) )
+ menu_items.append( menu.MenuItem("h.264, 1400mb, High Quality",
self.create_job, (3,1400,True,0)) )
encoding_menu = menu.Menu(_('Choose your encoding profile'),
menu_items)
menuw.pushmenu(encoding_menu)
Modified: branches/rel-1-7/freevo/src/video/plugins/reencode.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/plugins/reencode.py (original)
+++ branches/rel-1-7/freevo/src/video/plugins/reencode.py Fri Jan 11
13:12:08 2008
@@ -88,6 +88,7 @@
('REENCODE_AUDIOBITRATE', '128', 'Audio bit rate'),
('REENCODE_NUMPASSES', '2', 'Number of passes'),
('REENCODE_VIDEOFILTER', 'None', 'Video Filter'),
+ ('REENCODE_NUMTHREADS','1','Number of Encoding Threads'),
]
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Fri Jan 11 13:12:08 2008
@@ -2029,8 +2029,8 @@
ENCODINGSERVER_MENCODER_VIDEO_MAPPING = {
'MPEG 4 (lavc)' : [ 'lavc', '-lavcopts',
'vcodec=mpeg4:mbd=2:trell:v4mv:last_pred=2:dia=-1:vmax_b_frames=2:vb_strategy=1:cmp=3:subcmp=3:precmp=0:vqcomp=0.6:vbitrate=%s:threads=%s%s%s'],
'MPEG 2 (lavc)' : [ 'lavc', '-lavcopts',
'vcodec=mpeg2video:vhq:vqmin=2:trell:vrc_buf_size=1835:vrc_maxrate=9800:keyint=18:vstrict=0:vbitrate=%s:threads=%s%s%s'],
- 'XviD' : [ 'xvid', '-xvidencopts',
'chroma_opt:vhq=4:bvhq=1:quant_type=mpeg:bitrate=%s:threads=%s%s%s'],
- 'H.264' : [ 'lavc', '-lavcopts',
'subq=5:8x8dct:frameref=2:bframes=3:b_pyramid:weight_b:vcodec=libx264:vbitrate=%s:threads=%s%s%s']
+ 'XviD' : [ 'xvid', '-xvidencopts',
'chroma_opt:vhq=4:bvhq=1:bitrate=%s:threads=%s%s%s'],
+ 'H.264' : [ 'x264', '-x264encopts',
'subq=5:8x8dct:frameref=2:bframes=3:b_pyramid:weight_b:bitrate=%s:threads=%s%s%s']
}
ENCODINGSERVER_MENCODER_FILE_MAPPING = {
@@ -2046,7 +2046,7 @@
'ac3' : ['lavc', '-lavcopts',
'acodec=ac3:abitrate=%s:aglobal=1'],
'MPEG 1 Layer 2 (mp2)' : ['lavc', '-lavcopts',
'acodec=mp2:abitrate=%s:aglobal=1'],
'vorbis' : ['lavc', '-lavcopts',
'acodec=vorbis:abitrate=%s:aglobal=1'],
- 'copy' : ['copy', '' ,'%s']
+ 'copy' : ['copy']
}
Modified: branches/rel-1/freevo/src/encodingcore.py
==============================================================================
--- branches/rel-1/freevo/src/encodingcore.py (original)
+++ branches/rel-1/freevo/src/encodingcore.py Fri Jan 11 13:12:08 2008
@@ -190,7 +190,7 @@
def getVideoFiltersList(self):
"""Return a list of possible video filters"""
- if self.fps == 29.970 :
+ if self.fps == 29.970:
return VideoFilters
else:
non_ivtcdict = VideoFilters.copy()
@@ -204,10 +204,10 @@
self.vfilters += [ MencoderFilters[option] ]
def setVideoRes(self, videores):
- if(videores == 'Optimal'):
- (self.resx, self.resy ) = (0, 0)
+ if videores == 'Optimal':
+ (self.resx, self.resy) = (0, 0)
else:
- (self.resx, self.resy ) = videores.split(':')
+ (self.resx, self.resy) = videores.split(':')
def setNumThreads(self, numthreads):
self.threads = numthreads
@@ -253,7 +253,6 @@
else:
self.length = 600
_debug_('Video length not found, using %s' % (self.length))
- #NI : maybe implement procedure to get resolution, handy for
scaling/manual cropping
self._CropDetect()
@@ -325,7 +324,7 @@
apro = ''
#deinterlacer test vf += ['pp=lb']
#set appropriate videopass, codec independant (lavc is vpass, xvid is
pass)
- if passnr > 0 :
+ if passnr > 0:
if self.vcodec == 'XviD':
passname = ':pass=%s'
else:
@@ -333,7 +332,7 @@
vpass = passname % passnr
- if self.vcodec == 'MPEG 4 (lavc)' and passnr == 1 :
+ if self.vcodec == 'MPEG 4 (lavc)' and passnr == 1:
vpass = vpass + ':turbo'
#generate videofilters first, NI completly yet
@@ -356,23 +355,24 @@
#new, calculate ideal res based on BPP
idealres = self._OptimalRes(self.cropres[0], int(yscaled))
_debug_('Rescaled, rounded yres is %sx%s' % (idealres[0],
idealres[1]))
- (self.resx, self.resy ) = (idealres[0], idealres[1])
+ (self.resx, self.resy) = (idealres[0], idealres[1])
# Check to see if generating a dvd complient mpeg
- elif(self.vcodec == 'MPEG 2 (lavc)' and self.resx == '720' ):
- if(self.fps == 25.000 or self.fps == 50):
+ elif self.vcodec == 'MPEG 2 (lavc)' and self.resx == '720':
+ if self.fps == 25.000 or self.fps == 50:
self.resx=720
self.resy=576
else:
self.resx=720
self.resy=480
- if(self.resx==0 and self.crop):
- (self.resx, self.resy ) = self._OptimalRes(self.cropres[0],
self.cropres[1])
- elif(self.resx==0):
- (self.resx, self.resy ) =
self._OptimalRes(self.info.video[0].width, self.info.video[0].height )
-
- vf += [ 'scale=%s:-3' % self.resx ]
- vf += [ 'expand=%s:%s' % (self.resx, self.resy ) ]
+ if self.resx==0 and self.crop:
+ (self.resx, self.resy) = self._OptimalRes(self.cropres[0],
self.cropres[1])
+ elif self.resx==0:
+ (self.resx, self.resy) =
self._OptimalRes(self.info.video[0].width, self.info.video[0].height )
+
+ if self.resx != None:
+ vf += [ 'scale=%s:-3' % self.resx ]
+ vf += [ 'expand=%s:%s' % (self.resx, self.resy) ]
_debug_('Video filters: %s' % vf)
@@ -380,25 +380,26 @@
#join vf options
if len(vf) > 1:
for vfopt in vf[0:-1]:
- vfilter += vfopt + ', '
+ vfilter += vfopt + ','
if len(vf) >= 1:
vfilter += vf[-1]
output=self.output
- aspect= ':autoaspect'
- if (self.vcodec=='MPEG 2 (lavc)' and self.cropres[0] != '720' ):
- if(self.ana == True ):
+ aspect= ''
+ if self.vcodec=='MPEG 2 (lavc)' and self.cropres[0] != '720':
+ if self.ana == True:
aspect=':aspect=16/9'
else:
aspect=':aspect=4/3'
+ elif self.vcodec!='H.264':
+ aspect = 'autoaspect'
- if( self.altprofile == None ):
+ if self.altprofile == None:
args = [
'-oac', MencoderAudioMapping[self.acodec][0],
'-ovc', MencoderVideoMapping[self.vcodec][0],
MencoderVideoMapping[self.vcodec][1],
MencoderVideoMapping[self.vcodec][2] % (self.vbrate,
self.threads, vpass, aspect ),
- MencoderAudioMapping[self.acodec][1],
(MencoderAudioMapping[self.acodec][2] % self.abrate),
'-o', output]
else: # Allow encoder options from client
apro = '%s:vbitrate=%s:threads=%s%s%s' % (self.altprofile,
self.vbrate, self.threads, vpass, aspect)
@@ -406,31 +407,36 @@
'-oac', MencoderAudioMapping[self.acodec][0],
'-ovc', MencoderVideoMapping[self.vcodec][0],
MencoderVideoMapping[self.vcodec][1],
apro,
- MencoderAudioMapping[self.acodec][1],
(MencoderAudioMapping[self.acodec][2] % self.abrate),
'-o', output]
+
+ args += [ '-oac', MencoderAudioMapping[self.acodec][0] ]
+ if self.acodec != 'copy':
+ args += [ MencoderAudioMapping[self.acodec][1],
(MencoderAudioMapping[self.acodec][2] % self.abrate)]
+
+
# don't pass video filter in we have none
- if (len(vfilter) != '') :
+ if len(vfilter) != '':
args += ['-vf', vfilter ]
- if passnr > 0 : # Remove when/if mencoder uses the same file name for
all codecs
+ if passnr > 0: # Remove when/if mencoder uses the same file name for
all codecs
args += [ '-passlogfile', 'x264_2pass.log' ]
#if we have a progressive ntsc file, lock the output fps (do this with
ivtc too)
- if ('ivtc=1' in vf) or (self.fps == 23.976):
+ if 'ivtc=1' in vf or self.fps == 23.976:
args = ['-ofps', '24000/1001'].append(args) # mencoder don't like
23.976
- if (hasattr(config, 'DVD_LANG_PREF') and config.DVD_LANG_PREF):
+ if hasattr(config, 'DVD_LANG_PREF') and config.DVD_LANG_PREF:
args += ['-alang', config.DVD_LANG_PREF ]
- if (self.vcodec=='MPEG 2 (lavc)'):
- if (self.fps == 25.000 or self.fps == 50.000):
+ if self.vcodec=='MPEG 2 (lavc)':
+ if self.fps == 25.000 or self.fps == 50.000:
args += ['-ofps', '25.000']
else:
args += ['-ofps', '30000/1001'] # mencoder don't like 29.97
# Set output file type
- if ('mp4' == self.container and 'iPodv' == self.vcodec):
+ if 'mp4' == self.container and 'iPodv' == self.vcodec:
args += ['-of', MencoderFileMapping[self.container][0],
MencoderFileMapping[self.container][1],
MencoderFileMapping[self.container][2],
MencoderFileMapping[self.container][3],
MencoderFileMapping[self.container][4] ]
@@ -513,13 +519,13 @@
if re_ana2.search(line):
self.ana = False
elif re_ana3.search(line):
- if not ( (self.info.video[0].haskey('width')/
self.info.video[0].haskey('height')) >1.3334) :
+ if not (self.info.video[0].haskey('width') /
self.info.video[0].haskey('height')) > 1.3334:
self.ana = False
else:
self.ana = True
if hasattr(self.info, 'aspect'):
- if (int(self.info.aspect*100)==1.33):
+ if int(self.info.aspect*100) == 1.33:
self.ana = False
else:
self.ana = True
@@ -756,7 +762,7 @@
_debug_('queue empty, stopping processing...', DINFO)
return
- _debug_('runQueue callback data : %s' % line)
+ _debug_('runQueue callback data: %s' % line)
#get the first queued object
self.currentjob = self.qlist[0]
@@ -796,7 +802,7 @@
if self.currentjob.status == status.notset:
#generate cli's
self.currentjob._generateCL()
- _debug_('CLIs : %s' % self.currentjob.cls)
+ _debug_('CLIs: %s' % self.currentjob.cls)
#clean out temporary files
self._removeTmp()
Modified: branches/rel-1/freevo/src/video/plugins/dvdbackup.py
==============================================================================
--- branches/rel-1/freevo/src/video/plugins/dvdbackup.py (original)
+++ branches/rel-1/freevo/src/video/plugins/dvdbackup.py Fri Jan 11
13:12:08 2008
@@ -80,14 +80,18 @@
def encoding_profile_menu(self, menuw=None, arg=None):
#create a menu with a few encoding options (1cd, 2cd, xvid, mpeg4)
#args : tuple, (videocodec, size, multipass
- menu_items = [ menu.MenuItem("XviD, 700mb", self.create_job,
(1,700,False,0)) ]
- menu_items.append( menu.MenuItem("XviD, 700mb, High Quality",
self.create_job, (1,700,True,0)) )
- menu_items.append( menu.MenuItem("XviD, 1400mb", self.create_job,
(1,1400,False,0)) )
- menu_items.append( menu.MenuItem("XviD, 1400mb, High Quality",
self.create_job, (1,1400,True,0)) )
- menu_items.append( menu.MenuItem("DivX, 700mb", self.create_job,
(0,700,False,0)) )
- menu_items.append( menu.MenuItem("DivX, 700mb, High Quality",
self.create_job, (0,700,True,0)) )
- menu_items.append( menu.MenuItem("DivX, 1400mb", self.create_job,
(0,1400,False,0)) )
- menu_items.append( menu.MenuItem("DivX, 1400mb, High Quality",
self.create_job, (0,1400,True,0)) )
+ menu_items = [ menu.MenuItem("XviD, 700mb", self.create_job,
(2,700,False,0)) ]
+ menu_items.append( menu.MenuItem("XviD, 700mb, High Quality",
self.create_job, (2,700,True,0)) )
+ menu_items.append( menu.MenuItem("XviD, 1400mb", self.create_job,
(2,1400,False,0)) )
+ menu_items.append( menu.MenuItem("XviD, 1400mb, High Quality",
self.create_job, (2,1400,True,0)) )
+ menu_items.append( menu.MenuItem("MPEG4, 700mb", self.create_job,
(0,700,False,0)) )
+ menu_items.append( menu.MenuItem("MPEG4, 700mb, High Quality",
self.create_job, (0,700,True,0)) )
+ menu_items.append( menu.MenuItem("MPEG4, 1400mb", self.create_job,
(0,1400,False,0)) )
+ menu_items.append( menu.MenuItem("MPEG4, 1400mb, High Quality",
self.create_job, (0,1400,True,0)) )
+ menu_items.append( menu.MenuItem("h.264, 700mb", self.create_job,
(3,700,False,0)) )
+ menu_items.append( menu.MenuItem("h.264, 700mb, High Quality",
self.create_job, (3,700,True,0)) )
+ menu_items.append( menu.MenuItem("h.264, 1400mb", self.create_job,
(3,1400,False,0)) )
+ menu_items.append( menu.MenuItem("h.264, 1400mb, High Quality",
self.create_job, (3,1400,True,0)) )
encoding_menu = menu.Menu(_('Choose your encoding profile'),
menu_items)
menuw.pushmenu(encoding_menu)
Modified: branches/rel-1/freevo/src/video/plugins/reencode.py
==============================================================================
--- branches/rel-1/freevo/src/video/plugins/reencode.py (original)
+++ branches/rel-1/freevo/src/video/plugins/reencode.py Fri Jan 11 13:12:08 2008
@@ -88,6 +88,7 @@
('REENCODE_AUDIOBITRATE', '128', 'Audio bit rate'),
('REENCODE_NUMPASSES', '2', 'Number of passes'),
('REENCODE_VIDEOFILTER', 'None', 'Video Filter'),
+ ('REENCODE_NUMTHREADS','1','Number of Encoding Threads'),
]
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
