RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

ytdl_hook: whitelist segmented DASH and HLS for the manifests code 

Close #5453
This commit is contained in:
Ricardo Constantino 2018-01-27 12:23:03 +00:00
parent 3c1566e736
commit 2a0f9fc158
No known key found for this signature in database
GPG Key ID: EFD16019AE4FF531
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
player/lua/ytdl_hook.lua
View File

@ -226,10 +226,14 @@ local function has_native_dash_demuxer()
return false
end
local function proto_is_dash(json)
local reqfmts = json["requested_formats"]
return (reqfmts ~= nil and reqfmts[1]["protocol"] == "http_dash_segments")
or json["protocol"] == "http_dash_segments"
local function valid_manifest(json)
local reqfmt = json["requested_formats"] and json["requested_formats"][1] or {}
if not reqfmt["manifest_url"] and not json["manifest_url"] then
return false
end
local proto = reqfmt["protocol"] or json["protocol"] or ""
return (has_native_dash_demuxer() and proto == "http_dash_segments") or
proto:find("^m3u8")
end
local function add_single_video(json)
@ -238,9 +242,7 @@ local function add_single_video(json)
local reqfmts = json["requested_formats"]
-- prefer manifest_url if present
if (has_native_dash_demuxer() and proto_is_dash(json)) or
(reqfmts and reqfmts[1]["manifest_url"]) or
json["manifest_url"] then
if valid_manifest(json) then
local mpd_url = reqfmts and reqfmts[1]["manifest_url"] or
json["manifest_url"]
if not mpd_url then