projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f096ec2
)
[extractor/common] Restore NAME usage from EXT-X-MEDIA tag for formats codes in _extr...
author
Sergey M․
<dstftw@gmail.com>
Thu, 1 Sep 2016 14:37:25 +0000
(21:37 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Thu, 1 Sep 2016 14:37:25 +0000
(21:37 +0700)
youtube_dl/extractor/common.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index da0af29ec6f625b1ed88ded115891fde18eb2f3f..36d43fd50f03ffb099bf8f79b0047a51795960c4 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-1202,6
+1202,7
@@
class InfoExtractor(object):
'preference': preference,
}]
last_info = None
'preference': preference,
}]
last_info = None
+ last_media = None
for line in m3u8_doc.splitlines():
if line.startswith('#EXT-X-STREAM-INF:'):
last_info = parse_m3u8_attributes(line)
for line in m3u8_doc.splitlines():
if line.startswith('#EXT-X-STREAM-INF:'):
last_info = parse_m3u8_attributes(line)
@@
-1224,6
+1225,10
@@
class InfoExtractor(object):
'protocol': entry_protocol,
'preference': preference,
})
'protocol': entry_protocol,
'preference': preference,
})
+ else:
+ # When there is no URI in EXT-X-MEDIA let this tag's
+ # data be used by regular URI lines below
+ last_media = media
elif line.startswith('#') or not line.strip():
continue
else:
elif line.startswith('#') or not line.strip():
continue
else:
@@
-1234,13
+1239,14
@@
class InfoExtractor(object):
format_id = []
if m3u8_id:
format_id.append(m3u8_id)
format_id = []
if m3u8_id:
format_id.append(m3u8_id)
+ last_media_name = last_media.get('NAME') if last_media else None
+ # Despite specification does not mention NAME attribute for
+ # EXT-X-STREAM-INF it still sometimes may be present
+ stream_name = last_info.get('NAME') or last_media_name
# Bandwidth of live streams may differ over time thus making
# format_id unpredictable. So it's better to keep provided
# format_id intact.
if not live:
# Bandwidth of live streams may differ over time thus making
# format_id unpredictable. So it's better to keep provided
# format_id intact.
if not live:
- # Despite specification does not mention NAME attribute for
- # EXT-X-STREAM-INF it still sometimes may be present
- stream_name = last_info.get('NAME')
format_id.append(stream_name if stream_name else '%d' % (tbr if tbr else len(formats)))
f = {
'format_id': '-'.join(format_id),
format_id.append(stream_name if stream_name else '%d' % (tbr if tbr else len(formats)))
f = {
'format_id': '-'.join(format_id),