projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[vidzi] Fix extraction (closes #10908, closes #10952)
[youtube-dl]
/
youtube_dl
/
extractor
/
srgssr.py
diff --git
a/youtube_dl/extractor/srgssr.py
b/youtube_dl/extractor/srgssr.py
index d06d34316336f0221d7e328d92be925afe1f154e..246970c4d98a7d4592deadc1c7744c1504ccefef 100644
(file)
--- a/
youtube_dl/extractor/srgssr.py
+++ b/
youtube_dl/extractor/srgssr.py
@@
-57,30
+57,24
@@
class SRGSSRIE(InfoExtractor):
formats = []
for source in media_data.get('Playlists', {}).get('Playlist', []) + media_data.get('Downloads', {}).get('Download', []):
protocol = source.get('@protocol')
formats = []
for source in media_data.get('Playlists', {}).get('Playlist', []) + media_data.get('Downloads', {}).get('Download', []):
protocol = source.get('@protocol')
- if protocol in ('HTTP-HDS', 'HTTP-HLS'):
- assets = {}
- for quality in source['url']:
- assets[quality['@quality']] = quality['text']
- asset_url = assets.get('HD') or assets.get('HQ') or assets.get('SD') or assets.get('MQ') or assets.get('LQ')
- if '.f4m' in asset_url:
+ for asset in source['url']:
+ asset_url = asset['text']
+ quality = asset['@quality']
+ format_id = '%s-%s' % (protocol, quality)
+ if protocol == 'HTTP-HDS':
formats.extend(self._extract_f4m_formats(
asset_url + '?hdcore=3.4.0', media_id,
formats.extend(self._extract_f4m_formats(
asset_url + '?hdcore=3.4.0', media_id,
- f4m_id=
'hds'
, fatal=False))
- elif
'.m3u8' in asset_url
:
+ f4m_id=
format_id
, fatal=False))
+ elif
protocol == 'HTTP-HLS'
:
formats.extend(self._extract_m3u8_formats(
asset_url, media_id, 'mp4', 'm3u8_native',
formats.extend(self._extract_m3u8_formats(
asset_url, media_id, 'mp4', 'm3u8_native',
- m3u8_id='hls', fatal=False))
- else:
- for asset in source['url']:
- asset_url = asset['text']
- ext = None
- if asset_url.startswith('rtmp'):
- ext = self._search_regex(r'([a-z0-9]+):[^/]+', asset_url, 'ext')
+ m3u8_id=format_id, fatal=False))
+ else:
formats.append({
formats.append({
- 'format_id':
asset['@quality']
,
+ 'format_id':
format_id
,
'url': asset_url,
'url': asset_url,
- 'preference': preference(
asset['@quality']
),
- 'ext':
ext
,
+ 'preference': preference(
quality
),
+ 'ext':
'flv' if protocol == 'RTMP' else None
,
})
self._sort_formats(formats)
})
self._sort_formats(formats)