Bump --pc-quality parameters, set minimum cap

pull/1215/head
Piero Toffanin 2020-12-08 16:52:09 +00:00
rodzic fe96407e9e
commit 671b4058ee
3 zmienionych plików z 8 dodań i 7 usunięć

Wyświetl plik

@ -370,7 +370,7 @@ def config(argv=None, parser=None):
metavar='<string>',
action=StoreValue,
default='medium',
choices=['ultra', 'high', 'medium', 'low'],
choices=['ultra', 'high', 'medium', 'low', 'lowest'],
help=('Set point cloud quality. Higher quality generates better, denser point clouds, but requires more memory and takes longer. Each step up in quality increases processing time roughly by a factor of 4x.'
'Can be one of: %(choices)s. Default: '
'%(default)s'))

Wyświetl plik

@ -8,16 +8,18 @@ def get_depthmap_resolution(args, photos):
return int(args.depthmap_resolution)
else:
max_dim = find_largest_photo_dim(photos)
min_dim = 320 # Never go lower than this
pc_quality_scale = {
'ultra': 0.5,
'high': 0.25,
'medium': 0.125,
'low': 0.0675
'ultra': 1,
'high': 0.5,
'medium': 0.25,
'low': 0.125,
'lowest': 0.0675
}
if max_dim > 0:
return int(max_dim * pc_quality_scale[args.pc_quality])
return max(min_dim, int(max_dim * pc_quality_scale[args.pc_quality]))
else:
log.ODM_WARNING("Cannot compute max image dimensions, going with default depthmap_resolution of 640")
return 640 # Sensible default

Wyświetl plik

@ -38,7 +38,6 @@ class ODMOpenMVSStage(types.ODM_Stage):
os.mkdir(depthmaps_dir)
depthmap_resolution = get_depthmap_resolution(args, photos)
if outputs["undist_image_max_size"] <= depthmap_resolution:
resolution_level = 0
else: