Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 21 additions & 26 deletions mapillary_tools/geotag/geotag_videos_from_video.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,47 +68,45 @@ def _extract_video_metadata(
if (
filetypes is None
or types.FileType.VIDEO in filetypes
or types.FileType.CAMM in filetypes
or types.FileType.GOPRO in filetypes
):
with video_path.open("rb") as fp:
try:
points = camm_parser.extract_points(fp)
gopro_info = gpmf_parser.extract_gopro_info(fp)
except sparser.ParsingError:
points = None

if points is not None:
fp.seek(0, io.SEEK_SET)
make, model = camm_parser.extract_camera_make_and_model(fp)
return types.VideoMetadata(
filename=video_path,
md5sum=None,
filesize=utils.get_file_size(video_path),
filetype=types.FileType.CAMM,
points=points,
make=make,
model=model,
)
gopro_info = None

if gopro_info is not None:
return types.VideoMetadata(
filename=video_path,
md5sum=None,
filesize=utils.get_file_size(video_path),
filetype=types.FileType.GOPRO,
points=T.cast(T.List[geo.Point], gopro_info.gps),
make=gopro_info.make,
model=gopro_info.model,
)

if (
filetypes is None
or types.FileType.VIDEO in filetypes
or types.FileType.GOPRO in filetypes
or types.FileType.CAMM in filetypes
):
with video_path.open("rb") as fp:
try:
points_with_fix = gpmf_parser.extract_points(fp)
points = camm_parser.extract_points(fp)
except sparser.ParsingError:
points_with_fix = None
points = None

if points_with_fix is not None:
if points is not None:
fp.seek(0, io.SEEK_SET)
make, model = "GoPro", gpmf_parser.extract_camera_model(fp)
make, model = camm_parser.extract_camera_make_and_model(fp)
return types.VideoMetadata(
filename=video_path,
md5sum=None,
filesize=utils.get_file_size(video_path),
filetype=types.FileType.GOPRO,
points=T.cast(T.List[geo.Point], points_with_fix),
filetype=types.FileType.CAMM,
points=points,
make=make,
model=model,
)
Expand Down Expand Up @@ -176,9 +174,6 @@ def geotag_video(
)
if stationary:
raise exceptions.MapillaryStationaryVideoError("Stationary video")

LOG.debug("Calculating MD5 checksum for %s", str(video_metadata.filename))
video_metadata.update_md5sum()
except Exception as ex:
if not isinstance(ex, exceptions.MapillaryDescriptionError):
LOG.warning(
Expand Down
Loading
Loading