1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-25 19:52:11 +00:00

[wat] extract dash formats

This commit is contained in:
Remita Amine 2016-09-06 20:44:45 +01:00
parent 155bc674c4
commit 948cd5b72d

View file

@ -86,24 +86,32 @@ class WatIE(InfoExtractor):
def extract_url(path_template, url_type): def extract_url(path_template, url_type):
req_url = 'http://www.wat.tv/get/%s' % (path_template % video_id) req_url = 'http://www.wat.tv/get/%s' % (path_template % video_id)
head = self._request_webpage(HEADRequest(req_url), video_id, 'Extracting %s url' % url_type) head = self._request_webpage(HEADRequest(req_url), video_id, 'Extracting %s url' % url_type, fatal=False)
if head:
red_url = head.geturl() red_url = head.geturl()
if req_url == red_url: if req_url != red_url:
raise ExtractorError(
'%s said: Sorry, this video is not available from your country.' % self.IE_NAME,
expected=True)
return red_url return red_url
return None
def remove_bitrate_limit(manifest_url):
return re.sub(r'(?:max|min)_bitrate=\d+&?', '', manifest_url)
formats = [] formats = []
try: try:
http_url = extract_url('android5/%s.mp4', 'http') manifest_urls = self._download_json(
m3u8_url = extract_url('ipad/%s.m3u8', 'm3u8') 'http://www.wat.tv/get/webhtml/' + video_id, video_id)
m3u8_url = manifest_urls.get('hls')
if m3u8_url:
m3u8_url = remove_bitrate_limit(m3u8_url)
m3u8_formats = self._extract_m3u8_formats( m3u8_formats = self._extract_m3u8_formats(
m3u8_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls') m3u8_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False)
if m3u8_formats:
formats.extend(m3u8_formats) formats.extend(m3u8_formats)
formats.extend(self._extract_f4m_formats( formats.extend(self._extract_f4m_formats(
m3u8_url.replace('ios.', 'web.').replace('.m3u8', '.f4m'), m3u8_url.replace('ios', 'web').replace('.m3u8', '.f4m'),
video_id, f4m_id='hds', fatal=False)) video_id, f4m_id='hds', fatal=False))
http_url = extract_url('android5/%s.mp4', 'http')
if http_url:
for m3u8_format in m3u8_formats: for m3u8_format in m3u8_formats:
vbr, abr = m3u8_format.get('vbr'), m3u8_format.get('abr') vbr, abr = m3u8_format.get('vbr'), m3u8_format.get('abr')
if not vbr or not abr: if not vbr or not abr:
@ -118,6 +126,10 @@ class WatIE(InfoExtractor):
'protocol': 'http', 'protocol': 'http',
}) })
formats.append(f) formats.append(f)
mpd_url = manifest_urls.get('mpd')
if mpd_url:
formats.extend(self._extract_mpd_formats(remove_bitrate_limit(
mpd_url), video_id, mpd_id='dash', fatal=False))
self._sort_formats(formats) self._sort_formats(formats)
except ExtractorError: except ExtractorError:
abr = 64 abr = 64