w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[tv4] Fix hls and hds formats (Closes #10659)

Browse source
This commit is contained in:
Sergey M․ 2016-09-16 00:54:34 +07:00
parent f5e008d134
commit 9d8985a165
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
youtube_dl/extractor/tv4.py
View file

@ -2,9 +2,13 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import compat_str
from ..utils import ( from ..utils import (
ExtractorError, ExtractorError,
int_or_none,
parse_iso8601, parse_iso8601,
try_get,
update_url_query,
) )
@ -65,36 +69,47 @@ class TV4IE(InfoExtractor):
video_id = self._match_id(url) video_id = self._match_id(url)
info = self._download_json( info = self._download_json(
'http://www.tv4play.se/player/assets/%s.json' % video_id, video_id, 'Downloading video info JSON') 'http://www.tv4play.se/player/assets/%s.json' % video_id,
video_id, 'Downloading video info JSON')
# If is_geo_restricted is true, it doesn't necessarily mean we can't download it # If is_geo_restricted is true, it doesn't necessarily mean we can't download it
if info['is_geo_restricted']: if info.get('is_geo_restricted'):
self.report_warning('This content might not be available in your country due to licensing restrictions.') self.report_warning('This content might not be available in your country due to licensing restrictions.')
if info['requires_subscription']: if info.get('requires_subscription'):
raise ExtractorError('This content requires subscription.', expected=True) raise ExtractorError('This content requires subscription.', expected=True)
sources_data = self._download_json( title = info['title']
'https://prima.tv4play.se/api/web/asset/%s/play.json?protocol=http&videoFormat=MP4' % video_id, video_id, 'Downloading sources JSON')
sources = sources_data['playback']
formats = [] formats = []
for item in sources.get('items', {}).get('item', []): # http formats are linked with unresolvable host
ext, bitrate = item['mediaFormat'], item['bitrate'] for kind in ('hls', ''):
formats.append({ data = self._download_json(
'format_id': '%s_%s' % (ext, bitrate), 'https://prima.tv4play.se/api/web/asset/%s/play.json' % video_id,
'tbr': bitrate, video_id, 'Downloading sources JSON', query={
'ext': ext, 'protocol': kind,
'url': item['url'], 'videoFormat': 'MP4+WEBVTTS+WEBVTT',
}) })
item = try_get(data, lambda x: x['playback']['items']['item'], dict)
manifest_url = item.get('url')
if not isinstance(manifest_url, compat_str):
continue
if kind == 'hls':
formats.extend(self._extract_m3u8_formats(
manifest_url, video_id, 'mp4', entry_protocol='m3u8_native',
m3u8_id=kind, fatal=False))
else:
formats.extend(self._extract_f4m_formats(
update_url_query(manifest_url, {'hdcore': '3.8.0'}),
video_id, f4m_id='hds', fatal=False))
self._sort_formats(formats) self._sort_formats(formats)
return { return {
'id': video_id, 'id': video_id,
'title': info['title'], 'title': title,
'formats': formats, 'formats': formats,
'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': info.get('duration'), 'duration': int_or_none(info.get('duration')),
'thumbnail': info.get('image'), 'thumbnail': info.get('image'),
'is_live': sources.get('live'), 'is_live': info.get('is_live') is True,
} }