0x2620/oxdbarchive
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

use ogv / video/ogg

Browse source
This commit is contained in:
j 2007-12-12 21:09:07 +00:00
parent 224ebd7c04
commit fcfe8b446b
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
oxdbarchive/cache.py
View file

@ -63,7 +63,7 @@ def loadOggClip(afile, position):
outpoint = positions[1] outpoint = positions[1]
else: else:
outpoint = -1 outpoint = -1
clip = join(afile.frameFolder, '%s.%s' % (position, 'ogg')) clip = join(afile.frameFolder, '%s.%s' % (position, 'ogv'))
if not exists(clip): if not exists(clip):
afile.extractOggClip(position, outpoint) afile.extractOggClip(position, outpoint)
if exists(clip): if exists(clip):

6
oxdbarchive/controllers.py
View file

@ -38,14 +38,14 @@ class Root(controllers.RootController):
return f.timeline() return f.timeline()
elif position: #clip / frame elif position: #clip / frame
position = position.replace('.png', '').replace('.jpg', '') position = position.replace('.png', '').replace('.jpg', '')
position = position.replace('.flv', '').replace('.ogg', '') position = position.replace('.flv', '').replace('.ogv', '')
position = position.replace('-', ':').replace('.',':') position = position.replace('-', ':').replace('.',':')
if action == 'clip': if action == 'clip':
cherrypy.response.headerMap['Content-Type'] = "video/x-flv" cherrypy.response.headerMap['Content-Type'] = "video/x-flv"
cherrypy.response.headerMap["Expires"] = httpExpires(60*60*24*15) cherrypy.response.headerMap["Expires"] = httpExpires(60*60*24*15)
return f.flvClip(position) return f.flvClip(position)
if action == 'ogg': if action == 'ogv':
cherrypy.response.headerMap['Content-Type'] = "video/x-ogg" cherrypy.response.headerMap['Content-Type'] = "video/ogg"
cherrypy.response.headerMap["Expires"] = httpExpires(60*60*24*15) cherrypy.response.headerMap["Expires"] = httpExpires(60*60*24*15)
return f.oggClip(position) return f.oggClip(position)
elif action == 'frame': elif action == 'frame':

2
oxdbarchive/model.py
View file

@ -475,7 +475,7 @@ class ArchiveFile(SQLObject):
clip_folder = self.frameFolder clip_folder = self.frameFolder
movie_file = self.mini_movie_file movie_file = self.mini_movie_file
position = inpoint.replace(':', '.') position = inpoint.replace(':', '.')
clip_movie = join(self.frameFolder, '%s.%s' % (position, 'ogg')) clip_movie = join(self.frameFolder, '%s.%s' % (position, 'ogv'))
width = 128 width = 128
height = int(width / self.frameAspect) height = int(width / self.frameAspect)
height = height - height % 2 height = height - height % 2