diff options
author | Yen Chi Hsuan <yan12125@gmail.com> | 2016-04-21 19:36:33 +0800 |
---|---|---|
committer | Yen Chi Hsuan <yan12125@gmail.com> | 2016-04-21 19:36:33 +0800 |
commit | ec59d657e7d898cce8f3a1b6556a79fd9495fc9d (patch) | |
tree | 36f7afa9329156e8719d0970c93f153cbffd023b /youtube_dl/extractor/gdcvault.py | |
parent | 99ef96f84c2c9fa1267d6edb836c8f1945295424 (diff) |
[dispeak] Add new extractor
Both GDCVault and GPUTechConf uses the service of DigitalSpeaking.
Diffstat (limited to 'youtube_dl/extractor/gdcvault.py')
-rw-r--r-- | youtube_dl/extractor/gdcvault.py | 74 |
1 files changed, 3 insertions, 71 deletions
diff --git a/youtube_dl/extractor/gdcvault.py b/youtube_dl/extractor/gdcvault.py index 3ebcaf733..01e1ceec8 100644 --- a/youtube_dl/extractor/gdcvault.py +++ b/youtube_dl/extractor/gdcvault.py @@ -4,7 +4,6 @@ import re from .common import InfoExtractor from ..utils import ( - remove_end, HEADRequest, sanitized_Request, urlencode_postdata, @@ -64,66 +63,6 @@ class GDCVaultIE(InfoExtractor): }, ] - def _parse_mp4(self, xml_description): - video_formats = [] - video_root = None - - mp4_video = xml_description.find('./metadata/mp4video') - if mp4_video is not None: - mobj = re.match(r'(?P<root>https?://.*?/).*', mp4_video.text) - video_root = mobj.group('root') - if video_root is None: - # Hard-coded in http://evt.dispeak.com/ubm/gdc/sf16/custom/player2.js - video_root = 'http://s3-2u.digitallyspeaking.com/' - - formats = xml_description.findall('./metadata/MBRVideos/MBRVideo') - if not formats: - return None - for format in formats: - mobj = re.match(r'mp4\:(?P<path>.*)', format.find('streamName').text) - url = video_root + mobj.group('path') - vbr = format.find('bitrate').text - video_formats.append({ - 'url': url, - 'vbr': int(vbr), - }) - return video_formats - - def _parse_flv(self, xml_description): - formats = [] - akamai_url = xml_description.find('./metadata/akamaiHost').text - audios = xml_description.find('./metadata/audios') - if audios is not None: - for audio in audios: - formats.append({ - 'url': 'rtmp://%s/ondemand?ovpfv=1.1' % akamai_url, - 'play_path': remove_end(audio.get('url'), '.flv'), - 'ext': 'flv', - 'vcodec': 'none', - 'format_id': audio.get('code'), - }) - slide_video_path = xml_description.find('./metadata/slideVideo').text - formats.append({ - 'url': 'rtmp://%s/ondemand?ovpfv=1.1' % akamai_url, - 'play_path': remove_end(slide_video_path, '.flv'), - 'ext': 'flv', - 'format_note': 'slide deck video', - 'quality': -2, - 'preference': -2, - 'format_id': 'slides', - }) - speaker_video_path = xml_description.find('./metadata/speakerVideo').text - formats.append({ - 'url': 'rtmp://%s/ondemand?ovpfv=1.1' % akamai_url, - 'play_path': remove_end(speaker_video_path, '.flv'), - 'ext': 'flv', - 'format_note': 'speaker video', - 'quality': -1, - 'preference': -1, - 'format_id': 'speaker', - }) - return formats - def _login(self, webpage_url, display_id): (username, password) = self._get_login_info() if username is None or password is None: @@ -199,17 +138,10 @@ class GDCVaultIE(InfoExtractor): r'<iframe src=".*?\?xmlURL=xml/(?P<xml_file>.+?\.xml).*?".*?</iframe>', start_page, 'xml filename') - xml_description = self._download_xml( - '%s/xml/%s' % (xml_root, xml_name), display_id) - - video_title = xml_description.find('./metadata/title').text - video_formats = self._parse_mp4(xml_description) - if video_formats is None: - video_formats = self._parse_flv(xml_description) - return { + '_type': 'url_transparent', 'id': video_id, 'display_id': display_id, - 'title': video_title, - 'formats': video_formats, + 'url': '%s/xml/%s' % (xml_root, xml_name), + 'ie': 'DigitalSpeaking', } |