Support frameN filename-format

achalddave · Aug 16, 2019 · 1a7fe49 · 1a7fe49
1 parent ff7bba3
commit 1a7fe49
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/release/custom/run.py b/release/custom/run.py
@@ -18,10 +18,13 @@ def main():
                         choices=['joint', 'appearance', 'motion'])
     parser.add_argument(
         '--filename-format',
-        choices=['frame', 'sequence_frame', 'sequence-frame', 'fbms'],
+        choices=[
+            'frame', 'frameN', 'sequence_frame', 'sequence-frame', 'fbms'
+        ],
         required=True,
         help=('Specifies how to get frame number from the filename. '
               '"frame": the filename is the frame number, '
+              '"frameN": format "frame<number>", '
               '"sequence_frame": frame number is separated by an underscore, '
               '"sequence-frame": frame number is separated by a dash, '
               '"fbms": assume fbms style frame numbers'))

diff --git a/release/custom/track.py b/release/custom/track.py
@@ -28,10 +28,13 @@ def main():
         '--model', choices=['joint', 'appearance', 'motion'], default='joint')
     parser.add_argument(
         '--filename-format',
-        choices=['frame', 'sequence_frame', 'sequence-frame', 'fbms'],
+        choices=[
+            'frame', 'frameN', 'sequence_frame', 'sequence-frame', 'fbms'
+        ],
         required=True,
         help=('Specifies how to get frame number from the filename. '
               '"frame": the filename is the frame number, '
+              '"frameN": format <frame><number>, '
               '"sequence_frame": frame number is separated by an underscore, '
               '"sequence-frame": frame number is separated by a dash, '
               '"fbms": assume fbms style frame numbers'))

diff --git a/tracker/track.py b/tracker/track.py
@@ -1068,10 +1068,13 @@ def main():
         '--dataset', default='coco', choices=['coco', 'objectness'])
     parser.add_argument(
         '--filename-format',
-        choices=['frame', 'sequence_frame', 'sequence-frame', 'fbms'],
+        choices=[
+            'frame', 'frameN', 'sequence_frame', 'sequence-frame', 'fbms'
+        ],
         default='frame',
         help=('Specifies how to get frame number from the filename. '
               '"frame": the filename is the frame number, '
+              '"frameN": format <frame><number>, '
               '"sequence_frame": frame number is separated by an underscore, '
               '"sequence-frame": frame number is separated by a dash, '
               '"fbms": assume fbms style frame numbers'))
@@ -1116,6 +1119,9 @@ def main():
 
     if args.filename_format == 'fbms':
         from utils.fbms.utils import get_framenumber
+    elif args.filename_format == 'frameN':
+        def get_framenumber(x):
+            return int(x.split('frame')[1])
     elif args.filename_format == 'sequence-frame':
         def get_framenumber(x):
             return int(x.split('-')[-1])

diff --git a/tracker/track_multiple.py b/tracker/track_multiple.py
@@ -37,10 +37,11 @@ def main():
         '--dataset', default='coco', choices=['coco', 'objectness'])
     parser.add_argument(
         '--filename-format',
-        choices=['frame', 'sequence_frame', 'sequence-frame', 'fbms'],
+        choices=['frame', 'frameN', 'sequence_frame', 'sequence-frame', 'fbms'],
         default='frame',
         help=('Specifies how to get frame number from the filename. '
               '"frame": the filename is the frame number, '
+              '"frameN": format "frame<number>", '
               '"sequence_frame": frame number is separated by an underscore, '
               '"sequence-frame": frame number is separated by a dash, '
               '"fbms": assume fbms style frame numbers'))
@@ -75,6 +76,9 @@ def main():
 
     if args.filename_format == 'fbms':
         from utils.fbms.utils import get_framenumber
+    elif args.filename_format == 'frameN':
+        def get_framenumber(x):
+            return int(x.split('frame')[1])
     elif args.filename_format == 'sequence-frame':
         def get_framenumber(x):
             return int(x.split('-')[-1])