From: Sergey M․ Date: Sun, 16 Apr 2017 16:15:24 +0000 (+0700) Subject: [itv] Fix rtmp formats (#12759) X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=c2d7d76efd37c16d01100635f308f03deb9c04aa;p=youtube-dl [itv] Fix rtmp formats (#12759) --- diff --git a/youtube_dl/extractor/itv.py b/youtube_dl/extractor/itv.py index 5ff7e1aaa..7442c24d9 100644 --- a/youtube_dl/extractor/itv.py +++ b/youtube_dl/extractor/itv.py @@ -116,15 +116,25 @@ class ITVIE(InfoExtractor): if not play_path: continue tbr = int_or_none(media_file.get('bitrate'), 1000) - formats.append({ + f = { 'format_id': 'rtmp' + ('-%d' % tbr if tbr else ''), - 'url': rtmp_url, 'play_path': play_path, + # Providing this swfVfy allows to avoid truncated downloads + 'player_url': 'http://www.itv.com/mercury/Mercury_VideoPlayer.swf', + 'page_url': url, 'tbr': tbr, 'ext': 'flv', - # rtmp formats are now stop downloading at ~72MiB - 'preference': -10, - }) + } + app = self._search_regex( + 'rtmpe?://[^/]+/(.+)$', rtmp_url, 'app', default=None) + if app: + f.update({ + 'url': rtmp_url.split('?', 1)[0], + 'app': app, + }) + else: + f['url'] = rtmp_url + formats.append(f) ios_playlist_url = params.get('data-video-playlist') hmac = params.get('data-video-hmac')