mirror
/
OpenDroneMap-ODM
kopia lustrzana https://github.com/OpenDroneMap/ODM
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #1407 from pierotofy/opkimp 

Ability to skip visibility filtering
pull/1408/head
Piero Toffanin 2022-01-18 11:47:35 -05:00 zatwierdzone przez GitHub
rodzic 09cb979aae 851030ff49
commit cbb62bfab0
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
4 zmienionych plików z 42 dodań i 20 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
VERSION
Wyświetl plik

@ -1 +1 @@
2.7.1 2.7.2

2
opendm/config.py
Wyświetl plik

@ -122,7 +122,7 @@ def config(argv=None, parser=None):
parser.add_argument('--min-num-features', parser.add_argument('--min-num-features',
metavar='<integer>', metavar='<integer>',
action=StoreValue, action=StoreValue,
default=8000, default=10000,
type=int, type=int,
help=('Minimum number of features to extract per image. ' help=('Minimum number of features to extract per image. '
'More features can be useful for finding more matches between images, ' 'More features can be useful for finding more matches between images, '

7
opendm/photo.py
Wyświetl plik

@ -175,12 +175,14 @@ class ODM_Photo:
if 'Image Make' in tags: if 'Image Make' in tags:
try: try:
self.camera_make = tags['Image Make'].values self.camera_make = tags['Image Make'].values
self.camera_make = self.camera_make.strip()
except UnicodeDecodeError: except UnicodeDecodeError:
log.ODM_WARNING("EXIF Image Make might be corrupted") log.ODM_WARNING("EXIF Image Make might be corrupted")
self.camera_make = "unknown" self.camera_make = "unknown"
if 'Image Model' in tags: if 'Image Model' in tags:
try: try:
self.camera_model = tags['Image Model'].values self.camera_model = tags['Image Model'].values
self.camera_model = self.camera_model.strip()
except UnicodeDecodeError: except UnicodeDecodeError:
log.ODM_WARNING("EXIF Image Model might be corrupted") log.ODM_WARNING("EXIF Image Model might be corrupted")
self.camera_model = "unknown" self.camera_model = "unknown"
@ -350,8 +352,11 @@ class ODM_Photo:
# Pitch: 90 --> camera is looking forward # Pitch: 90 --> camera is looking forward
# Roll: 0 (assuming gimbal) # Roll: 0 (assuming gimbal)
if self.has_ypr(): if self.has_ypr():
if self.camera_make.lower() == 'dji': if self.camera_make.lower() in ['dji', 'hasselblad']:
self.pitch = 90 + self.pitch self.pitch = 90 + self.pitch
if self.camera_make.lower() == 'sensefly':
self.roll *= -1
except Exception as e: except Exception as e:
log.ODM_WARNING("Cannot read XMP tags for %s: %s" % (_path_file, str(e))) log.ODM_WARNING("Cannot read XMP tags for %s: %s" % (_path_file, str(e)))

51
stages/openmvs.py
Wyświetl plik

@ -56,17 +56,14 @@ class ODMOpenMVSStage(types.ODM_Stage):
log.ODM_INFO("Running dense reconstruction. This might take a while.") log.ODM_INFO("Running dense reconstruction. This might take a while.")
log.ODM_INFO("Estimating depthmaps") log.ODM_INFO("Estimating depthmaps")
number_views_fuse = 2
densify_ini_file = os.path.join(tree.openmvs, 'config.ini')
with open(densify_ini_file, 'w+') as f:
f.write("Optimize = 0\n") # Disable depth-maps re-filtering
config = [ config = [
" --resolution-level %s" % int(resolution_level), " --resolution-level %s" % int(resolution_level),
"--min-resolution %s" % depthmap_resolution, "--min-resolution %s" % depthmap_resolution,
"--max-resolution %s" % int(outputs['undist_image_max_size']), "--max-resolution %s" % int(outputs['undist_image_max_size']),
"--max-threads %s" % args.max_concurrency, "--max-threads %s" % args.max_concurrency,
"--number-views-fuse 2", "--number-views-fuse %s" % number_views_fuse,
'-w "%s"' % depthmaps_dir, '-w "%s"' % depthmaps_dir,
"-v 0" "-v 0"
] ]
@ -105,6 +102,11 @@ class ODMOpenMVSStage(types.ODM_Stage):
if args.pc_tile: if args.pc_tile:
log.ODM_INFO("Computing sub-scenes") log.ODM_INFO("Computing sub-scenes")
subscene_densify_ini_file = os.path.join(tree.openmvs, 'subscene-config.ini')
with open(subscene_densify_ini_file, 'w+') as f:
f.write("Optimize = 0\n")
config = [ config = [
"--sub-scene-area 660000", "--sub-scene-area 660000",
"--max-threads %s" % args.max_concurrency, "--max-threads %s" % args.max_concurrency,
@ -125,10 +127,11 @@ class ODMOpenMVSStage(types.ODM_Stage):
for sf in scene_files: for sf in scene_files:
p, _ = os.path.splitext(sf) p, _ = os.path.splitext(sf)
scene_ply_unfiltered = p + "_dense.ply"
scene_ply = p + "_dense_dense_filtered.ply" scene_ply = p + "_dense_dense_filtered.ply"
scene_dense_mvs = p + "_dense.mvs" scene_dense_mvs = p + "_dense.mvs"
files_to_remove += [scene_ply, sf, scene_dense_mvs] files_to_remove += [scene_ply, sf, scene_dense_mvs, scene_ply_unfiltered]
scene_ply_files.append(scene_ply) scene_ply_files.append(scene_ply)
if not io.file_exists(scene_ply) or self.rerun(): if not io.file_exists(scene_ply) or self.rerun():
@ -137,18 +140,26 @@ class ODMOpenMVSStage(types.ODM_Stage):
'--resolution-level %s' % int(resolution_level), '--resolution-level %s' % int(resolution_level),
'--min-resolution %s' % depthmap_resolution, '--min-resolution %s' % depthmap_resolution,
'--max-resolution %s' % int(outputs['undist_image_max_size']), '--max-resolution %s' % int(outputs['undist_image_max_size']),
'--dense-config-file "%s"' % densify_ini_file, '--dense-config-file "%s"' % subscene_densify_ini_file,
'--number-views-fuse 2', '--number-views-fuse %s' % number_views_fuse,
'--max-threads %s' % args.max_concurrency, '--max-threads %s' % args.max_concurrency,
'-w "%s"' % depthmaps_dir, '-w "%s"' % depthmaps_dir,
'-v 0', '-v 0',
] ]
if not args.pc_geometric:
config.append("--geometric-iters 0")
try: try:
system.run('"%s" "%s" %s' % (context.omvs_densify_path, sf, ' '.join(config + gpu_config))) system.run('"%s" "%s" %s' % (context.omvs_densify_path, sf, ' '.join(config + gpu_config)))
# Filter # Filter
system.run('"%s" "%s" --filter-point-cloud -1 -v 0 %s' % (context.omvs_densify_path, scene_dense_mvs, ' '.join(gpu_config))) if args.pc_filter > 0:
system.run('"%s" "%s" --filter-point-cloud -1 -v 0 %s' % (context.omvs_densify_path, scene_dense_mvs, ' '.join(gpu_config)))
else:
# Just rename
log.ODM_INFO("Skipped filtering, %s --> %s" % (scene_ply_unfiltered, scene_ply))
os.rename(scene_ply_unfiltered, scene_ply)
except: except:
log.ODM_WARNING("Sub-scene %s could not be reconstructed, skipping..." % sf) log.ODM_WARNING("Sub-scene %s could not be reconstructed, skipping..." % sf)
@ -171,15 +182,21 @@ class ODMOpenMVSStage(types.ODM_Stage):
fast_merge_ply(scene_ply_files, tree.openmvs_model) fast_merge_ply(scene_ply_files, tree.openmvs_model)
else: else:
# Filter all at once # Filter all at once
if os.path.exists(scene_dense): if args.pc_filter > 0:
config = [ if os.path.exists(scene_dense):
"--filter-point-cloud -1", config = [
'-i "%s"' % scene_dense, "--filter-point-cloud -1",
"-v 0" '-i "%s"' % scene_dense,
] "-v 0"
system.run('"%s" %s' % (context.omvs_densify_path, ' '.join(config + gpu_config))) ]
system.run('"%s" %s' % (context.omvs_densify_path, ' '.join(config + gpu_config)))
else:
raise system.ExitException("Cannot find scene_dense.mvs, dense reconstruction probably failed. Exiting...")
else: else:
raise system.ExitException("Cannot find scene_dense.mvs, dense reconstruction probably failed. Exiting...") # Just rename
scene_dense_ply = os.path.join(tree.openmvs, 'scene_dense.ply')
log.ODM_INFO("Skipped filtering, %s --> %s" % (scene_dense_ply, tree.openmvs_model))
os.rename(scene_dense_ply, tree.openmvs_model)
# TODO: add support for image masks # TODO: add support for image masks