projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[lynda] minor changes
[youtube-dl]
/
youtube_dl
/
extractor
/
blinkx.py
diff --git
a/youtube_dl/extractor/blinkx.py
b/youtube_dl/extractor/blinkx.py
index e118f2e9f7064ef5880e5589e94e01cd75b16d59..0229840a3017e2e19fea6a895351fb8299beefd8 100644
(file)
--- a/
youtube_dl/extractor/blinkx.py
+++ b/
youtube_dl/extractor/blinkx.py
@@
-9,7
+9,7
@@
from ..utils import (
class BlinkxIE(InfoExtractor):
class BlinkxIE(InfoExtractor):
- _VALID_URL = r'^(?:https?://(?:www\.)blinkx\.com/ce/|blinkx:)(?P<id>[^?]+)'
+ _VALID_URL = r'^(?:https?://(?:www\.)blinkx\.com/
#?
ce/|blinkx:)(?P<id>[^?]+)'
_IE_NAME = u'blinkx'
_TEST = {
_IE_NAME = u'blinkx'
_TEST = {
@@
-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')
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,
format_id = (u'%s-%sk-%s' %
(vcodec,
-
(int(m['vbr']) + int(m['abr'])) // 1000
,
+
tbr
,
m['w']))
formats.append({
'format_id': format_id,
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,
'acodec': acodec,
'abr': int(m['abr']) // 1000,
'vbr': int(m['vbr']) // 1000,
+ 'tbr': tbr,
'width': int(m['w']),
'height': int(m['h']),
})
'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,
return {
'id': display_id,