projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5616caf
)
[downloader/hls] Skip uplynk ad fragments (closes #15748)
author
Sergey M․
<dstftw@gmail.com>
Sat, 3 Mar 2018 13:00:25 +0000
(20:00 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 3 Mar 2018 13:00:25 +0000
(20:00 +0700)
youtube_dl/downloader/hls.py
patch
|
blob
|
history
diff --git
a/youtube_dl/downloader/hls.py
b/youtube_dl/downloader/hls.py
index 4dc3ab46aa534132862ef0c29c34c871996ea2e4..fd304527e854e768038880bf785d84f211f4471b 100644
(file)
--- a/
youtube_dl/downloader/hls.py
+++ b/
youtube_dl/downloader/hls.py
@@
-75,8
+75,9
@@
class HlsFD(FragmentFD):
fd.add_progress_hook(ph)
return fd.real_download(filename, info_dict)
fd.add_progress_hook(ph)
return fd.real_download(filename, info_dict)
- def anvato_ad(s):
- return s.startswith('#ANVATO-SEGMENT-INFO') and 'type=ad' in s
+ def is_ad_fragment(s):
+ return (s.startswith('#ANVATO-SEGMENT-INFO') and 'type=ad' in s or
+ s.startswith('#UPLYNK-SEGMENT') and s.endswith(',ad'))
media_frags = 0
ad_frags = 0
media_frags = 0
ad_frags = 0
@@
-86,7
+87,7
@@
class HlsFD(FragmentFD):
if not line:
continue
if line.startswith('#'):
if not line:
continue
if line.startswith('#'):
- if
anvato_ad
(line):
+ if
is_ad_fragment
(line):
ad_frags += 1
ad_frag_next = True
continue
ad_frags += 1
ad_frag_next = True
continue
@@
-195,7
+196,7
@@
class HlsFD(FragmentFD):
'start': sub_range_start,
'end': sub_range_start + int(splitted_byte_range[0]),
}
'start': sub_range_start,
'end': sub_range_start + int(splitted_byte_range[0]),
}
- elif
anvato_ad
(line):
+ elif
is_ad_fragment
(line):
ad_frag_next = True
self._finish_frag_download(ctx)
ad_frag_next = True
self._finish_frag_download(ctx)