Merge branch 'tvi_rtmp' into tvi

This commit is contained in:
PC 2015-10-10 22:30:42 +01:00
commit 077f47a9c6

View File

@ -93,6 +93,29 @@ class IOLIE(InfoExtractor):
m3u8_url_default = 'http://video-on-demand.iol.pt/vod_http/mp4:' + multimedia_id + '-L-500k.mp4/playlist.m3u8' m3u8_url_default = 'http://video-on-demand.iol.pt/vod_http/mp4:' + multimedia_id + '-L-500k.mp4/playlist.m3u8'
formats_m3u8_default = self._extract_m3u8_formats(m3u8_url_default, video_id, ext='mp4') formats_m3u8_default = self._extract_m3u8_formats(m3u8_url_default, video_id, ext='mp4')
formats.extend(formats_m3u8_default) formats.extend(formats_m3u8_default)
# try rtmp format
if self._html_search_regex(r'<script\s+src\s*=\s*"([^"]*/cdn\.iol\.pt/js/iol\.js)"', webpage, "iol.js", fatal=False):
server = 'video1.iol.pt'
try:
# get actual server
xml = self._download_xml('http://www.iol.pt/videolb', video_id, note='Downloading server info XML', fatal=False)
if 'redirect' == xml.tag:
server = xml.text
except Exception as ex:
# just ignore every error, rtmp is not essential
self.report_warning('RTMP server not found. %r' % (ex,))
formats.append({
'url': 'rtmp://' + server + '/vod',
'play_path': 'mp4:' + multimedia_id + '-L-500k',
'format_id': 'rtmp-500',
'tbr': 500,
'protocol': 'rtmp'
})
formats.append({ formats.append({
'url': 'http://www.iol.pt/videos-file/' + multimedia_id + '-L-500k.mp4', 'url': 'http://www.iol.pt/videos-file/' + multimedia_id + '-L-500k.mp4',
'format_id': 'http-500', 'format_id': 'http-500',