From: Yen Chi Hsuan Date: Thu, 7 May 2015 10:12:01 +0000 (+0800) Subject: [ooyala] Extract m3u8 information (#2292) X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=84bf31aaf8b9b7397de5f3189295d93e8e93e5e2;p=youtube-dl [ooyala] Extract m3u8 information (#2292) --- diff --git a/youtube_dl/extractor/ooyala.py b/youtube_dl/extractor/ooyala.py index d5b05c18f..b33e8230d 100644 --- a/youtube_dl/extractor/ooyala.py +++ b/youtube_dl/extractor/ooyala.py @@ -6,6 +6,7 @@ from .common import InfoExtractor from ..utils import ( unescapeHTML, ExtractorError, + determine_ext, ) @@ -44,11 +45,21 @@ class OoyalaIE(InfoExtractor): ie=cls.ie_key()) def _extract_result(self, info, more_info): + embedCode = info['embedCode'] + video_url = info.get('ipad_url') or info['url'] + + if determine_ext(video_url) == 'm3u8': + formats = self._extract_m3u8_formats(video_url, embedCode, ext='mp4') + else: + formats = [{ + 'url': video_url, + 'ext': 'mp4', + }] + return { - 'id': info['embedCode'], - 'ext': 'mp4', + 'id': embedCode, 'title': unescapeHTML(info['title']), - 'url': info.get('ipad_url') or info['url'], + 'formats': formats, 'description': unescapeHTML(more_info['description']), 'thumbnail': more_info['promo'], }