nogafam
/
youtube-dl
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Vimeo: Added support for flv only videos

This commit is contained in:
Filippo Valsorda 2012-03-07 21:02:12 +01:00
parent 2934c2ce43
commit 597e7b1805
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
youtube-dl
View File

@ -2113,13 +2113,22 @@ class VimeoIE(InfoExtractor):
sig = config['request']['signature'] sig = config['request']['signature']
timestamp = config['request']['timestamp'] timestamp = config['request']['timestamp']
# Vimeo specific: extract video quality information # Vimeo specific: extract video codec and quality information
# TODO bind to format param # TODO bind to format param
if 'hd' in config["video"]["files"]["h264"]: quality = 'hd' codecs = [('h264', 'mp4'), ('vp8', 'flv'), ('vp6', 'flv')]
else: quality = 'sd' for codec in codecs:
if codec[0] in config["video"]["files"]:
video_codec = codec[0]
video_extension = codec[1]
if 'hd' in config["video"]["files"][codec[0]]: quality = 'hd'
else: quality = 'sd'
break
else:
self._downloader.trouble(u'ERROR: no known codec found')
return
video_url = "http://player.vimeo.com/play_redirect?clip_id=%s&sig=%s&time=%s&quality=%s&codecs=H264&type=moogaloop_local&embed_location=" \ 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) %(video_id, sig, timestamp, quality, video_codec.upper())
try: try:
# Process video information # Process video information
@ -2130,7 +2139,7 @@ class VimeoIE(InfoExtractor):
'upload_date': video_upload_date, 'upload_date': video_upload_date,
'title': video_title, 'title': video_title,
'stitle': simple_title, 'stitle': simple_title,
'ext': u'mp4', 'ext': video_extension,
'thumbnail': video_thumbnail, 'thumbnail': video_thumbnail,
'description': video_description, 'description': video_description,
'player_url': None, 'player_url': None,