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

diff --git a/theme.lua b/theme.lua
index 24e8d0f..243b352 100644
--- a/theme.lua
+++ b/theme.lua
@@ -31,6 +31,11 @@ local STATIC_SIGNAL_NUM = 3
 -- to the next.
 local FADE_SIGNAL_NUM = 4
 
+-- Last width/height/resolution for each channel, if we have it.
+-- Note that unlike the values we get from Nageru, the resolution is per
+-- frame and not per field, since we deinterlace.
+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 +162,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")
@@ -225,6 +230,11 @@ function get_input_type(signals, signal_num)
 end
 
 function needs_scale(signals, signal_num, width, height)
+	if signal_num == STATIC_SIGNAL_NUM then
+		-- We assume this is already correctly scaled at load time.
+		return false
+	end
+	assert(signal_num == INPUT0_SIGNAL_NUM or signal_num == INPUT1_SIGNAL_NUM)
 	return (signals:get_width(signal_num) ~= width or signals:get_height(signal_num) ~= height)
 end
 
@@ -238,19 +248,49 @@ function set_scale_parameters_if_needed(chain_or_input, width, height)
 	end
 end
 
+-- API ENTRY POINT
 -- Returns the number of outputs in addition to the live (0) and preview (1).
 -- Called only once, at the start of the program.
 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 nom % den == 0 then
+		return nom / den
+	else
+		return string.format("%.2f", nom / 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 .. "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
+
+-- API ENTRY POINT
 -- 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
@@ -258,12 +298,29 @@ function channel_name(channel)
 	end
 end
 
+-- API ENTRY POINT
+-- Returns, given a channel number, which signal it corresponds to (starting from 0).
+-- Should return -1 if the channel does not correspond to a simple signal.
+-- Called once for each channel, at the start of the program.
+-- Will never be called for live (0) or preview (1).
+function channel_signal(channel)
+	if channel == 2 then
+		return 0
+	elseif channel == 3 then
+		return 1
+	else
+		return -1
+	end
+end
+
+-- API ENTRY POINT
 -- Returns if a given channel supports setting white balance (starting from 2).
 -- Called only once for each channel, at the start of the program.
 function supports_set_wb(channel)
 	return channel == 2 or channel == 3
 end
 
+-- API ENTRY POINT
 -- Gets called with a new gray point when the white balance is changing.
 -- The color is in linear light (not sRGB gamma).
 function set_wb(channel, red, green, blue)
@@ -286,6 +343,7 @@ function finish_transitions(t)
 	end
 end
 
+-- API ENTRY POINT
 -- Called every frame.
 function get_transitions(t)
 	finish_transitions(t)
@@ -402,10 +460,12 @@ function transition_clicked(num, t)
 	end
 end
 
+-- API ENTRY POINT
 function channel_clicked(num)
 	preview_signal_num = num
 end
 
+-- API ENTRY POINT
 -- Called every frame. Get the chain for displaying at input <num>,
 -- where 0 is live, 1 is preview, 2 is the first channel to display
 -- in the bottom bar, and so on up to num_channels()+1. t is the
@@ -430,6 +490,31 @@ 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)
+	local input_resolution = {}
+	for signal_num=0,1 do
+		local res = {
+			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)
+		}
+
+		if res.interlaced then
+			-- Convert height from frame height to field height.
+			-- (Needed for e.g. place_rectangle.)
+			res.height = res.height * 2
+
+			-- Show field rate instead of frame rate; really for cosmetics only
+			-- (and actually contrary to EBU recommendations, although in line
+			-- with typical user expectations).
+			res.frame_rate_nom = res.frame_rate_nom * 2
+		end
+
+		input_resolution[signal_num] = res
+	end
+	last_resolution = input_resolution
+
 	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)
@@ -487,14 +572,14 @@ function get_chain(num, t, width, height, signals)
 		local chain = sbs_chains[input0_type][input1_type][true]
 		prepare = function()
 			if t < transition_start then
-				prepare_sbs_chain(chain, zoom_src, width, height)
+				prepare_sbs_chain(chain, zoom_src, width, height, input_resolution)
 			elseif t > transition_end then
-				prepare_sbs_chain(chain, zoom_dst, width, height)
+				prepare_sbs_chain(chain, zoom_dst, width, height, input_resolution)
 			else
 				local tt = (t - transition_start) / (transition_end - transition_start)
 				-- Smooth it a bit.
 				tt = math.sin(tt * 3.14159265358 * 0.5)
-				prepare_sbs_chain(chain, zoom_src + (zoom_dst - zoom_src) * tt, width, height)
+				prepare_sbs_chain(chain, zoom_src + (zoom_dst - zoom_src) * tt, width, height, input_resolution)
 			end
 		end
 		return chain.chain, prepare
@@ -531,7 +616,7 @@ function get_chain(num, t, width, height, signals)
 		local input1_type = get_input_type(signals, INPUT1_SIGNAL_NUM)
 		local chain = sbs_chains[input0_type][input1_type][false]
 		prepare = function()
-			prepare_sbs_chain(chain, 0.0, width, height)
+			prepare_sbs_chain(chain, 0.0, width, height, input_resolution)
 		end
 		return chain.chain, prepare
 	end
@@ -633,7 +718,7 @@ function lerp(a, b, t)
 	return a + (b - a) * t
 end
 
-function prepare_sbs_chain(chain, t, screen_width, screen_height)
+function prepare_sbs_chain(chain, t, screen_width, screen_height, input_resolution)
 	chain.input0.input:connect_signal(0)
 	chain.input1.input:connect_signal(1)
 	set_neutral_color(chain.input0.wb_effect, input0_neutral_color)
@@ -688,8 +773,8 @@ function prepare_sbs_chain(chain, t, screen_width, screen_height)
 	bottom1 = bottom1 * scale0 + ty0
 	left1 = left1 * scale0 + tx0
 	right1 = right1 * scale0 + tx0
-	place_rectangle(chain.input0.resample_effect, chain.input0.resize_effect, chain.input0.padding_effect, left0, top0, right0, bottom0, screen_width, screen_height, 1280, 720)
-	place_rectangle(chain.input1.resample_effect, chain.input1.resize_effect, chain.input1.padding_effect, left1, top1, right1, bottom1, screen_width, screen_height, 1280, 720)
+	place_rectangle(chain.input0.resample_effect, chain.input0.resize_effect, chain.input0.padding_effect, left0, top0, right0, bottom0, screen_width, screen_height, input_resolution[0].width, input_resolution[0].height)
+	place_rectangle(chain.input1.resample_effect, chain.input1.resize_effect, chain.input1.padding_effect, left1, top1, right1, bottom1, screen_width, screen_height, input_resolution[1].width, input_resolution[1].height)
 end
 
 function set_neutral_color(effect, color)