summaryrefslogtreecommitdiffstats
path: root/player/lua/ytdl_hook.lua
diff options
context:
space:
mode:
authorRicardo Constantino <wiiaboo@gmail.com>2017-01-30 15:57:28 +0000
committerRicardo Constantino <wiiaboo@gmail.com>2017-01-30 16:21:44 +0000
commite017c24174d3647da57be9507686a22fc7c42484 (patch)
treeb9a4f95405209579513e1e1e443aee7d82ed7611 /player/lua/ytdl_hook.lua
parent6dafc851879ae85d9096b92451baf508e11c97ac (diff)
downloadmpv-e017c24174d3647da57be9507686a22fc7c42484.tar.bz2
mpv-e017c24174d3647da57be9507686a22fc7c42484.tar.xz
ytdl_hook: refactor edl track joining
Only used once for now. Also, support switched format strings, like bestaudio+bestvideo.
Diffstat (limited to 'player/lua/ytdl_hook.lua')
-rw-r--r--player/lua/ytdl_hook.lua48
1 files changed, 28 insertions, 20 deletions
diff --git a/player/lua/ytdl_hook.lua b/player/lua/ytdl_hook.lua
index 0e7ab4a152..da548d47a1 100644
--- a/player/lua/ytdl_hook.lua
+++ b/player/lua/ytdl_hook.lua
@@ -88,6 +88,18 @@ local function extract_chapters(data, video_length)
return ret
end
+local function edl_track_joined(fragments)
+ local edl = "edl://"
+ for i = 1, #fragments do
+ local fragment = fragments[i]
+ edl = edl .. edl_escape(fragment.url)
+ if fragment.duration then
+ edl = edl .. ",length=" .. fragment.duration
+ end
+ edl = edl .. ";"
+ end
+ return edl
+end
mp.add_hook("on_load", 10, function ()
local url = mp.get_property("stream-open-filename")
@@ -190,14 +202,7 @@ mp.add_hook("on_load", 10, function ()
and (json.entries[1]["webpage_url"] == json["webpage_url"])) then
msg.verbose("multi-arc video detected, building EDL")
- local playlist = "edl://"
- for i, entry in pairs(json.entries) do
- playlist = playlist .. edl_escape(entry.url)
- if not (entry.duration == nil) then
- playlist = playlist..",start=0,length="..entry.duration
- end
- playlist = playlist .. ";"
- end
+ local playlist = edl_track_joined(json.entries)
msg.debug("EDL: " .. playlist)
@@ -232,7 +237,7 @@ mp.add_hook("on_load", 10, function ()
else
subfile = subfile..edl_escape("memory://WEBVTT")
end
- subfile = subfile..",start=0,length="..entry.duration..";"
+ subfile = subfile..",length="..entry.duration..";"
end
msg.debug(j.." sub EDL: "..subfile)
mp.commandv("sub-add", subfile, "auto", req.ext, j)
@@ -270,19 +275,22 @@ mp.add_hook("on_load", 10, function ()
else -- probably a video
local streamurl = ""
- -- DASH?
- if not (json["requested_formats"] == nil) then
- if (json["requested_formats"][1].protocol == "http_dash_segments") then
- msg.error("MPEG-Dash Segments unsupported, add [protocol!=http_dash_segments] to your ytdl-format.")
- return
- end
+ -- DASH/split tracks (ex: bestvideo+bestaudio)
+ if (json["requested_formats"] ~= nil) then
- -- video url
- streamurl = json["requested_formats"][1].url
+ for i = 1, #json["requested_formats"] do
+ local track = json["requested_formats"][i]
- -- audio url
- mp.commandv("audio-add", json["requested_formats"][2].url,
- "auto", json["requested_formats"][2]["format_note"] or "")
+ if track.acodec and track.acodec ~= "none" then
+ -- audio url
+ mp.commandv("audio-add",
+ track.url, "auto",
+ track.format_note or "")
+ elseif track.vcodec and track.vcodec ~= "none" then
+ -- video url
+ streamurl = track.url
+ end
+ end
elseif not (json.url == nil) then
-- normal video