X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.lua;h=5210b2555121c8f00d2fabed69c42c60d4d62858;hb=2f270d0a7e185ae7b024586bbd26a2bc3c53062c;hp=2884793ed4f5dae01d6b36853ce79168dffd77e8;hpb=2a431ccd32a47fb0f40389cbd7d1a1e9d1902a64;p=nageru

diff --git a/theme.lua b/theme.lua
index 2884793..5210b25 100644
--- a/theme.lua
+++ b/theme.lua
@@ -32,6 +32,8 @@ local STATIC_SIGNAL_NUM = 3
 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
@@ -228,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
 
@@ -251,9 +258,6 @@ end
 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
@@ -268,7 +272,7 @@ function get_channel_resolution(signal_num)
 		   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)
+			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
@@ -466,13 +470,26 @@ end
 function get_chain(num, t, width, height, signals)
 	local input_resolution = {}
 	for signal_num=0,1 do
-		input_resolution[signal_num] = {
+		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