From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Mon, 15 Oct 2018 18:34:23 +0000 (+0200)
Subject: Print IPTV resolution.
X-Git-Url: https://git.sesse.net/?p=ultimatescore;a=commitdiff_plain;h=8477d9cc0e54aab60a3b6d1755f8ee8dffb0c4d6

Print IPTV resolution.
---

diff --git a/nageru/ultimate.lua b/nageru/ultimate.lua
index 260fec3..8b2b7f1 100644
--- a/nageru/ultimate.lua
+++ b/nageru/ultimate.lua
@@ -505,6 +505,7 @@ function channel_name(channel)
 	elseif signal_num == STATIC_SIGNAL_NUM then
 		return "Static picture"
 	elseif signal_num == VIDEO_SIGNAL_NUM then
+		-- return "IPTV input (" .. get_channel_resolution(iptv_video:get_signal_num()) .. ")"
 		return replay_title
 	elseif signal_num == OVERLAY_SIGNAL_NUM then
 		return "Overlay"
@@ -816,6 +817,30 @@ function get_sbs_chain(state, signals)
 	return sbs_chains[input0_type][state.overlay_enabled][input1_type][true]
 end
 
+function fetch_input_resolution(signals, signal_num)
+	local res = {
+		width = signals:get_width(signal_num),
+		height = signals:get_height(signal_num),
+		interlaced = signals:get_interlaced(signal_num),
+		has_signal = signals:get_has_signal(signal_num),
+		is_connected = signals:get_is_connected(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
+	return res
+end
+
 local last_rate = 0.0
 
 -- API ENTRY POINT
@@ -847,29 +872,9 @@ function get_chain(num, t, width, height, signals)
 
 	local input_resolution = {}
 	for signal_num=0,(NUM_CAMERAS-1) do
-		local res = {
-			width = signals:get_width(signal_num),
-			height = signals:get_height(signal_num),
-			interlaced = signals:get_interlaced(signal_num),
-			has_signal = signals:get_has_signal(signal_num),
-			is_connected = signals:get_is_connected(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
+		input_resolution[signal_num] = fetch_input_resolution(signals, signal_num)
 	end
+	input_resolution[iptv_video:get_signal_num()] = fetch_input_resolution(signals, iptv_video:get_signal_num())
 	last_resolution = input_resolution
 
 	-- Make a (semi-shallow) copy of the current state, so that the returned prepare function