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

ytdl_hook: improve track detection 

Every format that was not detected as a video format was added to the
audio tracks. This resulted in e.g. YouTube storyboards from ending up
in the list of audio tracks.

Now formats that are already known to be neither video formats nor audio
formats, will also not end up in any track list.

Formats where it is unknown if they are video or audio get added to
tracks if `force_all_formats` is used, otherwise only
formats that are known to contain video or audio become video or audio
tracks respectively.

https://github.com/yt-dlp/yt-dlp/issues/4373#issuecomment-1186637357
This commit is contained in:
Christoph Heinrich 2022-07-18 05:21:20 +02:00 committed by Dudemanguy
parent 52e7269ea6
commit 08dd30fde8
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
player/lua/ytdl_hook.lua
View File

@ -423,7 +423,9 @@ local function formats_to_edl(json, formats, use_all_formats)
local is_default = default_formats[track["format_id"]]
local tracks = {}
if track.vcodec and track.vcodec ~= "none" then
-- "none" means it is not a video
-- nil means it is unknown
if (o.force_all_formats or track.vcodec) and track.vcodec ~= "none" then
tracks[#tracks + 1] = {
media_type = "video",
codec = map_codec_to_mpv(track.vcodec),
@ -432,9 +434,7 @@ local function formats_to_edl(json, formats, use_all_formats)
has_requested_video = true
end
end
-- Tries to follow the strange logic that vcodec unset means it's
-- an audio stream, even if acodec is sometimes unset.
if (#tracks == 0) or (track.acodec and track.acodec ~= "none") then
if (o.force_all_formats or track.acodec) and track.acodec ~= "none" then
tracks[#tracks + 1] = {
media_type = "audio",
codec = map_codec_to_mpv(track.acodec) or
@ -444,13 +444,10 @@ local function formats_to_edl(json, formats, use_all_formats)
has_requested_audio = true
end
end
if #tracks == 0 then
return nil
end
local url = edl_track or track.url
local hdr = {"!new_stream", "!no_clip", "!no_chapters"}
local skip = false
local skip = #tracks == 0
local params = ""
if use_all_formats then
@ -504,12 +501,14 @@ local function formats_to_edl(json, formats, use_all_formats)
end
end
hdr[#hdr + 1] = edl_escape(url) .. params
if not skip then
hdr[#hdr + 1] = edl_escape(url) .. params
streams[#streams + 1] = table.concat(hdr, ";")
-- In case there is only 1 of these streams.
-- Note: assumes it has no important EDL headers
single_url = url
streams[#streams + 1] = table.concat(hdr, ";")
-- In case there is only 1 of these streams.
-- Note: assumes it has no important EDL headers
single_url = url
end
end
-- Merge all tracks into a single virtual file, but avoid EDL if it's