[common] Support m3u8 in f4m manifests

Related: #9531
This commit is contained in:
Yen Chi Hsuan 2016-05-26 21:55:43 +08:00
parent 85b0fe7d64
commit 240b60453e
No known key found for this signature in database
GPG Key ID: 3FDDD575826C5C30

View File

@ -987,7 +987,7 @@ def _sleep(self, timeout, video_id, msg_template=None):
def _extract_f4m_formats(self, manifest_url, video_id, preference=None, f4m_id=None,
transform_source=lambda s: fix_xml_ampersands(s).strip(),
fatal=True, assume_f4mv2=False):
fatal=True, assume_f4mv2=False, m3u8_id=None):
manifest = self._download_xml(
manifest_url, video_id, 'Downloading f4m manifest',
'Unable to download f4m manifest',
@ -1001,11 +1001,12 @@ def _extract_f4m_formats(self, manifest_url, video_id, preference=None, f4m_id=N
return self._parse_f4m_formats(
manifest, manifest_url, video_id, preference=preference, f4m_id=f4m_id,
transform_source=transform_source, fatal=fatal, assume_f4mv2=assume_f4mv2)
transform_source=transform_source, fatal=fatal, assume_f4mv2=assume_f4mv2,
m3u8_id=m3u8_id)
def _parse_f4m_formats(self, manifest, manifest_url, video_id, preference=None, f4m_id=None,
transform_source=lambda s: fix_xml_ampersands(s).strip(),
fatal=True, assume_f4mv2=False):
fatal=True, assume_f4mv2=False, m3u8_id=None):
# currently youtube-dl cannot decode the playerVerificationChallenge as Akamai uses Adobe Alchemy
akamai_pv = manifest.find('{http://ns.adobe.com/f4m/1.0}pv-2.0')
if akamai_pv is not None and ';' in akamai_pv.text:
@ -1046,11 +1047,17 @@ def _parse_f4m_formats(self, manifest, manifest_url, video_id, preference=None,
# since bitrates in parent manifest (this one) and media_url manifest
# may differ leading to inability to resolve the format by requested
# bitrate in f4m downloader
if determine_ext(manifest_url) == 'f4m':
ext = determine_ext(manifest_url)
if ext == 'f4m':
formats.extend(self._extract_f4m_formats(
manifest_url, video_id, preference=preference, f4m_id=f4m_id,
transform_source=transform_source, fatal=fatal))
continue
elif ext == 'm3u8':
formats.extend(self._extract_m3u8_formats(
manifest_url, video_id, 'mp4', preference=preference,
m3u8_id=m3u8_id, fatal=False))
continue
tbr = int_or_none(media_el.attrib.get('bitrate'))
formats.append({
'format_id': '-'.join(filter(None, [f4m_id, compat_str(i if tbr is None else tbr)])),