[npo] Improve smooth stream skipping and set low preference for streams other than hds ans hls (Closes #5175)

This commit is contained in:
Sergey M․ 2015-03-11 20:34:32 +06:00
parent 2ebfeacabc
commit 32aaeca775

View File

@ -219,7 +219,8 @@ class NPOLiveIE(NPOBaseIE):
if streams: if streams:
for stream in streams: for stream in streams:
stream_type = stream.get('type').lower() stream_type = stream.get('type').lower()
if stream_type == 'ss': # smooth streaming is not supported
if stream_type in ['ss', 'ms']:
continue continue
stream_info = self._download_json( stream_info = self._download_json(
'http://ida.omroep.nl/aapi/?stream=%s&token=%s&type=jsonp' 'http://ida.omroep.nl/aapi/?stream=%s&token=%s&type=jsonp'
@ -242,6 +243,7 @@ class NPOLiveIE(NPOBaseIE):
else: else:
formats.append({ formats.append({
'url': stream_url, 'url': stream_url,
'preference': -10,
}) })
self._sort_formats(formats) self._sort_formats(formats)