cleanup ogg support

This commit is contained in:
j 2007-12-12 14:08:34 +00:00
parent 7c06f63b94
commit 224ebd7c04
3 changed files with 4 additions and 4 deletions

View file

@ -38,7 +38,7 @@ class Root(controllers.RootController):
return f.timeline()
elif position: #clip / frame
position = position.replace('.png', '').replace('.jpg', '')
position = position.replace('.flv', '')
position = position.replace('.flv', '').replace('.ogg', '')
position = position.replace('-', ':').replace('.',':')
if action == 'clip':
cherrypy.response.headerMap['Content-Type'] = "video/x-flv"

View file

@ -101,9 +101,9 @@ def extract_ogg(movie_file, clip_file, inpoint, outpoint, width=128, height=96,
#create ogg file
ffmpeg2theora_options = ''
ffmpeg2theora_options += " 'tempfile.avi' -H %s -o '%s'" % (audiorate, flash_file)
ffmpeg2theora_options += " 'tempfile.avi' -H %s -o '%s'" % (audiorate, clip_file)
ffmpeg2theora = "ffmpeg2theora %s >/dev/null 2>&1" % ffmpeg2theora_options
print ffmpeg2theora.encode('utf-8')
#print ffmpeg2theora.encode('utf-8')
os.system(ffmpeg2theora.encode('utf-8'))
else:
print "update the cache %s missing" % movie_file.encode('utf-8')

View file

@ -470,7 +470,7 @@ class ArchiveFile(SQLObject):
extract_flash(movie_file, flash_movie, inpoint, outpoint, width, height, offset = 0)
#extract_flash_ng(self.absolutePath, flash_movie, inpoint, outpoint, width, height, offset)
def extractOggClip(self, inpoint, outpoint=-1, flash_folder=-1):
def extractOggClip(self, inpoint, outpoint=-1, clip_folder=-1):
if clip_folder == -1:
clip_folder = self.frameFolder
movie_file = self.mini_movie_file