kopia lustrzana https://github.com/yt-dlp/yt-dlp
[downloader/hls] fix uplynk ad skipping(closes #18824)
rodzic
d65f6e734b
commit
f1ab3b7de7
|
@ -75,10 +75,14 @@ class HlsFD(FragmentFD):
|
||||||
fd.add_progress_hook(ph)
|
fd.add_progress_hook(ph)
|
||||||
return fd.real_download(filename, info_dict)
|
return fd.real_download(filename, info_dict)
|
||||||
|
|
||||||
def is_ad_fragment(s):
|
def is_ad_fragment_start(s):
|
||||||
return (s.startswith('#ANVATO-SEGMENT-INFO') and 'type=ad' in s or
|
return (s.startswith('#ANVATO-SEGMENT-INFO') and 'type=ad' in s or
|
||||||
s.startswith('#UPLYNK-SEGMENT') and s.endswith(',ad'))
|
s.startswith('#UPLYNK-SEGMENT') and s.endswith(',ad'))
|
||||||
|
|
||||||
|
def is_ad_fragment_end(s):
|
||||||
|
return (s.startswith('#ANVATO-SEGMENT-INFO') and 'type=master' in s or
|
||||||
|
s.startswith('#UPLYNK-SEGMENT') and s.endswith(',segment'))
|
||||||
|
|
||||||
media_frags = 0
|
media_frags = 0
|
||||||
ad_frags = 0
|
ad_frags = 0
|
||||||
ad_frag_next = False
|
ad_frag_next = False
|
||||||
|
@ -87,12 +91,13 @@ class HlsFD(FragmentFD):
|
||||||
if not line:
|
if not line:
|
||||||
continue
|
continue
|
||||||
if line.startswith('#'):
|
if line.startswith('#'):
|
||||||
if is_ad_fragment(line):
|
if is_ad_fragment_start(line):
|
||||||
ad_frags += 1
|
|
||||||
ad_frag_next = True
|
ad_frag_next = True
|
||||||
|
elif is_ad_fragment_end(line):
|
||||||
|
ad_frag_next = False
|
||||||
continue
|
continue
|
||||||
if ad_frag_next:
|
if ad_frag_next:
|
||||||
ad_frag_next = False
|
ad_frags += 1
|
||||||
continue
|
continue
|
||||||
media_frags += 1
|
media_frags += 1
|
||||||
|
|
||||||
|
@ -123,7 +128,6 @@ class HlsFD(FragmentFD):
|
||||||
if line:
|
if line:
|
||||||
if not line.startswith('#'):
|
if not line.startswith('#'):
|
||||||
if ad_frag_next:
|
if ad_frag_next:
|
||||||
ad_frag_next = False
|
|
||||||
continue
|
continue
|
||||||
frag_index += 1
|
frag_index += 1
|
||||||
if frag_index <= ctx['fragment_index']:
|
if frag_index <= ctx['fragment_index']:
|
||||||
|
@ -196,8 +200,10 @@ class HlsFD(FragmentFD):
|
||||||
'start': sub_range_start,
|
'start': sub_range_start,
|
||||||
'end': sub_range_start + int(splitted_byte_range[0]),
|
'end': sub_range_start + int(splitted_byte_range[0]),
|
||||||
}
|
}
|
||||||
elif is_ad_fragment(line):
|
elif is_ad_fragment_start(line):
|
||||||
ad_frag_next = True
|
ad_frag_next = True
|
||||||
|
elif is_ad_fragment_end(line):
|
||||||
|
ad_frag_next = False
|
||||||
|
|
||||||
self._finish_frag_download(ctx)
|
self._finish_frag_download(ctx)
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue