projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
86f4d14
)
[extractor/common] Add manifest_url for hls and hds formats
author
Sergey M․
<dstftw@gmail.com>
Sat, 17 Sep 2016 14:33:38 +0000
(21:33 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 17 Sep 2016 14:33:38 +0000
(21:33 +0700)
youtube_dl/extractor/common.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index f35311e7ac189a3b8467cc3a3f7348ce3c2b1a3b..9c8991542d02f46c8c228e120afd921c344b182b 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-1150,6
+1150,7
@@
class InfoExtractor(object):
formats.append({
'format_id': format_id,
'url': manifest_url,
formats.append({
'format_id': format_id,
'url': manifest_url,
+ 'manifest_url': manifest_url,
'ext': 'flv' if bootstrap_info is not None else None,
'tbr': tbr,
'width': width,
'ext': 'flv' if bootstrap_info is not None else None,
'tbr': tbr,
'width': width,
@@
-1255,9
+1256,11
@@
class InfoExtractor(object):
# format_id intact.
if not live:
format_id.append(stream_name if stream_name else '%d' % (tbr if tbr else len(formats)))
# format_id intact.
if not live:
format_id.append(stream_name if stream_name else '%d' % (tbr if tbr else len(formats)))
+ manifest_url = format_url(line.strip())
f = {
'format_id': '-'.join(format_id),
f = {
'format_id': '-'.join(format_id),
- 'url': format_url(line.strip()),
+ 'url': manifest_url,
+ 'manifest_url': manifest_url,
'tbr': tbr,
'ext': ext,
'fps': float_or_none(last_info.get('FRAME-RATE')),
'tbr': tbr,
'ext': ext,
'fps': float_or_none(last_info.get('FRAME-RATE')),