decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

new frame urls

Browse source
This commit is contained in:
rolux 2011-08-06 18:17:22 +00:00
commit 73a14c8a47
5 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pandora/archive/extract.py
View file

@ -230,7 +230,7 @@ def run_command(cmd, timeout=10):
return p.returncode
def frame(videoFile, frame, position, width=128, redo=False):
def frame(videoFile, frame, position, height=128, redo=False):
'''
params:
videoFile input
@ -243,7 +243,7 @@ def frame(videoFile, frame, position, width=128, redo=False):
frameFolder = os.path.dirname(frame)
if redo or not exists(frame):
ox.makedirs(frameFolder)
cmd = ['oxframe', '-i', videoFile, '-o', frame, '-p', str(position), '-x', str(width)]
cmd = ['oxframe', '-i', videoFile, '-o', frame, '-p', str(position), '-y', str(height)]
run_command(cmd)

10
pandora/item/models.py
View file

@ -676,16 +676,17 @@ class Item(models.Model):
Video related functions
'''
def frame(self, position, width=128):
def frame(self, position, height=128):
stream = self.streams.filter(profile=settings.VIDEO_PROFILE)
if stream.count()>0:
stream = stream[0]
else:
return None
height = min(height, stream.height())
path = os.path.join(settings.MEDIA_ROOT, self.path(),
'frames', "%d"%width, "%s.jpg"%position)
'frames', "%dp"%height, "%s.jpg"%position)
if not os.path.exists(path):
extract.frame(stream.video.path, path, position, width)
extract.frame(stream.video.path, path, position, height)
if not os.path.exists(path):
path = os.path.join(settings.STATIC_ROOT, 'png/frame.broken.png')
return path
@ -1091,6 +1092,9 @@ class Stream(models.Model):
def path(self):
return self.item.path(self.profile)
def height(self):
return int(self.profile.split('p')[0])
def extract_derivatives(self):
for profile in settings.VIDEO_DERIVATIVES:
derivative, created = Stream.objects.get_or_create(profile=profile, item=self.item)

2
pandora/item/urls.py
View file

@ -6,7 +6,7 @@ from django.conf.urls.defaults import *
urlpatterns = patterns("item.views",
#frames
(r'^(?P<id>[A-Z0-9].+)/frame(?P<size>\d+)p(?P<position>[\d\.]+)\.jpg$', 'frame'),
(r'^(?P<id>[A-Z0-9].+)/(?P<size>\d+)p(?P<position>[\d\.]+)\.jpg$', 'frame'),
#timelines
(r'^(?P<id>[A-Z0-9].+)/timeline(?P<size>\d+)p(?P<position>\d+)\.png$', 'timeline'),