[limelight] fix format sorting and make m3u8 and f4m extraction non fatal

This commit is contained in:
remitamine 2016-01-30 20:51:47 +01:00
parent 1bf996fa5c
commit 8f1fddc816

View file

@ -40,7 +40,8 @@ def _extract_info(self, streams, mobile_urls, properties):
if not stream_url: if not stream_url:
continue continue
if '.f4m' in stream_url: if '.f4m' in stream_url:
formats.extend(self._extract_f4m_formats(stream_url, video_id)) formats.extend(self._extract_f4m_formats(
stream_url, video_id, fatal=False))
else: else:
fmt = { fmt = {
'url': stream_url, 'url': stream_url,
@ -72,8 +73,8 @@ def _extract_info(self, streams, mobile_urls, properties):
format_id = mobile_url.get('targetMediaPlatform') format_id = mobile_url.get('targetMediaPlatform')
if determine_ext(media_url) == 'm3u8': if determine_ext(media_url) == 'm3u8':
formats.extend(self._extract_m3u8_formats( formats.extend(self._extract_m3u8_formats(
media_url, video_id, 'mp4', entry_protocol='m3u8_native', media_url, video_id, 'mp4', 'm3u8_native',
preference=-1, m3u8_id=format_id)) m3u8_id=format_id, fatal=False))
else: else:
formats.append({ formats.append({
'url': media_url, 'url': media_url,