dont throw exception for invalid files
This commit is contained in:
parent
75e0ec06f9
commit
f02d42712d
1 changed files with 58 additions and 55 deletions
113
ox/file.py
113
ox/file.py
|
@ -219,63 +219,66 @@ def ffprobe(filename):
|
|||
return value
|
||||
|
||||
info = {}
|
||||
for key in ('duration', 'size', 'bit_rate'):
|
||||
info[{
|
||||
'bit_rate': 'bitrate'
|
||||
}.get(key, key)] = fix_value(key, ffinfo['format'][key])
|
||||
info['audio'] = []
|
||||
info['video'] = []
|
||||
info['metadata'] = ffinfo['format'].get('tags', {})
|
||||
for s in ffinfo['streams']:
|
||||
tags = s.pop('tags', {})
|
||||
language = None
|
||||
for t in tags:
|
||||
if t == 'language':
|
||||
language = tags[t]
|
||||
else:
|
||||
info['metadata'][t] = tags[t]
|
||||
if s.get('codec_type') in ('audio', 'video'):
|
||||
stream = {}
|
||||
if language and language != 'und':
|
||||
stream['language'] = language
|
||||
keys = [
|
||||
'codec_name',
|
||||
'width',
|
||||
'height',
|
||||
'bit_rate',
|
||||
'index',
|
||||
'display_aspect_ratio',
|
||||
'sample_rate',
|
||||
'channels',
|
||||
]
|
||||
if s['codec_type'] == 'video':
|
||||
keys += [
|
||||
'sample_aspect_ratio',
|
||||
'r_frame_rate',
|
||||
'pix_fmt',
|
||||
if not 'format' in ffinfo:
|
||||
info['error'] = 'badfile'
|
||||
else:
|
||||
for key in ('duration', 'size', 'bit_rate'):
|
||||
info[{
|
||||
'bit_rate': 'bitrate'
|
||||
}.get(key, key)] = fix_value(key, ffinfo['format'][key])
|
||||
info['audio'] = []
|
||||
info['video'] = []
|
||||
info['metadata'] = ffinfo['format'].get('tags', {})
|
||||
for s in ffinfo['streams']:
|
||||
tags = s.pop('tags', {})
|
||||
language = None
|
||||
for t in tags:
|
||||
if t == 'language':
|
||||
language = tags[t]
|
||||
else:
|
||||
info['metadata'][t] = tags[t]
|
||||
if s.get('codec_type') in ('audio', 'video'):
|
||||
stream = {}
|
||||
if language and language != 'und':
|
||||
stream['language'] = language
|
||||
keys = [
|
||||
'codec_name',
|
||||
'width',
|
||||
'height',
|
||||
'bit_rate',
|
||||
'index',
|
||||
'display_aspect_ratio',
|
||||
'sample_rate',
|
||||
'channels',
|
||||
]
|
||||
if s['codec_type'] == 'video':
|
||||
keys += [
|
||||
'sample_aspect_ratio',
|
||||
'r_frame_rate',
|
||||
'pix_fmt',
|
||||
]
|
||||
|
||||
for key in keys:
|
||||
if key in s:
|
||||
stream[{
|
||||
'codec_name': 'codec',
|
||||
'bit_rate': 'bitrate',
|
||||
'index': 'id',
|
||||
'r_frame_rate': 'framerate',
|
||||
'sample_rate': 'samplerate',
|
||||
'pix_fmt': 'pixel_format',
|
||||
'sample_aspect_ratio': 'pixel_aspect_ratio',
|
||||
}.get(key, key)] = fix_value(key, s[key])
|
||||
info[s['codec_type']].append(stream)
|
||||
else:
|
||||
pass
|
||||
#print s
|
||||
for v in info['video']:
|
||||
k = 'display_aspect_ratio'
|
||||
if not k in v and 'width' in v \
|
||||
or (k in v and v[k] == '0:1'):
|
||||
v[k] = '%d:%d' % (v['width'], v['height'])
|
||||
v['pixel_aspect_ratio'] = '1:1'
|
||||
for key in keys:
|
||||
if key in s:
|
||||
stream[{
|
||||
'codec_name': 'codec',
|
||||
'bit_rate': 'bitrate',
|
||||
'index': 'id',
|
||||
'r_frame_rate': 'framerate',
|
||||
'sample_rate': 'samplerate',
|
||||
'pix_fmt': 'pixel_format',
|
||||
'sample_aspect_ratio': 'pixel_aspect_ratio',
|
||||
}.get(key, key)] = fix_value(key, s[key])
|
||||
info[s['codec_type']].append(stream)
|
||||
else:
|
||||
pass
|
||||
#print s
|
||||
for v in info['video']:
|
||||
k = 'display_aspect_ratio'
|
||||
if not k in v and 'width' in v \
|
||||
or (k in v and v[k] == '0:1'):
|
||||
v[k] = '%d:%d' % (v['width'], v['height'])
|
||||
v['pixel_aspect_ratio'] = '1:1'
|
||||
info['oshash'] = oshash(filename)
|
||||
info['path'] = filename
|
||||
return info
|
||||
|
|
Loading…
Reference in a new issue