aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/abc.py10
-rw-r--r--youtube_dl/extractor/nrk.py14
2 files changed, 3 insertions, 21 deletions
diff --git a/youtube_dl/extractor/abc.py b/youtube_dl/extractor/abc.py
index 879ded88d..c7b6df7d0 100644
--- a/youtube_dl/extractor/abc.py
+++ b/youtube_dl/extractor/abc.py
@@ -7,7 +7,6 @@ from ..utils import (
ExtractorError,
js_to_json,
int_or_none,
- update_url_query,
parse_iso8601,
)
@@ -123,14 +122,7 @@ class ABCIViewIE(InfoExtractor):
title = video_params['title']
stream = next(s for s in video_params['playlist'] if s.get('type') == 'program')
- formats = []
- f4m_url = stream.get('hds-unmetered') or stream['hds-metered']
- formats.extend(self._extract_f4m_formats(
- update_url_query(f4m_url, {'hdcore': '3.7.0'}),
- video_id, f4m_id='hds', fatal=False))
- formats.extend(self._extract_m3u8_formats(f4m_url.replace(
- 'akamaihd.net/z/', 'akamaihd.net/i/').replace('/manifest.f4m', '/master.m3u8'),
- video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False))
+ formats = self._extract_akamai_formats(stream['hds-unmetered'], video_id)
self._sort_formats(formats)
subtitles = {}
diff --git a/youtube_dl/extractor/nrk.py b/youtube_dl/extractor/nrk.py
index 6ded5bd45..ed42eb301 100644
--- a/youtube_dl/extractor/nrk.py
+++ b/youtube_dl/extractor/nrk.py
@@ -14,16 +14,6 @@ from ..utils import (
class NRKBaseIE(InfoExtractor):
- def _extract_formats(self, manifest_url, video_id, fatal=True):
- formats = []
- formats.extend(self._extract_f4m_formats(
- manifest_url + '?hdcore=3.5.0&plugin=aasp-3.5.0.151.81',
- video_id, f4m_id='hds', fatal=fatal))
- formats.extend(self._extract_m3u8_formats(manifest_url.replace(
- 'akamaihd.net/z/', 'akamaihd.net/i/').replace('/manifest.f4m', '/master.m3u8'),
- video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=fatal))
- return formats
-
def _real_extract(self, url):
video_id = self._match_id(url)
@@ -45,7 +35,7 @@ class NRKBaseIE(InfoExtractor):
asset_url = asset.get('url')
if not asset_url:
continue
- formats = self._extract_formats(asset_url, video_id, fatal=False)
+ formats = self._extract_akamai_formats(asset_url, video_id)
if not formats:
continue
self._sort_formats(formats)
@@ -69,7 +59,7 @@ class NRKBaseIE(InfoExtractor):
if not entries:
media_url = data.get('mediaUrl')
if media_url:
- formats = self._extract_formats(media_url, video_id)
+ formats = self._extract_akamai_formats(media_url, video_id)
self._sort_formats(formats)
duration = parse_duration(data.get('duration'))
entries = [{