mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-12-24 15:15:50 +01:00
[tv4] fix format extraction(closes #16650)
This commit is contained in:
parent
9afd74d705
commit
6ae36035d9
@ -1,13 +1,12 @@
|
|||||||
# coding: utf-8
|
# coding: utf-8
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
import re
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..compat import compat_str
|
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
int_or_none,
|
int_or_none,
|
||||||
parse_iso8601,
|
parse_iso8601,
|
||||||
try_get,
|
|
||||||
determine_ext,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@ -78,42 +77,25 @@ class TV4IE(InfoExtractor):
|
|||||||
|
|
||||||
title = info['title']
|
title = info['title']
|
||||||
|
|
||||||
subtitles = {}
|
manifest_url = self._download_json(
|
||||||
formats = []
|
'https://playback-api.b17g.net/media/' + video_id,
|
||||||
# http formats are linked with unresolvable host
|
video_id, query={
|
||||||
for kind in ('hls3', ''):
|
'service': 'tv4',
|
||||||
data = self._download_json(
|
'device': 'browser',
|
||||||
'https://prima.tv4play.se/api/web/asset/%s/play.json' % video_id,
|
'protocol': 'hls',
|
||||||
video_id, 'Downloading sources JSON', query={
|
})['playbackItem']['manifestUrl']
|
||||||
'protocol': kind,
|
formats = self._extract_m3u8_formats(
|
||||||
'videoFormat': 'MP4+WEBVTT',
|
manifest_url, video_id, 'mp4',
|
||||||
})
|
'm3u8_native', m3u8_id='hls', fatal=False)
|
||||||
items = try_get(data, lambda x: x['playback']['items']['item'])
|
formats.extend(self._extract_mpd_formats(
|
||||||
if not items:
|
manifest_url.replace('.m3u8', '.mpd'),
|
||||||
continue
|
video_id, mpd_id='dash', fatal=False))
|
||||||
if isinstance(items, dict):
|
formats.extend(self._extract_f4m_formats(
|
||||||
items = [items]
|
manifest_url.replace('.m3u8', '.f4m'),
|
||||||
for item in items:
|
video_id, f4m_id='hds', fatal=False))
|
||||||
manifest_url = item.get('url')
|
formats.extend(self._extract_ism_formats(
|
||||||
if not isinstance(manifest_url, compat_str):
|
re.sub(r'\.ism/.+?\.m3u8', r'.ism/Manifest', manifest_url),
|
||||||
continue
|
video_id, ism_id='mss', fatal=False))
|
||||||
ext = determine_ext(manifest_url)
|
|
||||||
if ext == 'm3u8':
|
|
||||||
formats.extend(self._extract_m3u8_formats(
|
|
||||||
manifest_url, video_id, 'mp4', entry_protocol='m3u8_native',
|
|
||||||
m3u8_id=kind, fatal=False))
|
|
||||||
elif ext == 'f4m':
|
|
||||||
formats.extend(self._extract_akamai_formats(
|
|
||||||
manifest_url, video_id, {
|
|
||||||
'hls': 'tv4play-i.akamaihd.net',
|
|
||||||
}))
|
|
||||||
elif ext == 'webvtt':
|
|
||||||
subtitles = self._merge_subtitles(
|
|
||||||
subtitles, {
|
|
||||||
'sv': [{
|
|
||||||
'url': manifest_url,
|
|
||||||
'ext': 'vtt',
|
|
||||||
}]})
|
|
||||||
|
|
||||||
if not formats and info.get('is_geo_restricted'):
|
if not formats and info.get('is_geo_restricted'):
|
||||||
self.raise_geo_restricted(countries=self._GEO_COUNTRIES)
|
self.raise_geo_restricted(countries=self._GEO_COUNTRIES)
|
||||||
@ -124,7 +106,7 @@ class TV4IE(InfoExtractor):
|
|||||||
'id': video_id,
|
'id': video_id,
|
||||||
'title': title,
|
'title': title,
|
||||||
'formats': formats,
|
'formats': formats,
|
||||||
'subtitles': subtitles,
|
# 'subtitles': subtitles,
|
||||||
'description': info.get('description'),
|
'description': info.get('description'),
|
||||||
'timestamp': parse_iso8601(info.get('broadcast_date_time')),
|
'timestamp': parse_iso8601(info.get('broadcast_date_time')),
|
||||||
'duration': int_or_none(info.get('duration')),
|
'duration': int_or_none(info.get('duration')),
|
||||||
|
Loading…
Reference in New Issue
Block a user