fix: skip invalid mp4 files when extracting points (#558)

mapillary · Oct 4, 2022 · 0e7b1f6 · 0e7b1f6
1 parent 45aa8cb
commit 0e7b1f6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/mapillary_tools/geotag/camm_builder.py b/mapillary_tools/geotag/camm_builder.py
@@ -235,19 +235,28 @@ def extract_points(
     start_offset = fp.tell()
 
     if file_types is None or utils.FileType.CAMM in file_types:
-        points = camm_parser.extract_points(fp)
+        try:
+            points = camm_parser.extract_points(fp)
+        except (parser.BoxNotFoundError, parser.RangeError):
+            points = []
         if points:
             return utils.FileType.CAMM, points
 
     if file_types is None or utils.FileType.GOPRO in file_types:
         fp.seek(start_offset)
-        points_with_fix = gpmf_parser.extract_points(fp)
+        try:
+            points_with_fix = gpmf_parser.extract_points(fp)
+        except (parser.BoxNotFoundError, parser.RangeError):
+            points = []
         if points_with_fix:
             return utils.FileType.GOPRO, T.cast(T.List[geo.Point], points_with_fix)
 
     if file_types is None or utils.FileType.BLACKVUE in file_types:
         fp.seek(start_offset)
-        points = blackvue_parser.extract_points(fp)
+        try:
+            points = blackvue_parser.extract_points(fp)
+        except (parser.BoxNotFoundError, parser.RangeError):
+            points = []
         if points:
             return utils.FileType.BLACKVUE, points
 

diff --git a/mapillary_tools/upload.py b/mapillary_tools/upload.py
@@ -638,9 +638,8 @@ def _convert_and_upload_camm(
             file_type, points = camm_builder.extract_points(src_fp, file_types)
             if file_type is None:
                 LOG.warning(
-                    f"Skipping %s due to: No GPS found in the video (file types: %s)",
+                    f"Skipping %s due to: No GPS found in the video",
                     video_path.name,
-                    file_types,
                 )
                 continue