PublicMirrors/you-get
1
0
Fork 0
mirror of https://github.com/soimort/you-get.git synced 2025-02-03 08:43:58 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

[youtube] enable all DASH streams

Browse Source
This commit is contained in:
Mort Yao 2015-11-06 05:57:56 +01:00
parent 1401f9ad97
commit f8220f164c
2 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/you_get/extractor.py
View File

@ -135,7 +135,9 @@ class VideoExtractor():
# Print DASH streams # Print DASH streams
if self.dash_streams: if self.dash_streams:
print(" [ DASH ] %s" % ('_' * 36)) print(" [ DASH ] %s" % ('_' * 36))
for stream in self.dash_streams: itags = sorted(self.dash_streams,
key=lambda i: -self.dash_streams[i]['size'])
for stream in itags:
self.p_stream(stream) self.p_stream(stream)
# Print all other available streams # Print all other available streams
print(" [ DEFAULT ] %s" % ('_' * 33)) print(" [ DEFAULT ] %s" % ('_' * 33))

59
src/you_get/extractors/youtube.py
View File

@ -241,38 +241,36 @@ class YouTube(VideoExtractor):
for rep in aset.getElementsByTagName('Representation'): for rep in aset.getElementsByTagName('Representation'):
w = int(rep.getAttribute('width')) w = int(rep.getAttribute('width'))
h = int(rep.getAttribute('height')) h = int(rep.getAttribute('height'))
if w > 1280: itag = rep.getAttribute('id')
itag = rep.getAttribute('id') burls = rep.getElementsByTagName('BaseURL')
burls = rep.getElementsByTagName('BaseURL') dash_url = burls[0].firstChild.nodeValue
dash_url = burls[0].firstChild.nodeValue dash_size = burls[0].getAttribute('yt:contentLength')
dash_size = burls[0].getAttribute('yt:contentLength') self.dash_streams[itag] = {
self.dash_streams[itag] = { 'quality': '%sx%s' % (w, h),
'quality': '%sx%s' % (w, h), 'itag': itag,
'itag': itag, 'type': mimeType,
'type': mimeType, 'mime': mimeType,
'mime': mimeType, 'container': 'mp4',
'container': 'mp4', 'src': [dash_url, dash_mp4_a_url],
'src': [dash_url, dash_mp4_a_url], 'size': int(dash_size) + int(dash_mp4_a_size)
'size': int(dash_size) + int(dash_mp4_a_size) }
}
elif mimeType == 'video/webm': elif mimeType == 'video/webm':
for rep in aset.getElementsByTagName('Representation'): for rep in aset.getElementsByTagName('Representation'):
w = int(rep.getAttribute('width')) w = int(rep.getAttribute('width'))
h = int(rep.getAttribute('height')) h = int(rep.getAttribute('height'))
if w > 1280: itag = rep.getAttribute('id')
itag = rep.getAttribute('id') burls = rep.getElementsByTagName('BaseURL')
burls = rep.getElementsByTagName('BaseURL') dash_url = burls[0].firstChild.nodeValue
dash_url = burls[0].firstChild.nodeValue dash_size = burls[0].getAttribute('yt:contentLength')
dash_size = burls[0].getAttribute('yt:contentLength') self.dash_streams[itag] = {
self.dash_streams[itag] = { 'quality': '%sx%s' % (w, h),
'quality': '%sx%s' % (w, h), 'itag': itag,
'itag': itag, 'type': mimeType,
'type': mimeType, 'mime': mimeType,
'mime': mimeType, 'container': 'webm',
'container': 'webm', 'src': [dash_url, dash_webm_a_url],
'src': [dash_url, dash_webm_a_url], 'size': int(dash_size) + int(dash_webm_a_size)
'size': int(dash_size) + int(dash_webm_a_size) }
}
except: except:
# VEVO # VEVO
self.js = get_content(self.html5player) self.js = get_content(self.html5player)
@ -296,8 +294,7 @@ class YouTube(VideoExtractor):
dash_webm_a_size = stream['clen'] dash_webm_a_size = stream['clen']
for stream in streams: # video for stream in streams: # video
if 'size' in stream: if 'size' in stream:
w = int(r1(r'(\d+)x\d+', stream['size'])) if stream['type'].startswith('video/mp4'):
if w > 1280 and stream['type'].startswith('video/mp4'):
mimeType = 'video/mp4' mimeType = 'video/mp4'
dash_url = stream['url'] dash_url = stream['url']
sig = self.__class__.decipher(self.js, stream['s']) sig = self.__class__.decipher(self.js, stream['s'])
@ -313,7 +310,7 @@ class YouTube(VideoExtractor):
'src': [dash_url, dash_mp4_a_url], 'src': [dash_url, dash_mp4_a_url],
'size': int(dash_size) + int(dash_mp4_a_size) 'size': int(dash_size) + int(dash_mp4_a_size)
} }
elif w > 1280 and stream['type'].startswith('video/webm'): elif stream['type'].startswith('video/webm'):
mimeType = 'video/webm' mimeType = 'video/webm'
dash_url = stream['url'] dash_url = stream['url']
sig = self.__class__.decipher(self.js, stream['s']) sig = self.__class__.decipher(self.js, stream['s'])