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

stats.lua: don't use ASS tags when use_ass is false 

Fixes terminal output.
This commit is contained in:
Kacper Michajłow 2024-09-08 00:06:50 +02:00
parent f92d5da89c
commit e7f153db58
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
player/lua/stats.lua
View File

@ -348,21 +348,31 @@ local function append_perfdata(header, s, dedicated_page)
end end
-- Calculate font weight. 100 is minimum, 400 is normal, 700 bold, 900 is max -- Calculate font weight. 100 is minimum, 400 is normal, 700 bold, 900 is max
local w = (700 * math.sqrt(i)) + 200 local w = (700 * math.sqrt(i)) + 200
if not o.use_ass then
local str = format("%3d%%", i * 100)
return w >= 700 and bold(str) or str
end
return format("{\\b%d}%3d%%{\\b0}", w, i * 100) return format("{\\b%d}%3d%%{\\b0}", w, i * 100)
end end
local font_small = o.use_ass and format("{\\fs%s}", font_size * 0.66) or ""
local font_normal = o.use_ass and format("{\\fs%s}", font_size) or ""
local font = o.use_ass and format("{\\fn%s}", o.font) or ""
local font_mono = o.use_ass and format("{\\fn%s}", o.font_mono) or ""
local indent = o.use_ass and "\\h" or " "
-- ensure that the fixed title is one element and every scrollable line is -- ensure that the fixed title is one element and every scrollable line is
-- also one single element. -- also one single element.
local h = dedicated_page and header or s local h = dedicated_page and header or s
h[#h+1] = format("%s%s%s%s{\\fs%s}%s{\\fs%s}%s", h[#h+1] = format("%s%s%s%s%s%s%s%s",
dedicated_page and "" or o.nl, dedicated_page and "" or o.indent, dedicated_page and "" or o.nl, dedicated_page and "" or o.indent,
bold("Frame Timings:"), o.prefix_sep, font_size * 0.66, bold("Frame Timings:"), o.prefix_sep, font_small,
"(last/average/peak μs)", font_size, "(last/average/peak μs)", font_normal,
dedicated_page and scroll_hint() or "") dedicated_page and scroll_hint() or "")
for _,frame in ipairs(sorted_keys(vo_p)) do -- ensure fixed display order for _,frame in ipairs(sorted_keys(vo_p)) do -- ensure fixed display order
local data = vo_p[frame] local data = vo_p[frame]
local f = "%s%s%s{\\fn%s}%s / %s / %s %s%s{\\fn%s}%s%s%s" local f = "%s%s%s%s%s / %s / %s %s%s%s%s%s%s"
if dedicated_page then if dedicated_page then
s[#s+1] = format("%s%s%s:", o.nl, o.indent, s[#s+1] = format("%s%s%s:", o.nl, o.indent,
@ -370,10 +380,10 @@ local function append_perfdata(header, s, dedicated_page)
for _, pass in ipairs(data) do for _, pass in ipairs(data) do
s[#s+1] = format(f, o.nl, o.indent, o.indent, s[#s+1] = format(f, o.nl, o.indent, o.indent,
o.font_mono, pp(pass["last"]), font_mono, pp(pass["last"]),
pp(pass["avg"]), pp(pass["peak"]), pp(pass["avg"]), pp(pass["peak"]),
o.prefix_sep .. "\\h", p(pass["last"], last_s[frame]), o.prefix_sep .. indent, p(pass["last"], last_s[frame]),
o.font, o.prefix_sep, o.prefix_sep, pass["desc"]) font, o.prefix_sep, o.prefix_sep, pass["desc"])
if o.plot_perfdata and o.use_ass then if o.plot_perfdata and o.use_ass then
-- use the same line that was already started for this iteration -- use the same line that was already started for this iteration
@ -386,14 +396,14 @@ local function append_perfdata(header, s, dedicated_page)
-- Print sum of timing values as "Total" -- Print sum of timing values as "Total"
s[#s+1] = format(f, o.nl, o.indent, o.indent, s[#s+1] = format(f, o.nl, o.indent, o.indent,
o.font_mono, pp(last_s[frame]), font_mono, pp(last_s[frame]),
pp(avg_s[frame]), pp(peak_s[frame]), pp(avg_s[frame]), pp(peak_s[frame]),
o.prefix_sep, bold("Total"), o.font, "", "", "") o.prefix_sep, bold("Total"), font, "", "", "")
else else
-- for the simplified view, we just print the sum of each pass -- for the simplified view, we just print the sum of each pass
s[#s+1] = format(f, o.nl, o.indent, o.indent, o.font_mono, s[#s+1] = format(f, o.nl, o.indent, o.indent, font_mono,
pp(last_s[frame]), pp(avg_s[frame]), pp(peak_s[frame]), pp(last_s[frame]), pp(avg_s[frame]), pp(peak_s[frame]),
"", "", o.font, o.prefix_sep, o.prefix_sep, "", "", font, o.prefix_sep, o.prefix_sep,
frame:gsub("^%l", string.upper)) frame:gsub("^%l", string.upper))
end end
end end