From: Yen Chi Hsuan Date: Mon, 25 Apr 2016 13:02:02 +0000 (+0800) Subject: Merge branch 'akamai_pv' of https://github.com/remitamine/youtube-dl into remitamine... X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=d6712378e73951bede475569c887a1ac73f660a9;hp=c83a352227401d7ca7eac045b58043ed576c0cdc;p=youtube-dl.git Merge branch 'akamai_pv' of https://github.com/remitamine/youtube-dl into remitamine-akamai_pv --- diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 02cd2c003..a285ee7d8 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -1006,6 +1006,13 @@ class InfoExtractor(object): 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): + # 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: + playerVerificationChallenge = akamai_pv.text.split(';')[0] + if playerVerificationChallenge.strip() != '': + return [] + formats = [] manifest_version = '1.0' media_nodes = manifest.findall('{http://ns.adobe.com/f4m/1.0}media')