|
|
@ -138,6 +138,7 @@ class ArteTVIE(ArteTVBaseIE):
|
|
|
|
break
|
|
|
|
break
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
lang_pref = -1
|
|
|
|
lang_pref = -1
|
|
|
|
|
|
|
|
format_note = '%s, %s' % (f.get('versionCode'), f.get('versionLibelle'))
|
|
|
|
|
|
|
|
|
|
|
|
media_type = f.get('mediaType')
|
|
|
|
media_type = f.get('mediaType')
|
|
|
|
if media_type == 'hls':
|
|
|
|
if media_type == 'hls':
|
|
|
@ -145,14 +146,17 @@ class ArteTVIE(ArteTVBaseIE):
|
|
|
|
format_url, video_id, 'mp4', entry_protocol='m3u8_native',
|
|
|
|
format_url, video_id, 'mp4', entry_protocol='m3u8_native',
|
|
|
|
m3u8_id=format_id, fatal=False)
|
|
|
|
m3u8_id=format_id, fatal=False)
|
|
|
|
for m3u8_format in m3u8_formats:
|
|
|
|
for m3u8_format in m3u8_formats:
|
|
|
|
m3u8_format['language_preference'] = lang_pref
|
|
|
|
m3u8_format.update({
|
|
|
|
|
|
|
|
'language_preference': lang_pref,
|
|
|
|
|
|
|
|
'format_note': format_note,
|
|
|
|
|
|
|
|
})
|
|
|
|
formats.extend(m3u8_formats)
|
|
|
|
formats.extend(m3u8_formats)
|
|
|
|
continue
|
|
|
|
continue
|
|
|
|
|
|
|
|
|
|
|
|
format = {
|
|
|
|
format = {
|
|
|
|
'format_id': format_id,
|
|
|
|
'format_id': format_id,
|
|
|
|
'language_preference': lang_pref,
|
|
|
|
'language_preference': lang_pref,
|
|
|
|
'format_note': '%s, %s' % (f.get('versionCode'), f.get('versionLibelle')),
|
|
|
|
'format_note': format_note,
|
|
|
|
'width': int_or_none(f.get('width')),
|
|
|
|
'width': int_or_none(f.get('width')),
|
|
|
|
'height': int_or_none(f.get('height')),
|
|
|
|
'height': int_or_none(f.get('height')),
|
|
|
|
'tbr': int_or_none(f.get('bitrate')),
|
|
|
|
'tbr': int_or_none(f.get('bitrate')),
|
|
|
|