ansol/youtube-dl
7
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-30 00:26:24 +00:00
Code Issues Projects Releases Wiki Activity

[twitch:vod] Prefer source stream (Fixes #5143)

Browse Source
This commit is contained in:
Philipp Hagemeister 2015-03-06 10:53:49 +01:00
parent a0bb7c5593
commit d0e958c71c
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
youtube_dl/extractor/twitch.py
View File

@ -85,6 +85,14 @@ class TwitchBaseIE(InfoExtractor):
raise ExtractorError( raise ExtractorError(
'Unable to login: %s' % m.group('msg').strip(), expected=True) 'Unable to login: %s' % m.group('msg').strip(), expected=True)
def _prefer_source(self, formats):
try:
source = next(f for f in formats if f['format_id'] == 'Source')
source['preference'] = 10
except StopIteration:
pass # No Source stream present
self._sort_formats(formats)
class TwitchItemBaseIE(TwitchBaseIE): class TwitchItemBaseIE(TwitchBaseIE):
def _download_info(self, item, item_id): def _download_info(self, item, item_id):
@ -209,6 +217,7 @@ class TwitchVodIE(TwitchItemBaseIE):
'%s/vod/%s?nauth=%s&nauthsig=%s' '%s/vod/%s?nauth=%s&nauthsig=%s'
% (self._USHER_BASE, item_id, access_token['token'], access_token['sig']), % (self._USHER_BASE, item_id, access_token['token'], access_token['sig']),
item_id, 'mp4') item_id, 'mp4')
self._prefer_source(formats)
info['formats'] = formats info['formats'] = formats
return info return info
@ -357,13 +366,7 @@ class TwitchStreamIE(TwitchBaseIE):
'%s/api/channel/hls/%s.m3u8?%s' '%s/api/channel/hls/%s.m3u8?%s'
% (self._USHER_BASE, channel_id, compat_urllib_parse.urlencode(query).encode('utf-8')), % (self._USHER_BASE, channel_id, compat_urllib_parse.urlencode(query).encode('utf-8')),
channel_id, 'mp4') channel_id, 'mp4')
self._prefer_source(formats)
# prefer the 'source' stream, the others are limited to 30 fps
def _sort_source(f):
if f.get('m3u8_media') is not None and f['m3u8_media'].get('NAME') == 'Source':
return 1
return 0
formats = sorted(formats, key=_sort_source)
view_count = stream.get('viewers') view_count = stream.get('viewers')
timestamp = parse_iso8601(stream.get('created_at')) timestamp = parse_iso8601(stream.get('created_at'))