Roxedus/ytdl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[blinkx] Use centralized format sorting

Browse Source
This commit is contained in:
Philipp Hagemeister 2013-12-26 21:05:30 +01:00
parent bf5b0a1bfb
commit 4bc60dafeb
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
youtube_dl/extractor/blinkx.py
View File

@ -61,9 +61,10 @@ class BlinkxIE(InfoExtractor):
elif m['type'] in ('flv', 'mp4'): elif m['type'] in ('flv', 'mp4'):
vcodec = remove_start(m['vcodec'], 'ff') vcodec = remove_start(m['vcodec'], 'ff')
acodec = remove_start(m['acodec'], 'ff') acodec = remove_start(m['acodec'], 'ff')
tbr = (int(m['vbr']) + int(m['abr'])) // 1000
format_id = (u'%s-%sk-%s' % format_id = (u'%s-%sk-%s' %
(vcodec, (vcodec,
(int(m['vbr']) + int(m['abr'])) // 1000, tbr,
m['w'])) m['w']))
formats.append({ formats.append({
'format_id': format_id, 'format_id': format_id,
@ -72,10 +73,12 @@ class BlinkxIE(InfoExtractor):
'acodec': acodec, 'acodec': acodec,
'abr': int(m['abr']) // 1000, 'abr': int(m['abr']) // 1000,
'vbr': int(m['vbr']) // 1000, 'vbr': int(m['vbr']) // 1000,
'tbr': tbr,
'width': int(m['w']), 'width': int(m['w']),
'height': int(m['h']), 'height': int(m['h']),
}) })
formats.sort(key=lambda f: (f['width'], f['vbr'], f['abr']))
self._sort_formats(formats)
return { return {
'id': display_id, 'id': display_id,