projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Skip get_video_info requests when --youtube-skip-dash-manifest is specified
[youtube-dl]
/
youtube_dl
/
downloader
/
f4m.py
diff --git
a/youtube_dl/downloader/f4m.py
b/youtube_dl/downloader/f4m.py
index 3dc796faaf038c00383089274c0005382977a431..b1a858c452617ed452bc0dcae8d612d22fd224d3 100644
(file)
--- a/
youtube_dl/downloader/f4m.py
+++ b/
youtube_dl/downloader/f4m.py
@@
-281,7
+281,7
@@
class F4mFD(FileDownloader):
boot_info = self._get_bootstrap_from_url(bootstrap_url)
else:
bootstrap_url = None
boot_info = self._get_bootstrap_from_url(bootstrap_url)
else:
bootstrap_url = None
- bootstrap = base64.b64decode(node.text)
+ bootstrap = base64.b64decode(node.text
.encode('ascii')
)
boot_info = read_bootstrap_info(bootstrap)
return (boot_info, bootstrap_url)
boot_info = read_bootstrap_info(bootstrap)
return (boot_info, bootstrap_url)
@@
-308,7
+308,7
@@
class F4mFD(FileDownloader):
live = boot_info['live']
metadata_node = media.find(_add_ns('metadata'))
if metadata_node is not None:
live = boot_info['live']
metadata_node = media.find(_add_ns('metadata'))
if metadata_node is not None:
- metadata = base64.b64decode(metadata_node.text)
+ metadata = base64.b64decode(metadata_node.text
.encode('ascii')
)
else:
metadata = None
else:
metadata = None
@@
-389,6
+389,8
@@
class F4mFD(FileDownloader):
url = base_url + name
if akamai_pv:
url += '?' + akamai_pv.strip(';')
url = base_url + name
if akamai_pv:
url += '?' + akamai_pv.strip(';')
+ if info_dict.get('extra_param_to_segment_url'):
+ url += info_dict.get('extra_param_to_segment_url')
frag_filename = '%s-%s' % (tmpfilename, name)
try:
success = http_dl.download(frag_filename, {'url': url})
frag_filename = '%s-%s' % (tmpfilename, name)
try:
success = http_dl.download(frag_filename, {'url': url})