X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.lua;h=efd2280c93e0802b4b8f662c1adb9660b422147e;hb=06bf43108bde2d00776281fa916f42cdecd22ef1;hp=24e8d0f06bdc1d53ea65809bb4932305e7c115f0;hpb=727f4f46369c938e5994eb89acbda1369a9bfc35;p=nageru

diff --git a/theme.lua b/theme.lua
index 24e8d0f..efd2280 100644
--- a/theme.lua
+++ b/theme.lua
@@ -31,6 +31,9 @@ local STATIC_SIGNAL_NUM = 3
 -- to the next.
 local FADE_SIGNAL_NUM = 4
 
+-- Last width/height/resolution for each channel, if we have it.
+local last_resolution = {}
+
 -- Utility function to help creating many similar chains that can differ
 -- in a free set of chosen parameters.
 function make_cartesian_product(parms, callback)
@@ -157,7 +160,7 @@ local fade_chains = make_cartesian_product({
 	{true, false},                    -- input0_scale
 	{"static", "live", "livedeint"},  -- input1_type
 	{true, false},                    -- input1_scale
-	{true, false}                     -- hq
+	{true}                            -- hq
 }, function(input0_type, input0_scale, input1_type, input1_scale, hq)
 	local input0_live = (input0_type ~= "static")
 	local input1_live = (input1_type ~= "static")
@@ -244,13 +247,44 @@ function num_channels()
 	return 4
 end
 
+-- Helper function to write e.g. “60” or “59.94”.
+function get_frame_rate(signal_num)
+	local nom = last_resolution[signal_num].frame_rate_nom
+	local den = last_resolution[signal_num].frame_rate_den
+	if last_resolution[signal_num].interlaced then
+		nom = nom * 2
+	end
+	if nom % den == 0 then
+		return nom / den
+	else
+		return string.format("%.2f", num / den)
+	end
+end
+
+-- Helper function to write e.g. “720p60”.
+function get_channel_resolution(signal_num)
+	if last_resolution[signal_num] then
+		if last_resolution[signal_num].height == 0 or
+		   last_resolution[signal_num].height == 525 then
+			return "no signal"
+		elseif last_resolution[signal_num].interlaced then
+			return (last_resolution[signal_num].height * 2) .. "i" .. get_frame_rate(signal_num)
+		else
+			return last_resolution[signal_num].height .. "p" .. get_frame_rate(signal_num)
+		end
+	else
+		return "no signal"
+	end
+end
+
 -- Returns the name for each additional channel (starting from 2).
--- Called only once for each channel, at the start of the program.
+-- Called at the start of the program, and then each frame for live
+-- channels in case they change resolution.
 function channel_name(channel)
 	if channel == 2 then
-		return "Input 1"
+		return "Input 1 (" .. get_channel_resolution(0) .. ")"
 	elseif channel == 3 then
-		return "Input 2"
+		return "Input 2 (" .. get_channel_resolution(1) .. ")"
 	elseif channel == 4 then
 		return "Side-by-side"
 	elseif channel == 5 then
@@ -430,6 +464,16 @@ end
 -- NOTE: The chain returned must be finalized with the Y'CbCr flag
 -- if and only if num==0.
 function get_chain(num, t, width, height, signals)
+	for signal_num=0,1 do
+		last_resolution[signal_num] = {
+			width = signals:get_width(signal_num),
+			height = signals:get_height(signal_num),
+			interlaced = signals:get_interlaced(signal_num),
+			frame_rate_nom = signals:get_frame_rate_nom(signal_num),
+			frame_rate_den = signals:get_frame_rate_den(signal_num)
+		}
+	end
+
 	if num == 0 then  -- Live.
 		if live_signal_num == INPUT0_SIGNAL_NUM or live_signal_num == INPUT1_SIGNAL_NUM then  -- Plain input.
 			local input_type = get_input_type(signals, live_signal_num)