Remove a no-longer-correct comment.

[nageru] / theme.lua

diff --git a/theme.lua b/theme.lua
index efd2280c93e0802b4b8f662c1adb9660b422147e..e59ccc86cb0ed0ef4d6cc29f352f3c510ffdea95 100644 (file)
--- 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,13 +258,10 @@ 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
-               return string.format("%.2f", num / den)
+               return string.format("%.2f", nom / den)
        end
 end
 
@@ -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
@@ -464,15 +468,30 @@ 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
-               last_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
 
        if num == 0 then  -- Live.
                if live_signal_num == INPUT0_SIGNAL_NUM or live_signal_num == INPUT1_SIGNAL_NUM then  -- Plain input.
@@ -531,14 +550,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
@@ -575,7 +594,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
@@ -677,7 +696,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)
@@ -732,8 +751,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)