[youtube] Fix sorting of 3gp format
This commit is contained in:
parent
4bb6b02f93
commit
60bdb7bd9e
1 changed files with 11 additions and 7 deletions
|
@ -2404,6 +2404,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
|
|||
formats, itags, stream_ids = [], [], []
|
||||
itag_qualities = {}
|
||||
q = qualities([
|
||||
# "tiny" is the smallest video-only format. But some audio-only formats
|
||||
# was also labeled "tiny". It is not clear if such formats still exist
|
||||
'tiny', 'audio_quality_low', 'audio_quality_medium', 'audio_quality_high', # Audio only formats
|
||||
'small', 'medium', 'large', 'hd720', 'hd1080', 'hd1440', 'hd2160', 'hd2880', 'highres'
|
||||
])
|
||||
|
@ -2467,13 +2469,15 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
|
|||
'width': fmt.get('width'),
|
||||
'language': audio_track.get('id', '').split('.')[0],
|
||||
}
|
||||
mimetype = fmt.get('mimeType')
|
||||
if mimetype:
|
||||
mobj = re.match(
|
||||
r'((?:[^/]+)/(?:[^;]+))(?:;\s*codecs="([^"]+)")?', mimetype)
|
||||
if mobj:
|
||||
dct['ext'] = mimetype2ext(mobj.group(1))
|
||||
dct.update(parse_codecs(mobj.group(2)))
|
||||
mime_mobj = re.match(
|
||||
r'((?:[^/]+)/(?:[^;]+))(?:;\s*codecs="([^"]+)")?', fmt.get('mimeType') or '')
|
||||
if mime_mobj:
|
||||
dct['ext'] = mimetype2ext(mime_mobj.group(1))
|
||||
dct.update(parse_codecs(mime_mobj.group(2)))
|
||||
# The 3gp format in android client has a quality of "small",
|
||||
# but is actually worse than all other formats
|
||||
if dct['ext'] == '3gp':
|
||||
dct['quality'] = q('tiny')
|
||||
no_audio = dct.get('acodec') == 'none'
|
||||
no_video = dct.get('vcodec') == 'none'
|
||||
if no_audio:
|
||||
|
|
Loading…
Reference in a new issue