projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[extractor/common] Generate better f4m format IDs
[youtube-dl]
/
youtube_dl
/
extractor
/
common.py
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index 4d5b48167cb604b6679b6e524b5420efb1b3b9c5..69d5f687cbcfc913c1ee8ae3d8bc0a530b7202f0 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-620,11
+620,15
@@
class InfoExtractor(object):
'Unable to download f4m manifest')
formats = []
'Unable to download f4m manifest')
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,
'ext': 'flv',
'url': manifest_url,
'ext': 'flv',
- 'tbr':
int_or_none(media_el.attrib.get('bitrate'))
,
+ 'tbr':
tbr
,
'width': int_or_none(media_el.attrib.get('width')),
'height': int_or_none(media_el.attrib.get('height')),
})
'width': int_or_none(media_el.attrib.get('width')),
'height': int_or_none(media_el.attrib.get('height')),
})