mirrors/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-11-04 08:35:12 +00:00
Code Issues Projects Releases Wiki Activity

[formatsort] Remove misuse of 'preference'

Browse Source 
'preference' is to be used only when the format is better that ALL qualities of a lower preference irrespective of ANY sorting order the user requests. See deezer.py for correct use of this

In the older sorting method, `preference`, `quality` and `language_preference` were functionally almost equivalent. So these disparities doesn't really matter there

Also, despite what the documentation says, the default for `preference` was actually 0 and not -1. I have tried to correct this and also account for it when converting `preference` to `quality`
This commit is contained in:
pukkandan
2021-02-19 03:33:16 +05:30
parent dca3ff4a5e
commit f983b87567
61 changed files with 89 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dlc/extractor/adobetv.py
View File

@@ -66,7 +66,7 @@ class AdobeTVBaseIE(InfoExtractor):
if original_filename.startswith('s3://') and not s3_extracted:
formats.append({
'format_id': 'original',
'preference': 1,
'quality': 1,
'url': original_filename.replace('s3://', 'https://s3.amazonaws.com/'),
})
s3_extracted = True

6
youtube_dlc/extractor/arcpublishing.py
View File

@@ -129,10 +129,6 @@ class ArcPublishingIE(InfoExtractor):
if all([f.get('acodec') == 'none' for f in m3u8_formats]):
continue
for f in m3u8_formats:
if f.get('acodec') == 'none':
f['preference'] = -40
elif f.get('vcodec') == 'none':
f['preference'] = -50
height = f.get('height')
if not height:
continue
@@ -150,7 +146,7 @@ class ArcPublishingIE(InfoExtractor):
'height': int_or_none(s.get('height')),
'filesize': int_or_none(s.get('filesize')),
'url': s_url,
'preference': -1,
'quality': -10,
})
self._sort_formats(formats)

1
youtube_dlc/extractor/arte.py
View File

@@ -150,7 +150,6 @@ class ArteTVIE(ArteTVBaseIE):
format = {
'format_id': format_id,
'preference': -10 if f.get('videoFormat') == 'M3U8' else None,
'language_preference': lang_pref,
'format_note': '%s, %s' % (f.get('versionCode'), f.get('versionLibelle')),
'width': int_or_none(f.get('width')),

2
youtube_dlc/extractor/beatport.py
View File

@@ -69,12 +69,10 @@ class BeatportIE(InfoExtractor):
'vcodec': 'none',
}
if ext == 'mp3':
fmt['preference'] = 0
fmt['acodec'] = 'mp3'
fmt['abr'] = 96
fmt['asr'] = 44100
elif ext == 'mp4':
fmt['preference'] = 1
fmt['acodec'] = 'aac'
fmt['abr'] = 96
fmt['asr'] = 44100

2
youtube_dlc/extractor/bilibili.py
View File

@@ -203,7 +203,7 @@ class BiliBiliIE(InfoExtractor):
formats.append({
'url': backup_url,
# backup URLs have lower priorities
'preference': -2 if 'hd.mp4' in backup_url else -3,
'quality': -2 if 'hd.mp4' in backup_url else -3,
})
for a_format in formats:

2
youtube_dlc/extractor/bokecc.py
View File

@@ -23,7 +23,7 @@ class BokeCCBaseIE(InfoExtractor):
formats = [{
'format_id': format_id,
'url': quality.find('./copy').attrib['playurl'],
'preference': int(quality.attrib['value']),
'quality': int(quality.attrib['value']),
} for quality in info_xml.findall('./video/quality')]
self._sort_formats(formats)

2
youtube_dlc/extractor/bpb.py
View File

@@ -47,7 +47,7 @@ class BpbIE(InfoExtractor):
quality = 'high' if '_high' in video_url else 'low'
formats.append({
'url': video_url,
'preference': 10 if quality == 'high' else 0,
'quality': 10 if quality == 'high' else 0,
'format_note': quality,
'format_id': '%s-%s' % (quality, determine_ext(video_url)),
})

2
youtube_dlc/extractor/cammodels.py
View File

@@ -82,7 +82,7 @@ class CamModelsIE(InfoExtractor):
f.update({
'ext': 'mp4',
# hls skips fragments, preferring rtmp
'preference': -1,
'quality': -10,
})
else:
continue

2
youtube_dlc/extractor/canalplus.py
View File

@@ -89,7 +89,7 @@ class CanalplusIE(InfoExtractor):
# the secret extracted from ya function in http://player.canalplus.fr/common/js/canalPlayer.js
'url': format_url + '?secret=pqzerjlsmdkjfoiuerhsdlfknaes',
'format_id': format_id,
'preference': preference(format_id),
'quality': preference(format_id),
})
self._sort_formats(formats)

2
youtube_dlc/extractor/cctv.py
View File

@@ -162,7 +162,7 @@ class CCTVIE(InfoExtractor):
'url': video_url,
'format_id': 'http',
'quality': quality,
'preference': -1,
'source_preference': -10
})
hls_url = try_get(data, lambda x: x['hls_url'], compat_str)

39
youtube_dlc/extractor/common.py
View File

@@ -1384,11 +1384,11 @@ class InfoExtractor(object):
'order': ('m4a', 'aac', 'mp3', 'ogg', 'opus', 'webm', '', 'none'),
'order_free': ('opus', 'ogg', 'webm', 'm4a', 'mp3', 'aac', '', 'none')},
'hidden': {'visible': False, 'forced': True, 'type': 'extractor', 'max': -1000},
'ie_pref': {'priority': True, 'type': 'extractor', 'field': 'extractor_preference'},
'ie_pref': {'priority': True, 'type': 'extractor'},
'hasvid': {'priority': True, 'field': 'vcodec', 'type': 'boolean', 'not_in_list': ('none',)},
'hasaud': {'field': 'acodec', 'type': 'boolean', 'not_in_list': ('none',)},
'lang': {'priority': True, 'convert': 'ignore', 'field': 'language_preference'},
'quality': {'convert': 'float_none'},
'lang': {'priority': True, 'convert': 'ignore', 'type': 'extractor', 'field': 'language_preference'},
'quality': {'convert': 'float_none', 'type': 'extractor'},
'filesize': {'convert': 'bytes'},
'fs_approx': {'convert': 'bytes', 'field': 'filesize_approx'},
'id': {'convert': 'string', 'field': 'format_id'},
@@ -1399,7 +1399,7 @@ class InfoExtractor(object):
'vbr': {'convert': 'float_none'},
'abr': {'convert': 'float_none'},
'asr': {'convert': 'float_none'},
'source': {'convert': 'ignore', 'field': 'source_preference'},
'source': {'convert': 'ignore', 'type': 'extractor', 'field': 'source_preference'},
'codec': {'type': 'combined', 'field': ('vcodec', 'acodec')},
'br': {'type': 'combined', 'field': ('tbr', 'vbr', 'abr'), 'same_limit': True},
@@ -1543,7 +1543,7 @@ class InfoExtractor(object):
def print_verbose_info(self, to_screen):
to_screen('[debug] Sort order given by user: %s' % ','.join(self._sort_user))
if self._sort_extractor:
to_screen('[debug] Sort order given by extractor: %s' % ','.join(self._sort_extractor))
to_screen('[debug] Sort order given by extractor: %s' % ', '.join(self._sort_extractor))
to_screen('[debug] Formats sorted by: %s' % ', '.join(['%s%s%s' % (
'+' if self._get_field_setting(field, 'reverse') else '', field,
'%s%s(%s)' % ('~' if self._get_field_setting(field, 'closest') else ':',
@@ -1560,7 +1560,7 @@ class InfoExtractor(object):
if type == 'extractor':
maximum = self._get_field_setting(field, 'max')
if value is None or (maximum is not None and value >= maximum):
value = 0
value = -1
elif type == 'boolean':
in_list = self._get_field_setting(field, 'in_list')
not_in_list = self._get_field_setting(field, 'not_in_list')
@@ -1693,7 +1693,7 @@ class InfoExtractor(object):
self.to_screen(msg)
time.sleep(timeout)
def _extract_f4m_formats(self, manifest_url, video_id, preference=None, f4m_id=None,
def _extract_f4m_formats(self, manifest_url, video_id, preference=None, quality=None, f4m_id=None,
transform_source=lambda s: fix_xml_ampersands(s).strip(),
fatal=True, m3u8_id=None, data=None, headers={}, query={}):
manifest = self._download_xml(
@@ -1708,10 +1708,10 @@ class InfoExtractor(object):
return []
return self._parse_f4m_formats(
manifest, manifest_url, video_id, preference=preference, f4m_id=f4m_id,
manifest, manifest_url, video_id, preference=preference, quality=quality, f4m_id=f4m_id,
transform_source=transform_source, fatal=fatal, m3u8_id=m3u8_id)
def _parse_f4m_formats(self, manifest, manifest_url, video_id, preference=None, f4m_id=None,
def _parse_f4m_formats(self, manifest, manifest_url, video_id, preference=None, quality=None, f4m_id=None,
transform_source=lambda s: fix_xml_ampersands(s).strip(),
fatal=True, m3u8_id=None):
if not isinstance(manifest, compat_etree_Element) and not fatal:
@@ -1776,7 +1776,7 @@ class InfoExtractor(object):
ext = determine_ext(manifest_url)
if ext == 'f4m':
f4m_formats = self._extract_f4m_formats(
manifest_url, video_id, preference=preference, f4m_id=f4m_id,
manifest_url, video_id, preference=preference, quality=quality, f4m_id=f4m_id,
transform_source=transform_source, fatal=fatal)
# Sometimes stream-level manifest contains single media entry that
# does not contain any quality metadata (e.g. http://matchtv.ru/#live-player).
@@ -1796,7 +1796,7 @@ class InfoExtractor(object):
elif ext == 'm3u8':
formats.extend(self._extract_m3u8_formats(
manifest_url, video_id, 'mp4', preference=preference,
m3u8_id=m3u8_id, fatal=fatal))
quality=quality, m3u8_id=m3u8_id, fatal=fatal))
continue
formats.append({
'format_id': format_id,
@@ -1809,22 +1809,24 @@ class InfoExtractor(object):
'height': height,
'vcodec': vcodec,
'preference': preference,
'quality': quality,
})
return formats
def _m3u8_meta_format(self, m3u8_url, ext=None, preference=None, m3u8_id=None):
def _m3u8_meta_format(self, m3u8_url, ext=None, preference=None, quality=None, m3u8_id=None):
return {
'format_id': '-'.join(filter(None, [m3u8_id, 'meta'])),
'url': m3u8_url,
'ext': ext,
'protocol': 'm3u8',
'preference': preference - 100 if preference else -100,
'quality': quality,
'resolution': 'multiple',
'format_note': 'Quality selection URL',
}
def _extract_m3u8_formats(self, m3u8_url, video_id, ext=None,
entry_protocol='m3u8', preference=None,
entry_protocol='m3u8', preference=None, quality=None,
m3u8_id=None, note=None, errnote=None,
fatal=True, live=False, data=None, headers={},
query={}):
@@ -1842,10 +1844,10 @@ class InfoExtractor(object):
return self._parse_m3u8_formats(
m3u8_doc, m3u8_url, ext=ext, entry_protocol=entry_protocol,
preference=preference, m3u8_id=m3u8_id, live=live)
preference=preference, quality=quality, m3u8_id=m3u8_id, live=live)
def _parse_m3u8_formats(self, m3u8_doc, m3u8_url, ext=None,
entry_protocol='m3u8', preference=None,
entry_protocol='m3u8', preference=None, quality=None,
m3u8_id=None, live=False):
if '#EXT-X-FAXS-CM:' in m3u8_doc: # Adobe Flash Access
return []
@@ -1883,6 +1885,7 @@ class InfoExtractor(object):
'ext': ext,
'protocol': entry_protocol,
'preference': preference,
'quality': quality,
}]
groups = {}
@@ -1911,6 +1914,7 @@ class InfoExtractor(object):
'ext': ext,
'protocol': entry_protocol,
'preference': preference,
'quality': quality,
}
if media_type == 'AUDIO':
f['vcodec'] = 'none'
@@ -1970,6 +1974,7 @@ class InfoExtractor(object):
'fps': float_or_none(last_stream_inf.get('FRAME-RATE')),
'protocol': entry_protocol,
'preference': preference,
'quality': quality,
}
resolution = last_stream_inf.get('RESOLUTION')
if resolution:
@@ -2677,7 +2682,7 @@ class InfoExtractor(object):
})
return formats
def _parse_html5_media_entries(self, base_url, webpage, video_id, m3u8_id=None, m3u8_entry_protocol='m3u8', mpd_id=None, preference=None):
def _parse_html5_media_entries(self, base_url, webpage, video_id, m3u8_id=None, m3u8_entry_protocol='m3u8', mpd_id=None, preference=None, quality=None):
def absolute_url(item_url):
return urljoin(base_url, item_url)
@@ -2700,7 +2705,7 @@ class InfoExtractor(object):
formats = self._extract_m3u8_formats(
full_url, video_id, ext='mp4',
entry_protocol=m3u8_entry_protocol, m3u8_id=m3u8_id,
preference=preference, fatal=False)
preference=preference, quality=quality, fatal=False)
elif ext == 'mpd':
is_plain_url = False
formats = self._extract_mpd_formats(

6
youtube_dlc/extractor/coub.py
View File

@@ -87,7 +87,7 @@ class CoubIE(InfoExtractor):
'filesize': int_or_none(item.get('size')),
'vcodec': 'none' if kind == 'audio' else None,
'quality': quality_key(quality),
'preference': preference_key(HTML5),
'source_preference': preference_key(HTML5),
})
iphone_url = file_versions.get(IPHONE, {}).get('url')
@@ -95,7 +95,7 @@ class CoubIE(InfoExtractor):
formats.append({
'url': iphone_url,
'format_id': IPHONE,
'preference': preference_key(IPHONE),
'source_preference': preference_key(IPHONE),
})
mobile_url = file_versions.get(MOBILE, {}).get('audio_url')
@@ -103,7 +103,7 @@ class CoubIE(InfoExtractor):
formats.append({
'url': mobile_url,
'format_id': '%s-audio' % MOBILE,
'preference': preference_key(MOBILE),
'source_preference': preference_key(MOBILE),
})
self._sort_formats(formats)

14
youtube_dlc/extractor/crunchyroll.py
View File

@@ -473,15 +473,11 @@ Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
stream.get('url'), video_id, stream.get('format'),
audio_lang, hardsub_lang)
for f in vrv_formats:
if not hardsub_lang:
f['preference'] = 1
language_preference = 0
if audio_lang == language:
language_preference += 1
if hardsub_lang == language:
language_preference += 1
if language_preference:
f['language_preference'] = language_preference
f['language_preference'] = 1 if audio_lang == language else 0
f['quality'] = (
1 if not hardsub_lang
else 0 if hardsub_lang == language
else -1)
formats.extend(vrv_formats)
if not formats:
available_fmts = []

3
youtube_dlc/extractor/dispeak.py
View File

@@ -82,6 +82,7 @@ class DigitallySpeakingIE(InfoExtractor):
'play_path': remove_end(audio.get('url'), '.flv'),
'ext': 'flv',
'vcodec': 'none',
'quality': 1,
'format_id': audio.get('code'),
})
slide_video_path = xpath_text(metadata, './slideVideo', fatal=True)
@@ -91,7 +92,6 @@ class DigitallySpeakingIE(InfoExtractor):
'ext': 'flv',
'format_note': 'slide deck video',
'quality': -2,
'preference': -2,
'format_id': 'slides',
'acodec': 'none',
})
@@ -102,7 +102,6 @@ class DigitallySpeakingIE(InfoExtractor):
'ext': 'flv',
'format_note': 'speaker video',
'quality': -1,
'preference': -1,
'format_id': 'speaker',
})
return formats

4
youtube_dlc/extractor/drtv.py
View File

@@ -242,7 +242,7 @@ class DRTVIE(InfoExtractor):
elif target == 'HLS':
formats.extend(self._extract_m3u8_formats(
uri, video_id, 'mp4', entry_protocol='m3u8_native',
preference=preference, m3u8_id=format_id,
quality=preference, m3u8_id=format_id,
fatal=False))
else:
bitrate = link.get('Bitrate')
@@ -254,7 +254,7 @@ class DRTVIE(InfoExtractor):
'tbr': int_or_none(bitrate),
'ext': link.get('FileFormat'),
'vcodec': 'none' if kind == 'AudioResource' else None,
'preference': preference,
'quality': preference,
})
subtitles_list = asset.get('SubtitlesList') or asset.get('Subtitleslist')
if isinstance(subtitles_list, list):

2
youtube_dlc/extractor/espn.py
View File

@@ -154,7 +154,7 @@ class ESPNIE(OnceIE):
'tbr': int(mobj.group(3)),
})
if source_id == 'mezzanine':
f['preference'] = 1
f['quality'] = 1
formats.append(f)
links = clip.get('links', {})

2
youtube_dlc/extractor/facebook.py
View File

@@ -619,7 +619,7 @@ class FacebookIE(InfoExtractor):
formats.append({
'format_id': '%s_%s_%s' % (format_id, quality, src_type),
'url': src,
'preference': preference,
'quality': preference,
})
extract_dash_manifest(f[0], formats)
subtitles_src = f[0].get('subtitles_src')

2
youtube_dlc/extractor/firsttv.py
View File

@@ -104,7 +104,7 @@ class FirstTVIE(InfoExtractor):
'tbr': tbr,
'source_preference': quality(f.get('name')),
# quality metadata of http formats may be incorrect
'preference': -1,
'preference': -10,
})
# m3u8 URL format is reverse engineered from [1] (search for
# master.m3u8). dashEdges (that is currently balancer-vod.1tv.ru)

2
youtube_dlc/extractor/flickr.py
View File

@@ -88,7 +88,7 @@ class FlickrIE(InfoExtractor):
formats.append({
'format_id': stream_type,
'url': stream['_content'],
'preference': preference(stream_type),
'quality': preference(stream_type),
})
self._sort_formats(formats)

2
youtube_dlc/extractor/go.py
View File

@@ -236,7 +236,7 @@ class GoIE(AdobePassIE):
if re.search(r'(?:/mp4/source/|_source\.mp4)', asset_url):
f.update({
'format_id': ('%s-' % format_id if format_id else '') + 'SOURCE',
'preference': 1,
'quality': 1,
})
else:
mobj = re.search(r'/(\d+)x(\d+)/', asset_url)

2
youtube_dlc/extractor/hearthisat.py
View File

@@ -115,7 +115,7 @@ class HearThisAtIE(InfoExtractor):
'vcodec': 'none',
'ext': ext,
'url': download_url,
'preference': 2, # Usually better quality
'quality': 2, # Usually better quality
})
self._sort_formats(formats)

2
youtube_dlc/extractor/ign.py
View File

@@ -100,7 +100,7 @@ class IGNIE(IGNBaseIE):
formats.append({
'ext': determine_ext(mezzanine_url, 'mp4'),
'format_id': 'mezzanine',
'preference': 1,
'quality': 1,
'url': mezzanine_url,
})

2
youtube_dlc/extractor/imgur.py
View File

@@ -72,7 +72,7 @@ class ImgurIE(InfoExtractor):
gif_json, video_id, transform_source=js_to_json)
formats.append({
'format_id': 'gif',
'preference': -10,
'preference': -10, # gifs are worse than videos
'width': width,
'height': height,
'ext': 'gif',

2
youtube_dlc/extractor/iqiyi.py
View File

@@ -373,7 +373,7 @@ class IqiyiIE(InfoExtractor):
'url': stream['m3utx'],
'format_id': vd,
'ext': 'mp4',
'preference': self._FORMATS_MAP.get(vd, -1),
'quality': self._FORMATS_MAP.get(vd, -1),
'protocol': 'm3u8_native',
})

2
youtube_dlc/extractor/kuwo.py
View File

@@ -49,7 +49,7 @@ class KuwoBaseIE(InfoExtractor):
'url': song_url,
'format_id': file_format['format'],
'format': file_format['format'],
'preference': file_format['preference'],
'quality': file_format['preference'],
'abr': file_format.get('abr'),
})

2
youtube_dlc/extractor/lifenews.py
View File

@@ -201,7 +201,7 @@ class LifeEmbedIE(InfoExtractor):
formats.append({
'url': original_url,
'format_id': determine_ext(original_url, None),
'preference': 1,
'quality': 1,
})
playlist = self._parse_json(

2
youtube_dlc/extractor/limelight.py
View File

@@ -175,7 +175,7 @@ class LimelightBaseIE(InfoExtractor):
formats.append({
'url': media_url,
'format_id': format_id,
'preference': -1,
'quality': -10,
'ext': ext,
})

2
youtube_dlc/extractor/liveleak.py
View File

@@ -143,7 +143,7 @@ class LiveLeakIE(InfoExtractor):
formats.append({
'format_id': format_id,
'url': orig_url,
'preference': 1,
'quality': 1,
})
self._sort_formats(formats)
info_dict['formats'] = formats

2
youtube_dlc/extractor/livestream.py
View File

@@ -84,7 +84,7 @@ class LivestreamIE(InfoExtractor):
'format_id': 'smil_%d' % tbr,
'ext': 'flv',
'tbr': tbr,
'preference': -1000,
'preference': -1000, # Strictly inferior than all other formats?
})
return formats

4
youtube_dlc/extractor/mdr.py
View File

@@ -137,11 +137,11 @@ class MDRIE(InfoExtractor):
if ext == 'm3u8':
formats.extend(self._extract_m3u8_formats(
video_url, video_id, 'mp4', entry_protocol='m3u8_native',
preference=0, m3u8_id='HLS', fatal=False))
quality=1, m3u8_id='HLS', fatal=False))
elif ext == 'f4m':
formats.extend(self._extract_f4m_formats(
video_url + '?hdcore=3.7.0&plugin=aasp-3.7.0.39.44', video_id,
preference=0, f4m_id='HDS', fatal=False))
quality=1, f4m_id='HDS', fatal=False))
else:
media_type = xpath_text(asset, './mediaType', 'media type', default='MP4')
vbr = int_or_none(xpath_text(asset, './bitrateVideo', 'vbr'), 1000)

2
youtube_dlc/extractor/mediasite.py
View File

@@ -206,7 +206,7 @@ class MediasiteIE(InfoExtractor):
# disprefer 'secondary' streams
if stream_type != 0:
for fmt in stream_formats:
fmt['preference'] = -1
fmt['quality'] = -10
thumbnail_url = Stream.get('ThumbnailUrl')
if thumbnail_url:

2
youtube_dlc/extractor/msn.py
View File

@@ -132,7 +132,7 @@ class MSNIE(InfoExtractor):
'width': int_or_none(file_.get('width')),
'height': int_or_none(file_.get('height')),
'vbr': int_or_none(self._search_regex(r'_(\d+)\.mp4', format_url, 'vbr', default=None)),
'preference': 1 if format_id == '1001' else None,
'quality': 1 if format_id == '1001' else None,
})
self._sort_formats(formats)

2
youtube_dlc/extractor/muenchentv.py
View File

@@ -61,7 +61,7 @@ class MuenchenTVIE(InfoExtractor):
'tbr': int_or_none(s.get('label')),
'ext': 'mp4',
'format_id': format_id,
'preference': -100 if '.smil' in s['file'] else 0,
'preference': -100 if '.smil' in s['file'] else 0, # Strictly inferior than all other formats?
})
self._sort_formats(formats)

2
youtube_dlc/extractor/nba.py
View File

@@ -303,7 +303,7 @@ class NBABaseIE(NBACVPBaseIE):
formats.append({
'format_id': 'source',
'url': source_url,
'preference': 1,
'quality': 1,
})
m3u8_url = video.get('m3u8')

2
youtube_dlc/extractor/noco.py
View File

@@ -183,7 +183,7 @@ class NocoIE(InfoExtractor):
'filesize': int_or_none(fmt.get('filesize')),
'format_note': qualities[format_id].get('quality_name'),
'quality': qualities[format_id].get('priority'),
'preference': preference,
'language_preference': preference,
})
self._sort_formats(formats)

2
youtube_dlc/extractor/npo.py
View File

@@ -425,7 +425,7 @@ class NPOIE(NPOBaseIE):
stream_url, video_id, fatal=False)
# f4m downloader downloads only piece of live stream
for f4m_format in f4m_formats:
f4m_format['preference'] = -1
f4m_format['preference'] = -5
formats.extend(f4m_formats)
elif stream_type == 'hls':
formats.extend(self._extract_m3u8_formats(

2
youtube_dlc/extractor/ntvde.py
View File

@@ -62,7 +62,7 @@ class NTVDeIE(InfoExtractor):
m3u8_url = compat_urlparse.urljoin('http://video.n-tv.de', vdata['videoM3u8'])
formats.extend(self._extract_m3u8_formats(
m3u8_url, video_id, ext='mp4', entry_protocol='m3u8_native',
preference=0, m3u8_id='hls', fatal=False))
quality=1, m3u8_id='hls', fatal=False))
self._sort_formats(formats)
return {

2
youtube_dlc/extractor/ora.py
View File

@@ -55,7 +55,7 @@ class OraTVIE(InfoExtractor):
formats.append({
'url': http_template % q,
'format_id': q,
'preference': preference(q),
'quality': preference(q),
})
self._sort_formats(formats)
else:

4
youtube_dlc/extractor/picarto.py
View File

@@ -78,7 +78,7 @@ class PicartoIE(InfoExtractor):
update_url_query(
'https://%s/hls/%s/index.m3u8'
% (edge_ep, channel_id), params),
channel_id, 'mp4', preference=preference,
channel_id, 'mp4', quality=preference,
m3u8_id='-'.join(format_id), fatal=False))
continue
elif tech_type == 'video/mp4' or tech_label == 'MP4':
@@ -88,7 +88,7 @@ class PicartoIE(InfoExtractor):
'https://%s/mp4/%s.mp4' % (edge_ep, channel_id),
params),
'format_id': '-'.join(format_id),
'preference': preference,
'quality': preference,
})
else:
# rtmp format does not seem to work

2
youtube_dlc/extractor/playtvak.py
View File

@@ -150,7 +150,7 @@ class PlaytvakIE(InfoExtractor):
ext = 'mp4'
# Some streams have mp3 audio which does not play
# well with ffmpeg filter aac_adtstoasc
preference = -1
preference = -10
elif format_ == 'adobe': # f4m manifest fails with 404 in 80% of requests
continue
else: # Other formats not supported yet

2
youtube_dlc/extractor/qqmusic.py
View File

@@ -121,7 +121,7 @@ class QQMusicIE(InfoExtractor):
% (details['prefix'], mid, details['ext'], vkey, guid),
'format': format_id,
'format_id': format_id,
'preference': details['preference'],
'quality': details['preference'],
'abr': details.get('abr'),
})
self._check_formats(formats, mid)

2
youtube_dlc/extractor/radiofrance.py
View File

@@ -43,7 +43,7 @@ class RadioFranceIE(InfoExtractor):
'format_id': fm[0],
'url': fm[1],
'vcodec': 'none',
'preference': i,
'quality': i,
}
for i, fm in
enumerate(re.findall(r"([a-z0-9]+)\s*:\s*'([^']+)'", formats_str))

2
youtube_dlc/extractor/rtl2.py
View File

@@ -93,7 +93,7 @@ class RTL2IE(InfoExtractor):
'flash_version': 'LNX 11,2,202,429',
'rtmp_conn': rtmp_conn,
'no_resume': True,
'preference': 1,
'quality': 1,
})
m3u8_url = video_info.get('streamurl_hls')

2
youtube_dlc/extractor/rtp.py
View File

@@ -45,7 +45,7 @@ class RTPIE(InfoExtractor):
if file_key:
formats.append({
'url': 'https://cdn-ondemand.rtp.pt' + file_key,
'preference': 1,
'quality': 1,
})
self._sort_formats(formats)
else:

4
youtube_dlc/extractor/rutv.py
View File

@@ -180,11 +180,11 @@ class RUTVIE(InfoExtractor):
'rtmp_live': True,
'ext': 'flv',
'vbr': int(quality),
'preference': preference,
'quality': preference,
}
elif transport == 'm3u8':
formats.extend(self._extract_m3u8_formats(
url, video_id, 'mp4', preference=preference, m3u8_id='hls'))
url, video_id, 'mp4', quality=preference, m3u8_id='hls'))
continue
else:
fmt = {

2
youtube_dlc/extractor/sina.py
View File

@@ -99,7 +99,7 @@ class SinaIE(InfoExtractor):
formats.append({
'format_id': quality_id,
'url': update_url_query(file_api, {'vid': file_id}),
'preference': preference(quality_id),
'quality': preference(quality_id),
'ext': 'mp4',
})
self._sort_formats(formats)

2
youtube_dlc/extractor/soundcloud.py
View File

@@ -422,7 +422,7 @@ class SoundcloudIE(InfoExtractor):
'ext': urlhandle_detect_ext(urlh) or 'mp3',
'filesize': int_or_none(urlh.headers.get('Content-Length')),
'url': format_url,
'preference': 10,
'quality': 10,
})
def invalid_url(url):

2
youtube_dlc/extractor/srgssr.py
View File

@@ -89,7 +89,7 @@ class SRGSSRIE(InfoExtractor):
formats.append({
'format_id': format_id,
'url': asset_url,
'preference': preference(quality),
'quality': preference(quality),
'ext': 'flv' if protocol == 'RTMP' else None,
})
self._sort_formats(formats)

2
youtube_dlc/extractor/storyfire.py
View File

@@ -92,7 +92,7 @@ class StoryFireIE(InfoExtractor):
if aformat:
format['acodec'] = aformat['acodec']
format['abr'] = aformat['abr']
format['preference'] = aformat['preference']
format['quality'] = aformat['preference']
format['ext'] = 'm4a'
self._sort_formats(formats)

2
youtube_dlc/extractor/tele13.py
View File

@@ -70,7 +70,7 @@ class Tele13IE(InfoExtractor):
formats.append({
'url': format_url,
'format_id': f.get('label'),
'preference': preference(f.get('label')),
'quality': preference(f.get('label')),
'ext': ext,
})
urls.append(format_url)

2
youtube_dlc/extractor/telemb.py
View File

@@ -57,7 +57,7 @@ class TeleMBIE(InfoExtractor):
'app': rtmp.group('app'),
'player_url': 'http://p.jwpcdn.com/6/10/jwplayer.flash.swf',
'page_url': 'http://www.telemb.be',
'preference': -1,
'preference': -10,
})
formats.append(fmt)
self._sort_formats(formats)

5
youtube_dlc/extractor/threeqsdn.py
View File

@@ -133,11 +133,6 @@ class ThreeQSDNIE(InfoExtractor):
'vcodec': 'none' if height == 0 else None,
'width': width,
})
for f in formats:
if f.get('acodec') == 'none':
f['preference'] = -40
elif f.get('vcodec') == 'none':
f['preference'] = -50
# It seems like this would be correctly handled by default
# However, unless someone can confirm this, the old
# behaviour is being kept as-is

1
youtube_dlc/extractor/uol.py
View File

@@ -110,7 +110,6 @@ class UOLIE(InfoExtractor):
'format_id': format_id,
'url': f_url,
'quality': quality(format_id),
'preference': -1,
})
self._sort_formats(formats)

2
youtube_dlc/extractor/urort.py
View File

@@ -44,7 +44,7 @@ class UrortIE(InfoExtractor):
'ext': f['FileType'],
'format_id': '%s-%s' % (f['FileType'], f.get('Quality', '')),
'url': 'http://p3urort.blob.core.windows.net/tracks/%s' % f['FileRef'],
'preference': 3 if f['FileType'] == 'mp3' else 2,
'quality': 3 if f['FileType'] == 'mp3' else 2,
} for f in s['Files']]
self._sort_formats(formats)
e = {

1
youtube_dlc/extractor/vidme.py
View File

@@ -181,6 +181,7 @@ class VidmeIE(InfoExtractor):
'url': format_url,
'width': int_or_none(f.get('width')),
'height': int_or_none(f.get('height')),
# Clips should never be prefered over full video
'preference': 0 if f.get('type', '').endswith(
'clip') else 1,
})

11
youtube_dlc/extractor/vimeo.py
View File

@@ -179,16 +179,9 @@ class VimeoBaseInfoExtractor(InfoExtractor):
formats.append({
'format_id': 'live-archive-source',
'url': live_archive_source_url,
'preference': 1,
'quality': 10,
})
# Reduntant code! This is already done in common.py
# for f in formats:
# if f.get('vcodec') == 'none':
# f['preference'] = -50
# elif f.get('acodec') == 'none':
# f['preference'] = -40
subtitles = {}
text_tracks = config['request'].get('text_tracks')
if text_tracks:
@@ -251,7 +244,7 @@ class VimeoBaseInfoExtractor(InfoExtractor):
'height': int_or_none(source_file.get('height')),
'filesize': parse_filesize(source_file.get('size')),
'format_id': source_name,
'preference': 1,
'quality': 1,
}

2
youtube_dlc/extractor/vzaar.py
View File

@@ -70,7 +70,7 @@ class VzaarIE(InfoExtractor):
f = {
'url': source_url,
'format_id': 'http',
'preference': 1,
'quality': 1,
}
if 'audio' in source_url:
f.update({

2
youtube_dlc/extractor/wistia.py
View File

@@ -62,7 +62,7 @@ class WistiaBaseIE(InfoExtractor):
'format_id': format_id,
'url': aurl,
'tbr': int_or_none(a.get('bitrate')) or None,
'preference': 1 if atype == 'original' else None,
'quality': 1 if atype == 'original' else None,
}
if display_name == 'Audio':
f.update({

2
youtube_dlc/extractor/xnxx.py
View File

@@ -54,7 +54,7 @@ class XNXXIE(InfoExtractor):
if determine_ext(format_url) == 'm3u8':
formats.extend(self._extract_m3u8_formats(
format_url, video_id, 'mp4', entry_protocol='m3u8_native',
preference=1, m3u8_id='hls', fatal=False))
quality=1, m3u8_id='hls', fatal=False))
else:
format_id = mobj.group('id')
if format_id:

2
youtube_dlc/extractor/xstream.py
View File

@@ -93,7 +93,7 @@ class XstreamIE(InfoExtractor):
formats.append({
'url': link.get('href'),
'format_id': link.get('rel'),
'preference': 1,
'quality': 1,
})
thumbnails = [{

2
youtube_dlc/extractor/zattoo.py
View File

@@ -182,7 +182,7 @@ class ZattooPlatformBaseIE(InfoExtractor):
else:
assert False
for this_format in this_formats:
this_format['preference'] = preference
this_format['quality'] = preference
formats.extend(this_formats)
self._sort_formats(formats)
return formats