|
|
@ -1967,10 +1967,13 @@ class InfoExtractor(object): |
|
|
|
entries.append(media_info) |
|
|
|
return entries |
|
|
|
|
|
|
|
def _extract_akamai_formats(self, manifest_url, video_id): |
|
|
|
def _extract_akamai_formats(self, manifest_url, video_id, hosts={}): |
|
|
|
formats = [] |
|
|
|
hdcore_sign = 'hdcore=3.7.0' |
|
|
|
f4m_url = re.sub(r'(https?://.+?)/i/', r'\1/z/', manifest_url).replace('/master.m3u8', '/manifest.f4m') |
|
|
|
f4m_url = re.sub(r'(https?://[^/+])/i/', r'\1/z/', manifest_url).replace('/master.m3u8', '/manifest.f4m') |
|
|
|
hds_host = hosts.get('hds') |
|
|
|
if hds_host: |
|
|
|
f4m_url = re.sub(r'(https?://)[^/]+', r'\1' + hds_host, f4m_url) |
|
|
|
if 'hdcore=' not in f4m_url: |
|
|
|
f4m_url += ('&' if '?' in f4m_url else '?') + hdcore_sign |
|
|
|
f4m_formats = self._extract_f4m_formats( |
|
|
@ -1978,7 +1981,10 @@ class InfoExtractor(object): |
|
|
|
for entry in f4m_formats: |
|
|
|
entry.update({'extra_param_to_segment_url': hdcore_sign}) |
|
|
|
formats.extend(f4m_formats) |
|
|
|
m3u8_url = re.sub(r'(https?://.+?)/z/', r'\1/i/', manifest_url).replace('/manifest.f4m', '/master.m3u8') |
|
|
|
m3u8_url = re.sub(r'(https?://[^/]+)/z/', r'\1/i/', manifest_url).replace('/manifest.f4m', '/master.m3u8') |
|
|
|
hls_host = hosts.get('hls') |
|
|
|
if hls_host: |
|
|
|
m3u8_url = re.sub(r'(https?://)[^/]+', r'\1' + hls_host, m3u8_url) |
|
|
|
formats.extend(self._extract_m3u8_formats( |
|
|
|
m3u8_url, video_id, 'mp4', 'm3u8_native', |
|
|
|
m3u8_id='hls', fatal=False)) |
|
|
|