jcgruenhage/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[prosiebensat1] Fix rtmp extraction (Closes #5962)

Browse source
This commit is contained in:
Sergey M․ 2015-06-12 21:13:14 +06:00
parent 3d535e0471
commit 185dbc4974
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
youtube_dl/extractor/prosiebensat1.py
View file

@ -206,8 +206,8 @@ class ProSiebenSat1IE(InfoExtractor):
def _extract_clip(self, url, webpage): def _extract_clip(self, url, webpage):
clip_id = self._html_search_regex(self._CLIPID_REGEXES, webpage, 'clip id') clip_id = self._html_search_regex(self._CLIPID_REGEXES, webpage, 'clip id')
access_token = 'testclient' access_token = 'prosieben'
client_name = 'kolibri-1.2.5' client_name = 'kolibri-1.12.6'
client_location = url client_location = url
videos_api_url = 'http://vas.sim-technik.de/vas/live/v2/videos?%s' % compat_urllib_parse.urlencode({ videos_api_url = 'http://vas.sim-technik.de/vas/live/v2/videos?%s' % compat_urllib_parse.urlencode({
@ -275,13 +275,17 @@ class ProSiebenSat1IE(InfoExtractor):
for source in urls_sources: for source in urls_sources:
protocol = source['protocol'] protocol = source['protocol']
if protocol == 'rtmp' or protocol == 'rtmpe': if protocol == 'rtmp' or protocol == 'rtmpe':
mobj = re.search(r'^(?P<url>rtmpe?://[^/]+/(?P<app>[^/]+))/(?P<playpath>.+)$', source['url']) mobj = re.search(r'^(?P<url>rtmpe?://[^/]+)/(?P<path>.+)$', source['url'])
if not mobj: if not mobj:
continue continue
path = mobj.group('path')
mp4colon_index = path.rfind('mp4:')
app = path[:mp4colon_index]
play_path = path[mp4colon_index:]
formats.append({ formats.append({
'url': mobj.group('url'), 'url': '%s/%s' % (mobj.group('url'), app),
'app': mobj.group('app'), 'app': app,
'play_path': mobj.group('playpath'), 'play_path': play_path,
'player_url': 'http://livepassdl.conviva.com/hf/ver/2.79.0.17083/LivePassModuleMain.swf', 'player_url': 'http://livepassdl.conviva.com/hf/ver/2.79.0.17083/LivePassModuleMain.swf',
'page_url': 'http://www.prosieben.de', 'page_url': 'http://www.prosieben.de',
'vbr': fix_bitrate(source['bitrate']), 'vbr': fix_bitrate(source['bitrate']),