1
0
Fork 0
mirror of https://gitlab.com/dstftw/youtube-dl.git synced 2020-11-16 09:42:26 +00:00

[extractor/common] Generate better f4m format IDs

This commit is contained in:
Philipp Hagemeister 2014-08-25 13:03:08 +02:00
parent 7adcbe7594
commit b252735910

View file

@ -620,11 +620,15 @@ class InfoExtractor(object):
'Unable to download f4m manifest') 'Unable to download f4m manifest')
formats = [] formats = []
for media_el in manifest.findall('{http://ns.adobe.com/f4m/1.0}media'): media_nodes = manifest.findall('{http://ns.adobe.com/f4m/1.0}media')
for i, media_el in enumerate(media_nodes):
tbr = int_or_none(media_el.attrib.get('bitrate'))
format_id = 'f4m-%d' % (i if tbr is None else tbr)
formats.append({ formats.append({
'format_id': format_id,
'url': manifest_url, 'url': manifest_url,
'ext': 'flv', 'ext': 'flv',
'tbr': int_or_none(media_el.attrib.get('bitrate')), 'tbr': tbr,
'width': int_or_none(media_el.attrib.get('width')), 'width': int_or_none(media_el.attrib.get('width')),
'height': int_or_none(media_el.attrib.get('height')), 'height': int_or_none(media_el.attrib.get('height')),
}) })