From 5d7edefcb7058bd233186b206579e1c4228a31ab Mon Sep 17 00:00:00 2001 From: mars67857 Date: Sun, 15 Oct 2017 22:17:49 -0700 Subject: [PATCH] WSS:// URLs aren't supported, so limit to RTMP and HLS-over-HTTP protocols. --- youtube_dl/extractor/cammodels.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/youtube_dl/extractor/cammodels.py b/youtube_dl/extractor/cammodels.py index af5b89399..1711d7096 100644 --- a/youtube_dl/extractor/cammodels.py +++ b/youtube_dl/extractor/cammodels.py @@ -55,13 +55,8 @@ class CamModelsIE(InfoExtractor): headers=self._HEADERS) try: formats = [] - all_formats = manifest['formats'] - for fmtName in all_formats: - fmt = all_formats[fmtName] - encodings = fmt.get('encodings') - if not encodings: - continue - for encoding in encodings: + for fmtName in ['mp4-rtmp', 'mp4-hls']: + for encoding in manifest['formats'][fmtName]['encodings']: formats.append({ 'ext': 'mp4', 'url': encoding['location'], @@ -86,7 +81,7 @@ class CamModelsIE(InfoExtractor): for manifest_link in manifest_links: url = manifest_link.group('id') formats.append({ - 'ext': 'flv', + 'ext': 'mp4', 'url': url, 'format_id': url.split(sep='/')[-1] })