peter
94fcc40bde
The Download module's purpose is download -> share -> play in-browser, so the output must play in EVERY browser (iOS/Safari/WebKit included). The only universally-safe combo is mp4 + H.264 + AAC/MP3. - formats.normalize() now CLAMPS every spec to that profile (container->mp4, vcodec->None, audio_format opus->m4a) at the single point all paths flow through (picker, stored profile, raw API) — not just by hiding UI options. A source exposing no H.264 is still caught by the worker's browser-safe re-encode, so playability is guaranteed end-to-end. - build_ydl_opts drops the now-unreachable non-compat branches (+ _VCODEC_SORT). - _SIG_VERSION 3->4 so assets cached under an old non-compat spec — or a stale non-H.264 mp4 that slipped the v3 net (the HEVC Facebook dls) — re-derive. - ProfileEditor drops the container/codec pickers and Opus; audio is M4A/MP3. - i18n: remove the now-unused container/vcodec/any keys (HU+EN parity).
112 lines
5.4 KiB
Python
112 lines
5.4 KiB
Python
"""build_ydl_opts: EVERY download is clamped to the mp4/H.264 compat profile (E7 browser-
|
|
playability guarantee) and must SELECT H.264 (not merely prefer it), so shared downloads play in
|
|
every browser incl. iOS/Safari. Non-mp4 containers and non-H.264 vcodecs are coerced, not honoured.
|
|
See the iPad AV1 broken-player fix + E7 format narrowing."""
|
|
|
|
from app.downloads import edit as editmod
|
|
from app.downloads import formats
|
|
|
|
|
|
def _opts(spec):
|
|
return formats.build_ydl_opts(spec, "/tmp/%(id)s.%(ext)s", lambda d: None)
|
|
|
|
|
|
def test_adapter_extra_opts_are_merged_in():
|
|
# The SourceAdapter contributes source-specific opts (e.g. YouTube's extractor_args) via `extra`.
|
|
extra = {"extractor_args": {"youtube": {"player_client": ["web"]}}}
|
|
opts = formats.build_ydl_opts({}, "/tmp/%(id)s.%(ext)s", lambda d: None, extra=extra)
|
|
assert opts["extractor_args"]["youtube"]["player_client"] == ["web"]
|
|
# No extra → no extractor_args (a generic source contributes nothing).
|
|
assert "extractor_args" not in formats.build_ydl_opts({}, "/tmp/x", lambda d: None)
|
|
|
|
|
|
def test_mp4_default_selects_avc1_with_progressive_fallback():
|
|
fmt = _opts({"mode": "av", "container": "mp4"})["format"]
|
|
# avc1 video-only first, then the avc1 progressive, then an unrestricted fallback.
|
|
assert fmt.startswith("bestvideo[vcodec^=avc1]+bestaudio[acodec^=mp4a]")
|
|
assert "/best[vcodec^=avc1]" in fmt
|
|
assert fmt.endswith("bestvideo+bestaudio/best")
|
|
|
|
|
|
def test_format_sig_salt_forks_a_distinct_identity():
|
|
spec = {"mode": "av", "container": "mp4", "max_height": 720}
|
|
base = formats.format_sig(spec)
|
|
# A salt yields a distinct cache identity (force-redownload's private-asset fork); different
|
|
# salts differ from each other and from the unsalted sig, same salt is stable.
|
|
assert formats.format_sig(spec, salt="7:12") != base
|
|
assert formats.format_sig(spec, salt="7:12") != formats.format_sig(spec, salt="7:13")
|
|
assert formats.format_sig(spec, salt="7:12") == formats.format_sig(spec, salt="7:12")
|
|
|
|
|
|
def test_mp4_default_keeps_h264_sort_tiebreaker():
|
|
sort = _opts({"mode": "av", "container": "mp4"})["format_sort"]
|
|
assert "vcodec:h264" in sort and "acodec:aac" in sort
|
|
|
|
|
|
def test_video_only_mp4_selects_avc1():
|
|
fmt = _opts({"mode": "v", "container": "mp4"})["format"]
|
|
assert fmt.startswith("bestvideo[vcodec^=avc1]")
|
|
assert "+bestaudio" not in fmt # video-only never merges audio
|
|
# A video-only download stays audio-free: every `bestvideo` (video-only) option is preferred
|
|
# over any `best` (progressive, audio-bearing) fallback.
|
|
assert fmt.index("bestvideo") < fmt.index("best[vcodec^=avc1]") < fmt.rindex("/best")
|
|
|
|
|
|
def test_max_height_caps_every_branch():
|
|
fmt = _opts({"mode": "av", "container": "mp4", "max_height": 720})["format"]
|
|
assert fmt.count("[height<=?720]") >= 3 # applied to each avc1/fallback branch
|
|
|
|
|
|
def test_explicit_vcodec_is_clamped_to_the_compat_selector():
|
|
# E7 browser-playability guarantee: a non-H.264 vcodec no longer opts out — normalize() coerces
|
|
# vcodec→None, so the avc1 selector (and mp4 merge) is used regardless of what was requested.
|
|
opts = _opts({"mode": "av", "container": "mp4", "vcodec": "vp9"})
|
|
assert opts["format"].startswith("bestvideo[vcodec^=avc1]")
|
|
assert opts["merge_output_format"] == "mp4"
|
|
assert "vcodec:vp9" not in opts["format_sort"]
|
|
|
|
|
|
def test_non_mp4_container_is_clamped_to_mp4():
|
|
# A webm/mkv request is coerced to the mp4/H.264 compat profile (nothing plays mkv in-browser;
|
|
# webm/VP9 fails iOS), so the avc1 selector is used and the merge target is mp4.
|
|
opts = _opts({"mode": "av", "container": "webm"})
|
|
assert opts["format"].startswith("bestvideo[vcodec^=avc1]")
|
|
assert opts["merge_output_format"] == "mp4"
|
|
|
|
|
|
def test_normalize_clamps_to_browser_playable():
|
|
n = formats.normalize({"container": "mkv", "vcodec": "av1", "audio_format": "opus"})
|
|
assert n["container"] == "mp4"
|
|
assert n["vcodec"] is None
|
|
assert n["audio_format"] == "m4a"
|
|
# A playable audio choice is preserved.
|
|
assert formats.normalize({"audio_format": "mp3"})["audio_format"] == "mp3"
|
|
|
|
|
|
def test_non_playable_specs_dedup_to_the_compat_identity():
|
|
# Two requests that differ only in (now-clamped) non-playable fields share ONE cache asset.
|
|
a = formats.format_sig({"mode": "av", "max_height": 720, "container": "webm", "vcodec": "av1"})
|
|
b = formats.format_sig({"mode": "av", "max_height": 720, "container": "mp4"})
|
|
assert a == b
|
|
|
|
|
|
def test_audio_only_unaffected():
|
|
assert _opts({"mode": "a", "audio_format": "m4a"})["format"] == "bestaudio/best"
|
|
|
|
|
|
def test_browser_transcode_flags_universal_playability():
|
|
F = editmod.browser_transcode_flags
|
|
# Already universal: H.264 + AAC in mp4 → no change.
|
|
assert F("h264", "aac", True) == (False, False, False)
|
|
assert F("h264", "mp3", True) == (False, False, False)
|
|
# Non-H.264 video → full video re-encode (AV1/VP9 fail iOS; HEVC fails Chrome/FF).
|
|
assert F("av1", "aac", True) == (True, True, False)
|
|
assert F("vp9", "opus", True) == (True, True, True)
|
|
assert F("hevc", "aac", True) == (True, True, False)
|
|
# H.264 but bad audio → audio-only transcode (video copied).
|
|
assert F("h264", "opus", True) == (True, False, True)
|
|
# Codecs fine but wrong container → remux only (no re-encode).
|
|
assert F("h264", "aac", False) == (True, False, False)
|
|
# A failed probe / missing stream is never re-encoded.
|
|
assert F(None, None, True) == (False, False, False)
|