[itv] Use native hls

[youtube-dl] / youtube_dl / extractor / itv.py

diff --git a/youtube_dl/extractor/itv.py b/youtube_dl/extractor/itv.py
index d65cdc6af3fc87c13b6e799ddfdb1e138d6b8c0c..5ff7e1aaa4b8c720c7861355a7d373c8718fb49d 100644 (file)
--- a/youtube_dl/extractor/itv.py
+++ b/youtube_dl/extractor/itv.py
@@ -6,7 +6,10 @@ import xml.etree.ElementTree as etree
 import json
 
 from .common import InfoExtractor
-from ..compat import compat_str
+from ..compat import (
+    compat_str,
+    compat_etree_register_namespace,
+)
 from ..utils import (
     extract_attributes,
     xpath_with_ns,
@@ -21,6 +24,7 @@ from ..utils import (
 
 class ITVIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?itv\.com/hub/[^/]+/(?P<id>[0-9a-zA-Z]+)'
+    _GEO_COUNTRIES = ['GB']
     _TEST = {
         'url': 'http://www.itv.com/hub/mr-bean-animated-series/2a2936a0053',
         'info_dict': {
@@ -47,7 +51,7 @@ class ITVIE(InfoExtractor):
             'com': 'http://schemas.itv.com/2009/05/Common',
         }
         for ns, full_ns in ns_map.items():
-            etree.register_namespace(ns, full_ns)
+            compat_etree_register_namespace(ns, full_ns)
 
         def _add_ns(name):
             return xpath_with_ns(name, ns_map)
@@ -95,7 +99,11 @@ class ITVIE(InfoExtractor):
             headers=headers, data=etree.tostring(req_env))
         playlist = xpath_element(resp_env, './/Playlist')
         if playlist is None:
+            fault_code = xpath_text(resp_env, './/faultcode')
             fault_string = xpath_text(resp_env, './/faultstring')
+            if fault_code == 'InvalidGeoRegion':
+                self.raise_geo_restricted(
+                    msg=fault_string, countries=self._GEO_COUNTRIES)
             raise ExtractorError('%s said: %s' % (self.IE_NAME, fault_string))
         title = xpath_text(playlist, 'EpisodeTitle', fatal=True)
         video_element = xpath_element(playlist, 'VideoEntries/Video', fatal=True)
@@ -114,6 +122,8 @@ class ITVIE(InfoExtractor):
                 'play_path': play_path,
                 'tbr': tbr,
                 'ext': 'flv',
+                # rtmp formats are now stop downloading at ~72MiB
+                'preference': -10,
             })
 
         ios_playlist_url = params.get('data-video-playlist')
@@ -164,7 +174,9 @@ class ITVIE(InfoExtractor):
                         href = ios_base_url + href
                     ext = determine_ext(href)
                     if ext == 'm3u8':
-                        formats.extend(self._extract_m3u8_formats(href, video_id, 'mp4', m3u8_id='hls', fatal=False))
+                        formats.extend(self._extract_m3u8_formats(
+                            href, video_id, 'mp4', entry_protocol='m3u8_native',
+                            m3u8_id='hls', fatal=False))
                     else:
                         formats.append({
                             'url': href,
@@ -177,7 +189,7 @@ class ITVIE(InfoExtractor):
                 continue
             ext = determine_ext(caption_url.text, 'ttml')
             subtitles.setdefault('en', []).append({
-                'url': caption_url,
+                'url': caption_url.text,
                 'ext': 'ttml' if ext == 'xml' else ext,
             })