mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-08-28 22:25:10 +02:00
[vimeo] Implement the new format selection system (closes PR #996)
Rebased and deleted some parts to use the new system instead of copying the one from YoutubeIE
This commit is contained in:
parent
f6a54188c2
commit
a6387bfd3c
@ -179,46 +179,45 @@ class VimeoIE(InfoExtractor):
|
|||||||
|
|
||||||
# Vimeo specific: extract video codec and quality information
|
# Vimeo specific: extract video codec and quality information
|
||||||
# First consider quality, then codecs, then take everything
|
# First consider quality, then codecs, then take everything
|
||||||
# TODO bind to format param
|
codecs = [('vp6', 'flv'), ('vp8', 'flv'), ('h264', 'mp4')]
|
||||||
codecs = [('h264', 'mp4'), ('vp8', 'flv'), ('vp6', 'flv')]
|
|
||||||
files = { 'hd': [], 'sd': [], 'other': []}
|
files = { 'hd': [], 'sd': [], 'other': []}
|
||||||
config_files = config["video"].get("files") or config["request"].get("files")
|
config_files = config["video"].get("files") or config["request"].get("files")
|
||||||
for codec_name, codec_extension in codecs:
|
for codec_name, codec_extension in codecs:
|
||||||
if codec_name in config_files:
|
for quality in config_files.get(codec_name, []):
|
||||||
if 'hd' in config_files[codec_name]:
|
format_id = '-'.join((codec_name, quality)).lower()
|
||||||
files['hd'].append((codec_name, codec_extension, 'hd'))
|
key = quality if quality in files else 'other'
|
||||||
elif 'sd' in config_files[codec_name]:
|
video_url = None
|
||||||
files['sd'].append((codec_name, codec_extension, 'sd'))
|
if isinstance(config_files[codec_name], dict):
|
||||||
|
file_info = config_files[codec_name][quality]
|
||||||
|
video_url = file_info.get('url')
|
||||||
else:
|
else:
|
||||||
files['other'].append((codec_name, codec_extension, config_files[codec_name][0]))
|
file_info = {}
|
||||||
|
if video_url is None:
|
||||||
|
video_url = "http://player.vimeo.com/play_redirect?clip_id=%s&sig=%s&time=%s&quality=%s&codecs=%s&type=moogaloop_local&embed_location=" \
|
||||||
|
%(video_id, sig, timestamp, quality, codec_name.upper())
|
||||||
|
|
||||||
for quality in ('hd', 'sd', 'other'):
|
files[key].append({
|
||||||
if len(files[quality]) > 0:
|
'ext': codec_extension,
|
||||||
video_quality = files[quality][0][2]
|
'url': video_url,
|
||||||
video_codec = files[quality][0][0]
|
'format_id': format_id,
|
||||||
video_extension = files[quality][0][1]
|
'width': file_info.get('width'),
|
||||||
self.to_screen(u'%s: Downloading %s file at %s quality' % (video_id, video_codec.upper(), video_quality))
|
'height': file_info.get('height'),
|
||||||
break
|
})
|
||||||
else:
|
formats = []
|
||||||
|
for key in ('other', 'sd', 'hd'):
|
||||||
|
formats += files[key]
|
||||||
|
if len(formats) == 0:
|
||||||
raise ExtractorError(u'No known codec found')
|
raise ExtractorError(u'No known codec found')
|
||||||
|
|
||||||
video_url = None
|
|
||||||
if isinstance(config_files[video_codec], dict):
|
|
||||||
video_url = config_files[video_codec][video_quality].get("url")
|
|
||||||
if video_url is None:
|
|
||||||
video_url = "http://player.vimeo.com/play_redirect?clip_id=%s&sig=%s&time=%s&quality=%s&codecs=%s&type=moogaloop_local&embed_location=" \
|
|
||||||
%(video_id, sig, timestamp, video_quality, video_codec.upper())
|
|
||||||
|
|
||||||
return [{
|
return [{
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'url': video_url,
|
|
||||||
'uploader': video_uploader,
|
'uploader': video_uploader,
|
||||||
'uploader_id': video_uploader_id,
|
'uploader_id': video_uploader_id,
|
||||||
'upload_date': video_upload_date,
|
'upload_date': video_upload_date,
|
||||||
'title': video_title,
|
'title': video_title,
|
||||||
'ext': video_extension,
|
|
||||||
'thumbnail': video_thumbnail,
|
'thumbnail': video_thumbnail,
|
||||||
'description': video_description,
|
'description': video_description,
|
||||||
|
'formats': formats,
|
||||||
}]
|
}]
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user