mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-11-22 10:11:52 +00:00
[blinkx] Use centralized format sorting
This commit is contained in:
parent
bf5b0a1bfb
commit
4bc60dafeb
1 changed files with 5 additions and 2 deletions
|
@ -61,9 +61,10 @@ class BlinkxIE(InfoExtractor):
|
|||
elif m['type'] in ('flv', 'mp4'):
|
||||
vcodec = remove_start(m['vcodec'], 'ff')
|
||||
acodec = remove_start(m['acodec'], 'ff')
|
||||
tbr = (int(m['vbr']) + int(m['abr'])) // 1000
|
||||
format_id = (u'%s-%sk-%s' %
|
||||
(vcodec,
|
||||
(int(m['vbr']) + int(m['abr'])) // 1000,
|
||||
tbr,
|
||||
m['w']))
|
||||
formats.append({
|
||||
'format_id': format_id,
|
||||
|
@ -72,10 +73,12 @@ class BlinkxIE(InfoExtractor):
|
|||
'acodec': acodec,
|
||||
'abr': int(m['abr']) // 1000,
|
||||
'vbr': int(m['vbr']) // 1000,
|
||||
'tbr': tbr,
|
||||
'width': int(m['w']),
|
||||
'height': int(m['h']),
|
||||
})
|
||||
formats.sort(key=lambda f: (f['width'], f['vbr'], f['abr']))
|
||||
|
||||
self._sort_formats(formats)
|
||||
|
||||
return {
|
||||
'id': display_id,
|
||||
|
|
Loading…
Reference in a new issue