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

Check all tags for existence before using them

Browse Source 
Fix bug 5401
This commit is contained in:
Boris Bobrov 2016-03-09 12:28:14 +03:00
parent 17aaab6907
commit 86dc32bc20
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mediagoblin/media_types/video/util.py
View File

@ -35,28 +35,35 @@ def skip_transcode(metadata, size):
_log.debug('skip_transcode config: {0}'.format(config)) _log.debug('skip_transcode config: {0}'.format(config))
tags = metadata.get_tags() metadata_tags = metadata.get_tags()
if not tags: if not metadata_tags:
return False return False
if config['mime_types'] and tags.get_string('mimetype')[0]: if config['mime_types'] and metadata_tags.get_string('mimetype')[0]:
if not tags.get_string('mimetype')[1] in config['mime_types']: if not metadata_tags.get_string('mimetype')[1] in config['mime_types']:
return False return False
if config['container_formats'] and tags.get_string('container-format')[0]: if (config['container_formats'] and
if not (tags.get_string('container-format')[1] in metadata_tags.get_string('container-format')[0]):
if not (metadata_tags.get_string('container-format')[1] in
config['container_formats']): config['container_formats']):
return False return False
if config['video_codecs']: if config['video_codecs']:
for video_info in metadata.get_video_streams(): for video_info in metadata.get_video_streams():
if not (video_info.get_tags().get_string('video-codec')[1] in video_tags = video_info.get_tags()
if not video_tags:
return False
if not (video_tags.get_string('video-codec')[1] in
config['video_codecs']): config['video_codecs']):
return False return False
if config['audio_codecs']: if config['audio_codecs']:
for audio_info in metadata.get_audio_streams(): for audio_info in metadata.get_audio_streams():
if not (audio_info.get_tags().get_string('audio-codec')[1] in audio_tags = audio_info.get_tags()
if not audio_tags:
return False
if not (audio_tags.get_string('audio-codec')[1] in
config['audio_codecs']): config['audio_codecs']):
return False return False