rei-mirror
/
NewLeaf
mirror of https://git.sr.ht/~cadence/NewLeaf
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Compare commits

base: rei-mirror:412b4934ed7c3b68bfecaab1c04dde102e407f9b
Branches Tags
rei-mirror:main
..
compare: rei-mirror:82f28cb99d4cea774a9975a5b61bc301ab9b9f20
Branches Tags
rei-mirror:main

2 Commits
412b4934ed ... 82f28cb99d

Author SHA1 Message Date
Cadence Ember 82f28cb99d Exclude m3u8 playlist formats 2023-03-13 01:00:19 +13:00
Cadence Ember ecb4f4ccd1 Change http_dash_fragments detection based on yt-dlp translating adaptive streams to fragments 
https://matrix.to/#/!vZmGzbsnHuVTLMItyg:cadence.moe/$VHp8D4XgW5jFbA6MhPaI52hZVMt_wpNy9gCSbF6Ot1Y?via=cadence.moe&via=matrix.org&via=envs.net
 2023-03-13 00:36:08 +13:00
1 changed files with 8 additions and 1 deletions
Show Stats Expand all files Collapse all files

9
extractors/video.py
View File

@ -105,6 +105,9 @@ def extract_video(id):
"recommendedVideos": [] "recommendedVideos": []
} }
# result = info["formats"]
# return result
for format in info["formats"]: for format in info["formats"]:
# Storyboard images are now included in formats, we don't want them. # Storyboard images are now included in formats, we don't want them.
# Storyboards have neither audio nor video, so detect them that way. # Storyboards have neither audio nor video, so detect them that way.
@ -112,6 +115,10 @@ def extract_video(id):
if format["acodec"] == "none" and format["vcodec"] == "none": if format["acodec"] == "none" and format["vcodec"] == "none":
continue continue
# m3u8 playlists cannot be played.
if "m3u8" in format["protocol"]:
continue
# Adaptive formats have either audio or video, format streams have both, storyboard images have neither. # Adaptive formats have either audio or video, format streams have both, storyboard images have neither.
is_adaptive = format["acodec"] == "none" or format["vcodec"] == "none" is_adaptive = format["acodec"] == "none" or format["vcodec"] == "none"
sense = "video" if format["vcodec"] != "none" else "audio" sense = "video" if format["vcodec"] != "none" else "audio"
@ -125,7 +132,7 @@ def extract_video(id):
if is_adaptive: if is_adaptive:
url = "" url = ""
if format["protocol"] == "http_dash_segments": if "fragment_base_url" in format:
# this is http dash, which is annoying and doesn't work in <video>. # this is http dash, which is annoying and doesn't work in <video>.
# we have a fragment_base_url, which seems to be playable for all audio, but only with certain video itags??? very confused # we have a fragment_base_url, which seems to be playable for all audio, but only with certain video itags??? very confused
if format["acodec"] == "none" and format["format_id"] not in ["134", "136"]: if format["acodec"] == "none" and format["format_id"] not in ["134", "136"]: