use stream height by default

pandora/archive/extract.py

@@ -241,7 +241,7 @@ def frame(videoFile, frame, position, height=128, redo=False):
             videoFile input
             frame     output
             position as float in seconds
-            width of frame
+            height of frame
             redo boolean to extract file even if it exists
     '''
     if exists(videoFile):

pandora/item/models.py

@@ -850,7 +850,7 @@ class Item(models.Model):
     '''
         Video related functions
     '''
-    def frame(self, position, height=128):
+    def frame(self, position, height=None):
         offset = 0
         streams = self.streams()
         for stream in streams:
@@ -858,6 +858,9 @@ class Item(models.Model):
                 offset += stream.duration
             else:
                 position = position - offset
+                if not height:
+                    height = stream.resolution
+                else:
                     height = min(height, stream.resolution)
                 path = os.path.join(settings.MEDIA_ROOT, stream.path(),
                                     'frames', "%dp"%height, "%s.jpg"%position)