heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tuned logging and added comments to 511 fix

Browse Source
This commit is contained in:
Joar Wandborg 2013-02-10 20:19:13 +01:00
parent 34c35c8cec
commit 8d355df617
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mediagoblin/media_types/video/transcoders.py
View File

@ -571,15 +571,34 @@ pending: {2}'.format(
return False return False
def on_thumbnail_error(self, message): def on_thumbnail_error(self, message):
_log.error('Thumbnailing failed.') scaling_failed = False
if 'Error calculating the output scaled size - integer overflow' \
in message.parse_error()[1]:
# GStreamer videoscale sometimes fails to calculate the dimensions
# given only one of the destination dimensions and the source
# dimensions. This is a workaround in case videoscale returns an
# error that indicates this has happened.
scaling_failed = True
_log.error('Thumbnailing failed because of videoscale integer'
' overflow. Will retry with fallback.')
else:
_log.error('Thumbnailing failed: {0}'.format(message.parse_error()))
# Kill the current mainloop
self.disconnect() self.disconnect()
if 'Error calculating the output scaled size - integer overflow' in message.parse_error()[1]:
_log.error('Retrying with manually set sizes...') if scaling_failed:
# Manually scale the destination dimensions
_log.info('Retrying with manually set sizes...')
info = VideoTranscoder().discover(self.source_path) info = VideoTranscoder().discover(self.source_path)
h = info['videoheight'] h = info['videoheight']
w = info['videowidth'] w = info['videowidth']
ratio = 180 / int(w) ratio = 180 / int(w)
h = int(h * ratio) h = int(h * ratio)
self.__init__(self.source_path, self.dest_path, 180, h) self.__init__(self.source_path, self.dest_path, 180, h)
def disconnect(self): def disconnect(self):