projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
18cf638
)
[brightcove] change the protocol for m3u8 formats to m3u8_native
author
remitamine
<remitamine@gmail.com>
Fri, 13 May 2016 07:35:38 +0000
(08:35 +0100)
committer
remitamine
<remitamine@gmail.com>
Fri, 13 May 2016 07:35:38 +0000
(08:35 +0100)
youtube_dl/extractor/brightcove.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/brightcove.py
b/youtube_dl/extractor/brightcove.py
index f0781fc273a18ec30c1ffa97546232d991ad8574..fc7fc5b1652851ebb4015c386327e92c69b2d2e1 100644
(file)
--- a/
youtube_dl/extractor/brightcove.py
+++ b/
youtube_dl/extractor/brightcove.py
@@
-307,9
+307,10
@@
class BrightcoveLegacyIE(InfoExtractor):
playlist_title=playlist_info['mediaCollectionDTO']['displayName'])
def _extract_video_info(self, video_info):
playlist_title=playlist_info['mediaCollectionDTO']['displayName'])
def _extract_video_info(self, video_info):
+ video_id = compat_str(video_info['id'])
publisher_id = video_info.get('publisherId')
info = {
publisher_id = video_info.get('publisherId')
info = {
- 'id':
compat_str(video_info['id'])
,
+ 'id':
video_id
,
'title': video_info['displayName'].strip(),
'description': video_info.get('shortDescription'),
'thumbnail': video_info.get('videoStillURL') or video_info.get('thumbnailURL'),
'title': video_info['displayName'].strip(),
'description': video_info.get('shortDescription'),
'thumbnail': video_info.get('videoStillURL') or video_info.get('thumbnailURL'),
@@
-331,7
+332,8
@@
class BrightcoveLegacyIE(InfoExtractor):
url_comp = compat_urllib_parse_urlparse(url)
if url_comp.path.endswith('.m3u8'):
formats.extend(
url_comp = compat_urllib_parse_urlparse(url)
if url_comp.path.endswith('.m3u8'):
formats.extend(
- self._extract_m3u8_formats(url, info['id'], 'mp4'))
+ self._extract_m3u8_formats(
+ url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False))
continue
elif 'akamaihd.net' in url_comp.netloc:
# This type of renditions are served through
continue
elif 'akamaihd.net' in url_comp.netloc:
# This type of renditions are served through
@@
-365,7
+367,7
@@
class BrightcoveLegacyIE(InfoExtractor):
a_format.update({
'format_id': 'hls%s' % ('-%s' % tbr if tbr else ''),
'ext': 'mp4',
a_format.update({
'format_id': 'hls%s' % ('-%s' % tbr if tbr else ''),
'ext': 'mp4',
- 'protocol': 'm3u8',
+ 'protocol': 'm3u8
_native
',
})
formats.append(a_format)
})
formats.append(a_format)
@@
-395,7
+397,7
@@
class BrightcoveLegacyIE(InfoExtractor):
return ad_info
if 'url' not in info and not info.get('formats'):
return ad_info
if 'url' not in info and not info.get('formats'):
- raise ExtractorError('Unable to extract video url for %s' %
info['id']
)
+ raise ExtractorError('Unable to extract video url for %s' %
video_id
)
return info
return info
@@
-527,7
+529,7
@@
class BrightcoveNewIE(InfoExtractor):
if not src:
continue
formats.extend(self._extract_m3u8_formats(
if not src:
continue
formats.extend(self._extract_m3u8_formats(
- src, video_id, 'mp4', m3u8_id='hls', fatal=False))
+ src, video_id, 'mp4',
'm3u8_native',
m3u8_id='hls', fatal=False))
elif source_type == 'application/dash+xml':
if not src:
continue
elif source_type == 'application/dash+xml':
if not src:
continue