class UstreamIE(InfoExtractor):
- _VALID_URL = r'https?://www\.ustream\.tv/recorded/(?P<videoID>\d+)'
+ _VALID_URL = r'https?://www\.ustream\.tv/(?P<type>recorded|embed)/(?P<videoID>\d+)'
IE_NAME = 'ustream'
_TEST = {
'url': 'http://www.ustream.tv/recorded/20274954',
def _real_extract(self, url):
m = re.match(self._VALID_URL, url)
+ if m.group('type') == 'embed':
+ video_id = m.group('videoID')
+ webpage = self._download_webpage(url, video_id)
+ desktop_video_id = self._html_search_regex(r'ContentVideoIds=\["([^"]*?)"\]', webpage, 'desktop_video_id')
+ desktop_url = 'http://www.ustream.tv/recorded/' + desktop_video_id
+ return self.url_result(desktop_url, 'Ustream')
+
video_id = m.group('videoID')
video_url = 'http://tcdn.ustream.tv/video/%s' % video_id