projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[eagleplatform] Skip georestricted test
[youtube-dl]
/
youtube_dl
/
extractor
/
common.py
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index 8ff76342fec703b5cae6683cf34f761698c8cba6..530c449c1b48e48d0f8fcf4e7223bff9d60138b1 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-822,7
+822,7
@@
class InfoExtractor(object):
(media_el.attrib.get('href') or media_el.attrib.get('url')))
tbr = int_or_none(media_el.attrib.get('bitrate'))
formats.append({
(media_el.attrib.get('href') or media_el.attrib.get('url')))
tbr = int_or_none(media_el.attrib.get('bitrate'))
formats.append({
- 'format_id': '-'.join(filter(None, [f4m_id,
'f4m-%d' %
(i if tbr is None else tbr)])),
+ 'format_id': '-'.join(filter(None, [f4m_id,
compat_str
(i if tbr is None else tbr)])),
'url': manifest_url,
'ext': 'flv',
'tbr': tbr,
'url': manifest_url,
'ext': 'flv',
'tbr': tbr,
@@
-839,7
+839,7
@@
class InfoExtractor(object):
m3u8_id=None):
formats = [{
m3u8_id=None):
formats = [{
- 'format_id': '-'.join(filter(None, [m3u8_id, 'm
3u8-m
eta'])),
+ 'format_id': '-'.join(filter(None, [m3u8_id, 'meta'])),
'url': m3u8_url,
'ext': ext,
'protocol': 'm3u8',
'url': m3u8_url,
'ext': ext,
'protocol': 'm3u8',
@@
-883,12
+883,13
@@
class InfoExtractor(object):
formats.append({'url': format_url(line)})
continue
tbr = int_or_none(last_info.get('BANDWIDTH'), scale=1000)
formats.append({'url': format_url(line)})
continue
tbr = int_or_none(last_info.get('BANDWIDTH'), scale=1000)
- format_id = last_media.get('NAME')
- if not format_id:
- format_id = '-'.join(filter(None, [
- m3u8_id, 'm3u8-%d' % (tbr if tbr else len(formats))]))
+ format_id = []
+ if m3u8_id:
+ format_id.append(m3u8_id)
+ last_media_name = last_media.get('NAME') if last_media else None
+ format_id.append(last_media_name if last_media_name else '%d' % (tbr if tbr else len(formats)))
f = {
f = {
- 'format_id':
format_id
,
+ 'format_id':
'-'.join(format_id)
,
'url': format_url(line.strip()),
'tbr': tbr,
'ext': ext,
'url': format_url(line.strip()),
'tbr': tbr,
'ext': ext,
@@
-1061,6
+1062,9
@@
class InfoExtractor(object):
def _get_automatic_captions(self, *args, **kwargs):
raise NotImplementedError("This method must be implemented by subclasses")
def _get_automatic_captions(self, *args, **kwargs):
raise NotImplementedError("This method must be implemented by subclasses")
+ def _subtitles_timecode(self, seconds):
+ return '%02d:%02d:%02d.%03d' % (seconds / 3600, (seconds % 3600) / 60, seconds % 60, (seconds % 1) * 1000)
+
class SearchInfoExtractor(InfoExtractor):
"""
class SearchInfoExtractor(InfoExtractor):
"""