|
|
@ -211,7 +211,8 @@ class NRKTVIE(InfoExtractor):
|
|
|
|
]}
|
|
|
|
]}
|
|
|
|
|
|
|
|
|
|
|
|
def _extract_f4m(self, manifest_url, video_id):
|
|
|
|
def _extract_f4m(self, manifest_url, video_id):
|
|
|
|
return self._extract_f4m_formats(manifest_url + '?hdcore=3.1.1&plugin=aasp-3.1.1.69.124', video_id)
|
|
|
|
return self._extract_f4m_formats(
|
|
|
|
|
|
|
|
manifest_url + '?hdcore=3.1.1&plugin=aasp-3.1.1.69.124', video_id, f4m_id='hds')
|
|
|
|
|
|
|
|
|
|
|
|
def _real_extract(self, url):
|
|
|
|
def _real_extract(self, url):
|
|
|
|
mobj = re.match(self._VALID_URL, url)
|
|
|
|
mobj = re.match(self._VALID_URL, url)
|
|
|
@ -273,7 +274,7 @@ class NRKTVIE(InfoExtractor):
|
|
|
|
|
|
|
|
|
|
|
|
m3u8_url = re.search(r'data-hls-media="([^"]+)"', webpage)
|
|
|
|
m3u8_url = re.search(r'data-hls-media="([^"]+)"', webpage)
|
|
|
|
if m3u8_url:
|
|
|
|
if m3u8_url:
|
|
|
|
formats.extend(self._extract_m3u8_formats(m3u8_url.group(1), video_id, 'mp4'))
|
|
|
|
formats.extend(self._extract_m3u8_formats(m3u8_url.group(1), video_id, 'mp4', m3u8_id='hls'))
|
|
|
|
self._sort_formats(formats)
|
|
|
|
self._sort_formats(formats)
|
|
|
|
|
|
|
|
|
|
|
|
subtitles_url = self._html_search_regex(
|
|
|
|
subtitles_url = self._html_search_regex(
|
|
|
|