projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[jwplatform] Improved m3u8 and rtmp support
[youtube-dl]
/
youtube_dl
/
extractor
/
wistia.py
diff --git
a/youtube_dl/extractor/wistia.py
b/youtube_dl/extractor/wistia.py
index 6eb94fcabc1440e3069c9491b5971c3635eae48d..c634b8decddf8fdb15649b05e8f49ad9efc36254 100644
(file)
--- a/
youtube_dl/extractor/wistia.py
+++ b/
youtube_dl/extractor/wistia.py
@@
-4,6
+4,7
@@
from .common import InfoExtractor
from ..utils import (
ExtractorError,
int_or_none,
from ..utils import (
ExtractorError,
int_or_none,
+ float_or_none,
)
)
@@
-27,6
+28,10
@@
class WistiaIE(InfoExtractor):
}, {
'url': 'wistia:sh7fpupwlt',
'only_matching': True,
}, {
'url': 'wistia:sh7fpupwlt',
'only_matching': True,
+ }, {
+ # with hls video
+ 'url': 'wistia:807fafadvk',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
@@
-63,6
+68,8
@@
class WistiaIE(InfoExtractor):
'height': int_or_none(a.get('height')),
})
else:
'height': int_or_none(a.get('height')),
})
else:
+ aext = a.get('ext')
+ is_m3u8 = a.get('container') == 'm3u8' or aext == 'm3u8'
formats.append({
'format_id': atype,
'url': aurl,
formats.append({
'format_id': atype,
'url': aurl,
@@
-73,7
+80,8
@@
class WistiaIE(InfoExtractor):
'filesize': int_or_none(a.get('size')),
'vcodec': a.get('codec'),
'container': a.get('container'),
'filesize': int_or_none(a.get('size')),
'vcodec': a.get('codec'),
'container': a.get('container'),
- 'ext': a.get('ext'),
+ 'ext': 'mp4' if is_m3u8 else aext,
+ 'protocol': 'm3u8' if is_m3u8 else None,
'preference': 1 if atype == 'original' else None,
})
'preference': 1 if atype == 'original' else None,
})
@@
-85,6
+93,6
@@
class WistiaIE(InfoExtractor):
'description': data.get('seoDescription'),
'formats': formats,
'thumbnails': thumbnails,
'description': data.get('seoDescription'),
'formats': formats,
'thumbnails': thumbnails,
- 'duration':
in
t_or_none(data.get('duration')),
+ 'duration':
floa
t_or_none(data.get('duration')),
'timestamp': int_or_none(data.get('createdAt')),
}
'timestamp': int_or_none(data.get('createdAt')),
}