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

ytdl_hook: prefer hls/dash manifest if available 

This makes all the video/audio variants available for selection.

Might break with non-hls/dash, or even with dash if FFmpeg wasn't
compiled with the demuxer.
This commit is contained in:
Ricardo Constantino 2018-01-26 20:57:10 +00:00
parent ce42a96533
commit 7eb3427573
No known key found for this signature in database
GPG Key ID: EFD16019AE4FF531
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
player/lua/ytdl_hook.lua
View File

@ -235,9 +235,13 @@ end
local function add_single_video(json)
local streamurl = ""
local max_bitrate = 0
local reqfmts = json["requested_formats"]
if has_native_dash_demuxer() and proto_is_dash(json) then
local mpd_url = json["requested_formats"][1]["manifest_url"] or
-- 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
local mpd_url = reqfmts and reqfmts[1]["manifest_url"] or
json["manifest_url"]
if not mpd_url then
msg.error("No manifest URL found in JSON data.")
@ -248,8 +252,8 @@ local function add_single_video(json)
streamurl = mpd_url
if json.requested_formats then
for _, track in pairs(json.requested_formats) do
if reqfmts then
for _, track in pairs(reqfmts) do
max_bitrate = track.tbr > max_bitrate and
track.tbr or max_bitrate
end
@ -258,8 +262,8 @@ local function add_single_video(json)
end
-- DASH/split tracks
elseif not (json["requested_formats"] == nil) then
for _, track in pairs(json.requested_formats) do
elseif reqfmts then
for _, track in pairs(reqfmts) do
local edl_track = nil
edl_track = edl_track_joined(track.fragments,
track.protocol, json.is_live,