Fix utils.extract_frames() to sort numerically, rather than alphabetically

moments_actions.txt

@@ -0,0 +1,338 @@
+adult+male+singing,
+adult+male+speaking,
+aiming,
+applauding,
+arresting,
+ascending,
+asking,
+assembling,
+attacking,
+autographing,
+baking,
+balancing,
+baptizing,
+barbecuing,
+barking,
+bathing,
+bending,
+bicycling,
+biting,
+blocking,
+blowing,
+boarding,
+boating,
+boiling,
+bouncing,
+bowing,
+bowling,
+boxing,
+breaking,
+brushing,
+bubbling,
+building,
+bulldozing,
+burning,
+burying,
+buttoning,
+buying,
+calling,
+camping,
+carrying,
+carving,
+catching,
+celebrating,
+chasing,
+cheering,
+cheerleading,
+chewing,
+child+singing,
+child+speaking,
+chopping,
+clapping,
+clawing,
+cleaning,
+clearing,
+climbing,
+clinging,
+clipping,
+closing,
+coaching,
+colliding,
+combing,
+combusting,
+competing,
+constructing,
+cooking,
+coughing,
+covering,
+cracking,
+crafting,
+cramming,
+crashing,
+crawling,
+crouching,
+crushing,
+crying,
+cuddling,
+cutting,
+dancing,
+descending,
+destroying,
+digging,
+dining,
+dipping,
+discussing,
+diving,
+dragging,
+draining,
+drawing,
+drenching,
+dressing,
+drilling,
+drinking,
+dripping,
+driving,
+dropping,
+drumming,
+drying,
+dunking,
+dusting,
+eating,
+emptying,
+entering,
+erupting,
+exercising,
+exiting,
+extinguishing,
+falling,
+feeding,
+fencing,
+fighting,
+filling,
+filming,
+fishing,
+flicking,
+flipping,
+floating,
+flooding,
+flowing,
+flying,
+folding,
+frowning,
+frying,
+fueling,
+gambling,
+gardening,
+giggling,
+giving,
+grilling,
+grinning,
+gripping,
+grooming,
+guarding,
+hammering,
+handcuffing,
+handwriting,
+hanging,
+hiking,
+hitchhiking,
+hitting,
+howling,
+hugging,
+hunting,
+imitating,
+inflating,
+injecting,
+instructing,
+interviewing,
+jogging,
+joining,
+juggling,
+jumping,
+kicking,
+kissing,
+kneeling,
+knitting,
+knocking,
+landing,
+laughing,
+launching,
+leaking,
+leaning,
+leaping,
+lecturing,
+licking,
+lifting,
+loading,
+locking,
+manicuring,
+marching,
+marrying,
+massaging,
+measuring,
+mopping,
+mowing,
+officiating,
+opening,
+operating,
+overflowing,
+packaging,
+packing,
+painting,
+parading,
+paying,
+pedaling,
+peeling,
+performing,
+photographing,
+picking,
+piloting,
+pitching,
+placing,
+planting,
+playing,
+playing+fun,
+playing+music,
+playing+sports,
+playing+videogames,
+plugging,
+plunging,
+pointing,
+poking,
+pouring,
+praying,
+preaching,
+pressing,
+protesting,
+pulling,
+punching,
+punting,
+pushing,
+putting,
+queuing,
+racing,
+rafting,
+raining,
+raising,
+reaching,
+reading,
+removing,
+repairing,
+resting,
+riding,
+rinsing,
+rising,
+roaring,
+rocking,
+rolling,
+rowing,
+rubbing,
+running,
+sailing,
+saluting,
+sanding,
+sawing,
+scratching,
+screwing,
+scrubbing,
+selling,
+serving,
+sewing,
+shaking,
+shaving,
+shooting,
+shopping,
+shouting,
+shoveling,
+shredding,
+shrugging,
+signing,
+singing,
+sitting,
+skating,
+sketching,
+skiing,
+skipping,
+slapping,
+sleeping,
+slicing,
+sliding,
+slipping,
+smashing,
+smelling,
+smiling,
+smoking,
+snapping,
+sneezing,
+sniffing,
+snowing,
+snuggling,
+socializing,
+sowing,
+speaking,
+spilling,
+spinning,
+spitting,
+splashing,
+spraying,
+spreading,
+sprinkling,
+sprinting,
+squatting,
+squinting,
+stacking,
+standing,
+starting,
+stealing,
+steering,
+stirring,
+stitching,
+stomping,
+stopping,
+storming,
+stretching,
+stroking,
+studying,
+submerging,
+surfing,
+sweeping,
+swerving,
+swimming,
+swinging,
+talking,
+taping,
+tapping,
+tattooing,
+teaching,
+tearing,
+telephoning,
+throwing,
+tickling,
+towing,
+trimming,
+tripping,
+tuning,
+turning,
+twisting,
+tying,
+typing,
+unloading,
+unpacking,
+vacuuming,
+waking,
+walking,
+washing,
+watering,
+waving,
+waxing,
+weeding,
+welding,
+wetting,
+whistling,
+winking,
+working,
+wrapping,
+wrestling,
+writing,
+yawning],
+

utils.py

@@ -30,9 +30,11 @@ def extract_frames(video_file, num_frames=8):
                                '-vframes', str(num_frames),
                                '-loglevel', 'panic',
                                'frames/%d.jpg']).communicate()
+    # Temporal sorting
     frame_paths = sorted([os.path.join('frames', frame)
-                          for frame in os.listdir('frames')])
-    frames = load_frames(frame_paths, num_frames=num_frames)
+                          for frame in os.listdir('frames')],
+                         key=lambda x: int(os.path.splitext(os.path.split(x)[-1])[0]))
+    frames = load_frames(frame_paths, num_frames=min(num_frames, len(frame_paths)))
     subprocess.call(['rm', '-rf', 'frames'])
     return frames