|
|
@ -1586,12 +1586,12 @@ class InfoExtractor(object):
|
|
|
|
def _extract_m3u8_formats(self, m3u8_url, video_id, ext=None,
|
|
|
|
def _extract_m3u8_formats(self, m3u8_url, video_id, ext=None,
|
|
|
|
entry_protocol='m3u8', preference=None,
|
|
|
|
entry_protocol='m3u8', preference=None,
|
|
|
|
m3u8_id=None, note=None, errnote=None,
|
|
|
|
m3u8_id=None, note=None, errnote=None,
|
|
|
|
fatal=True, live=False):
|
|
|
|
fatal=True, live=False, headers=None):
|
|
|
|
res = self._download_webpage_handle(
|
|
|
|
res = self._download_webpage_handle(
|
|
|
|
m3u8_url, video_id,
|
|
|
|
m3u8_url, video_id,
|
|
|
|
note=note or 'Downloading m3u8 information',
|
|
|
|
note=note or 'Downloading m3u8 information',
|
|
|
|
errnote=errnote or 'Failed to download m3u8 information',
|
|
|
|
errnote=errnote or 'Failed to download m3u8 information',
|
|
|
|
fatal=fatal)
|
|
|
|
fatal=fatal, headers=headers)
|
|
|
|
|
|
|
|
|
|
|
|
if res is False:
|
|
|
|
if res is False:
|
|
|
|
return []
|
|
|
|
return []
|
|
|
@ -2009,12 +2009,12 @@ class InfoExtractor(object):
|
|
|
|
})
|
|
|
|
})
|
|
|
|
return entries
|
|
|
|
return entries
|
|
|
|
|
|
|
|
|
|
|
|
def _extract_mpd_formats(self, mpd_url, video_id, mpd_id=None, note=None, errnote=None, fatal=True, formats_dict={}):
|
|
|
|
def _extract_mpd_formats(self, mpd_url, video_id, mpd_id=None, note=None, errnote=None, fatal=True, formats_dict={}, headers=None):
|
|
|
|
res = self._download_xml_handle(
|
|
|
|
res = self._download_xml_handle(
|
|
|
|
mpd_url, video_id,
|
|
|
|
mpd_url, video_id,
|
|
|
|
note=note or 'Downloading MPD manifest',
|
|
|
|
note=note or 'Downloading MPD manifest',
|
|
|
|
errnote=errnote or 'Failed to download MPD manifest',
|
|
|
|
errnote=errnote or 'Failed to download MPD manifest',
|
|
|
|
fatal=fatal)
|
|
|
|
fatal=fatal, headers=None)
|
|
|
|
if res is False:
|
|
|
|
if res is False:
|
|
|
|
return []
|
|
|
|
return []
|
|
|
|
mpd_doc, urlh = res
|
|
|
|
mpd_doc, urlh = res
|
|
|
|