RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-06 17:43:02 +00:00
Code Issues Releases Wiki Activity

stats: UP/DOWN scrolling on page 2 (frame stats)

Browse Source 
Code contributed by @avih with only minor modifications to comments by
me.
Fixes #7727.
This commit is contained in:
Julian 2020-05-17 13:55:38 +02:00 committed by Julian
parent 3cb9e93cdf
commit c7b94c03f1
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DOCS/man/stats.rst
View File

@ -22,7 +22,7 @@ stats:
==== ================== ==== ==================
1 Show usual stats 1 Show usual stats
2 Show frame timings 2 Show frame timings (scroll)
3 Input cache stats 3 Input cache stats
4 Internal stuff (scroll) 4 Internal stuff (scroll)
==== ================== ==== ==================

26
player/lua/stats.lua
View File

@ -306,6 +306,8 @@ local function append_perfdata(s, dedicated_page)
return format("{\\b%d}%02d%%{\\b0}", w, i * 100) return format("{\\b%d}%02d%%{\\b0}", w, i * 100)
end end
-- ensure that the fixed title is one element and every scrollable line is
-- also one single element.
s[#s+1] = format("%s%s%s%s{\\fs%s}%s{\\fs%s}", s[#s+1] = format("%s%s%s%s{\\fs%s}%s{\\fs%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,
b("Frame Timings:"), o.prefix_sep, o.font_size * 0.66, b("Frame Timings:"), o.prefix_sep, o.font_size * 0.66,
@ -326,7 +328,9 @@ local function append_perfdata(s, dedicated_page)
o.font, o.prefix_sep, o.prefix_sep, pass["desc"]) o.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
s[#s+1] = generate_graph(pass["samples"], pass["count"], -- use the same line that was already started for this iteration
s[#s] = s[#s] ..
generate_graph(pass["samples"], pass["count"],
pass["count"], pass["peak"], pass["count"], pass["peak"],
pass["avg"], 0.9, 0.25) pass["avg"], 0.9, 0.25)
end end
@ -616,13 +620,31 @@ local function default_stats()
return table.concat(stats) return table.concat(stats)
end end
local function scroll_vo_stats(stats, fixed_items, offset)
local ret = {}
local count = #stats - fixed_items
offset = max(1, min((offset or 1), count))
for i, line in pairs(stats) do
if i <= fixed_items or i >= fixed_items + offset then
ret[#ret+1] = stats[i]
end
end
return ret, offset
end
-- Returns an ASS string with extended VO stats -- Returns an ASS string with extended VO stats
local function vo_stats() local function vo_stats()
local stats = {} local stats = {}
eval_ass_formatting() eval_ass_formatting()
add_header(stats) add_header(stats)
-- first line (title) added next is considered fixed
local fixed_items = #stats + 1
append_perfdata(stats, true) append_perfdata(stats, true)
local page = pages[o.key_page_2]
stats, page.offset = scroll_vo_stats(stats, fixed_items, page.offset)
return table.concat(stats) return table.concat(stats)
end end
@ -759,7 +781,7 @@ cache_recorder_timer:kill()
curr_page = o.key_page_1 curr_page = o.key_page_1
pages = { pages = {
[o.key_page_1] = { f = default_stats, desc = "Default" }, [o.key_page_1] = { f = default_stats, desc = "Default" },
[o.key_page_2] = { f = vo_stats, desc = "Extended Frame Timings" }, [o.key_page_2] = { f = vo_stats, desc = "Extended Frame Timings", scroll = true },
[o.key_page_3] = { f = cache_stats, desc = "Cache Statistics" }, [o.key_page_3] = { f = cache_stats, desc = "Cache Statistics" },
[o.key_page_4] = { f = perf_stats, desc = "Internal performance info", scroll = true }, [o.key_page_4] = { f = perf_stats, desc = "Internal performance info", scroll = true },
} }