[rtlnl] Add support for progressive videos (Closes #3603)

This commit is contained in:
Sergey M․ 2014-08-28 22:54:06 +07:00
parent a520c11241
commit de2d9f5f1b
1 changed files with 23 additions and 11 deletions

View File

@ -12,22 +12,16 @@ class RtlXlIE(InfoExtractor):
_TEST = { _TEST = {
'url': 'http://www.rtlxl.nl/#!/rtl-nieuws-132237/6e4203a6-0a5e-3596-8424-c599a59e0677', 'url': 'http://www.rtlxl.nl/#!/rtl-nieuws-132237/6e4203a6-0a5e-3596-8424-c599a59e0677',
'md5': 'cc16baa36a6c169391f0764fa6b16654',
'info_dict': { 'info_dict': {
'id': '6e4203a6-0a5e-3596-8424-c599a59e0677', 'id': '6e4203a6-0a5e-3596-8424-c599a59e0677',
'ext': 'flv', 'ext': 'mp4',
'title': 'RTL Nieuws - Laat', 'title': 'RTL Nieuws - Laat',
'description': 'Dagelijks het laatste nieuws uit binnen- en ' 'description': 'md5:6b61f66510c8889923b11f2778c72dc5',
'buitenland. Voor nog meer nieuws kunt u ook gebruikmaken van '
'onze mobiele apps.',
'timestamp': 1408051800, 'timestamp': 1408051800,
'upload_date': '20140814', 'upload_date': '20140814',
'duration': 576.880, 'duration': 576.880,
}, },
'params': {
# We download the first bytes of the first fragment, it can't be
# processed by the f4m downloader beacuse it isn't complete
'skip_download': True,
},
} }
def _real_extract(self, url): def _real_extract(self, url):
@ -41,14 +35,32 @@ class RtlXlIE(InfoExtractor):
material = info['material'][0] material = info['material'][0]
episode_info = info['episodes'][0] episode_info = info['episodes'][0]
f4m_url = 'http://manifest.us.rtl.nl' + material['videopath']
progname = info['abstracts'][0]['name'] progname = info['abstracts'][0]['name']
subtitle = material['title'] or info['episodes'][0]['name'] subtitle = material['title'] or info['episodes'][0]['name']
videopath = material['videopath']
f4m_url = 'http://manifest.us.rtl.nl' + videopath
formats = self._extract_f4m_formats(f4m_url, uuid)
video_urlpart = videopath.split('/flash/')[1][:-4]
PG_URL_TEMPLATE = 'http://pg.us.rtl.nl/rtlxl/network/%s/progressive/%s.mp4'
formats.extend([
{
'url': PG_URL_TEMPLATE % ('a2m', video_urlpart),
'format_id': 'pg-sd',
},
{
'url': PG_URL_TEMPLATE % ('a3m', video_urlpart),
'format_id': 'pg-hd',
}
])
return { return {
'id': uuid, 'id': uuid,
'title': '%s - %s' % (progname, subtitle), 'title': '%s - %s' % (progname, subtitle),
'formats': self._extract_f4m_formats(f4m_url, uuid), 'formats': formats,
'timestamp': material['original_date'], 'timestamp': material['original_date'],
'description': episode_info['synopsis'], 'description': episode_info['synopsis'],
'duration': parse_duration(material.get('duration')), 'duration': parse_duration(material.get('duration')),