projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[jwplatform] Support DASH streams
[youtube-dl]
/
youtube_dl
/
extractor
/
livestream.py
diff --git
a/youtube_dl/extractor/livestream.py
b/youtube_dl/extractor/livestream.py
index 9884362261aa4deab85f8e25718feaaa7a07afce..bc7894bf13ed29963aa1dad7880cf8549be1ca77 100644
(file)
--- a/
youtube_dl/extractor/livestream.py
+++ b/
youtube_dl/extractor/livestream.py
@@
-14,6
+14,7
@@
from ..utils import (
xpath_with_ns,
xpath_text,
orderedSet,
xpath_with_ns,
xpath_text,
orderedSet,
+ update_url_query,
int_or_none,
float_or_none,
parse_iso8601,
int_or_none,
float_or_none,
parse_iso8601,
@@
-72,7
+73,10
@@
class LivestreamIE(InfoExtractor):
for vn in video_nodes:
tbr = int_or_none(vn.attrib.get('system-bitrate'), 1000)
furl = (
for vn in video_nodes:
tbr = int_or_none(vn.attrib.get('system-bitrate'), 1000)
furl = (
- '%s%s?v=3.0.3&fp=WIN%%2014,0,0,145' % (base, vn.attrib['src']))
+ update_url_query(compat_urlparse.urljoin(base, vn.attrib['src']), {
+ 'v': '3.0.3',
+ 'fp': 'WIN% 14,0,0,145',
+ }))
if 'clipBegin' in vn.attrib:
furl += '&ssek=' + vn.attrib['clipBegin']
formats.append({
if 'clipBegin' in vn.attrib:
furl += '&ssek=' + vn.attrib['clipBegin']
formats.append({
@@
-146,7
+150,7
@@
class LivestreamIE(InfoExtractor):
}
def _extract_stream_info(self, stream_info):
}
def _extract_stream_info(self, stream_info):
- broadcast_id =
stream_info['broadcast_id']
+ broadcast_id =
compat_str(stream_info['broadcast_id'])
is_live = stream_info.get('is_live')
formats = []
is_live = stream_info.get('is_live')
formats = []
@@
-199,9
+203,10
@@
class LivestreamIE(InfoExtractor):
if not videos_info:
break
for v in videos_info:
if not videos_info:
break
for v in videos_info:
+ v_id = compat_str(v['id'])
entries.append(self.url_result(
entries.append(self.url_result(
- 'http://livestream.com/accounts/%s/events/%s/videos/%s' % (account_id, event_id, v
['id']
),
- 'Livestream', v
['id'], v['caption']
))
+ 'http://livestream.com/accounts/%s/events/%s/videos/%s' % (account_id, event_id, v
_id
),
+ 'Livestream', v
_id, v.get('caption')
))
last_video = videos_info[-1]['id']
return self.playlist_result(entries, event_id, event_data['full_name'])
last_video = videos_info[-1]['id']
return self.playlist_result(entries, event_id, event_data['full_name'])