]> git.sesse.net Git - nageru/blobdiff - theme.lua
Add rescaling variants to all the chains in the theme.
[nageru] / theme.lua
index e6338087fbaf2ab00ae9b8aec3d8886f530bf60d..24e8d0f06bdc1d53ea65809bb4932305e7c115f0 100644 (file)
--- a/theme.lua
+++ b/theme.lua
@@ -7,8 +7,6 @@
 -- where all the low-level details (such as texture formats) are handled by the
 -- C++ side and you generally just build chains.
 
--- TODO: Deal with inputs that are different from our native 1280x720 resolution.
-
 local transition_start = -2.0
 local transition_end = -1.0
 local zoom_src = 0.0
@@ -33,133 +31,143 @@ local STATIC_SIGNAL_NUM = 3
 -- to the next.
 local FADE_SIGNAL_NUM = 4
 
--- The main live chain.
-function make_sbs_chain(input0_deint, input1_deint, hq)
-       local chain = EffectChain.new(16, 9)
-       local input0 = chain:add_live_input(not input0_deint, input0_deint)  -- Override bounce only if not deinterlacing.
-       input0:connect_signal(0)
-       local input0_wb_effect = chain:add_effect(WhiteBalanceEffect.new())
-       local input1 = chain:add_live_input(not input1_deint, input1_deint)
-       input1:connect_signal(1)
-       local input1_wb_effect = chain:add_effect(WhiteBalanceEffect.new())
+-- Utility function to help creating many similar chains that can differ
+-- in a free set of chosen parameters.
+function make_cartesian_product(parms, callback)
+       return make_cartesian_product_internal(parms, callback, 1, {})
+end
+
+function make_cartesian_product_internal(parms, callback, index, args)
+       if index > #parms then
+               return callback(unpack(args))
+       end
+       local ret = {}
+       for _, value in ipairs(parms[index]) do
+               args[index] = value
+               ret[value] = make_cartesian_product_internal(parms, callback, index + 1, args)
+       end
+       return ret
+end
+
+function make_sbs_input(chain, signal, deint, hq)
+       local input = chain:add_live_input(not deint, deint)  -- Override bounce only if not deinterlacing.
+       input:connect_signal(signal)
+       local wb_effect = chain:add_effect(WhiteBalanceEffect.new())
 
        local resample_effect = nil
        local resize_effect = nil
        if (hq) then
-               resample_effect = chain:add_effect(ResampleEffect.new(), input0_wb_effect)
+               resample_effect = chain:add_effect(ResampleEffect.new())
        else
-               resize_effect = chain:add_effect(ResizeEffect.new(), input0_wb_effect)
+               resize_effect = chain:add_effect(ResizeEffect.new())
        end
 
        local padding_effect = chain:add_effect(IntegralPaddingEffect.new())
-       padding_effect:set_vec4("border_color", 0.0, 0.0, 0.0, 1.0)
 
-       local resample2_effect = nil
-       local resize2_effect = nil
-       if (hq) then
-               resample2_effect = chain:add_effect(ResampleEffect.new(), input1_wb_effect)
-       else
-               resize2_effect = chain:add_effect(ResizeEffect.new(), input1_wb_effect)
-       end
-       local padding2_effect = chain:add_effect(IntegralPaddingEffect.new())
+       return {
+               input = input,
+               wb_effect = wb_effect,
+               resample_effect = resample_effect,
+               resize_effect = resize_effect,
+               padding_effect = padding_effect
+       }
+end
 
-       chain:add_effect(OverlayEffect.new(), padding_effect, padding2_effect)
+-- The main live chain.
+function make_sbs_chain(input0_deint, input1_deint, hq)
+       local chain = EffectChain.new(16, 9)
+
+       local input0 = make_sbs_input(chain, INPUT0_SIGNAL_NUM, input0_deint, hq)
+       local input1 = make_sbs_input(chain, INPUT1_SIGNAL_NUM, input1_deint, hq)
+
+       input0.padding_effect:set_vec4("border_color", 0.0, 0.0, 0.0, 1.0)
+       input1.padding_effect:set_vec4("border_color", 0.0, 0.0, 0.0, 0.0)
+
+       chain:add_effect(OverlayEffect.new(), input0.padding_effect, input1.padding_effect)
        chain:finalize(hq)
 
        return {
                chain = chain,
-               input0 = {
-                       input = input0,
-                       wb_effect = input0_wb_effect,
-                       resample_effect = resample_effect,
-                       resize_effect = resize_effect,
-                       padding_effect = padding_effect
-               },
-               input1 = {
-                       input = input1,
-                       wb_effect = input1_wb_effect,
-                       resample_effect = resample2_effect,
-                       resize_effect = resize2_effect,
-                       padding_effect = padding2_effect
-               }
+               input0 = input0,
+               input1 = input1
        }
 end
 
 -- Make all possible combinations of side-by-side chains.
-local sbs_chains = {}
-for input0_type, input0_deint in pairs({live = false, livedeint = true}) do
-       sbs_chains[input0_type] = {}
-       for input1_type, input1_deint in pairs({live = false, livedeint = true}) do
-               sbs_chains[input0_type][input1_type] = {}
-               for _, hq in pairs({true, false}) do
-                       sbs_chains[input0_type][input1_type][hq] =
-                               make_sbs_chain(input0_deint, input1_deint, hq)
-               end
+local sbs_chains = make_cartesian_product({
+       {"live", "livedeint"},  -- input0_type
+       {"live", "livedeint"},  -- input1_type
+       {true, false}           -- hq
+}, function(input0_type, input1_type, hq)
+       local input0_deint = (input0_type == "livedeint")
+       local input1_deint = (input1_type == "livedeint")
+       return make_sbs_chain(input0_deint, input1_deint, hq)
+end)
+
+function make_fade_input(chain, signal, live, deint, scale)
+       local input, wb_effect, resample_effect, last
+       if live then
+               input = chain:add_live_input(false, deint)
+               wb_effect = chain:add_effect(WhiteBalanceEffect.new())
+               input:connect_signal(signal)
+               last = wb_effect
+       else
+               input = chain:add_effect(ImageInput.new("bg.jpeg"))
+               last = input
        end
+
+       -- If we cared about this for the non-main inputs, we would have
+       -- checked hq here and invoked ResizeEffect instead.
+       if scale then
+               resample_effect = chain:add_effect(ResampleEffect.new())
+               last = resample_effect
+       end
+
+       return {
+               input = input,
+               wb_effect = wb_effect,
+               resample_effect = resample_effect,
+               last = last
+       }
 end
 
 -- A chain to fade between two inputs, of which either can be a picture
 -- or a live input. In practice only used live, but we still support the
 -- hq parameter.
-function make_fade_chain(input0_live, input0_deint, input1_live, input1_deint, hq)
+function make_fade_chain(input0_live, input0_deint, input0_scale, input1_live, input1_deint, input1_scale, hq)
        local chain = EffectChain.new(16, 9)
 
-       local input0, wb0_effect, input0_last, input1, wb1_effect, input1_last
+       local input0 = make_fade_input(chain, INPUT0_SIGNAL_NUM, input0_live, input0_deint, input0_scale)
+       local input1 = make_fade_input(chain, INPUT1_SIGNAL_NUM, input1_live, input1_deint, input1_scale)
 
-       if input0_live then
-               input0 = chain:add_live_input(false, input0_deint)
-               wb0_effect = chain:add_effect(WhiteBalanceEffect.new())
-               input0:connect_signal(0)
-               input0_last = wb0_effect
-       else
-               input0 = chain:add_effect(ImageInput.new("bg.jpeg"))
-               input0_last = input0
-       end
-
-       if input1_live then
-               input1 = chain:add_live_input(false, input1_deint)
-               wb1_effect = chain:add_effect(WhiteBalanceEffect.new())
-               input1:connect_signal(1)
-               input1_last = wb1_effect
-       else
-               input1 = chain:add_effect(ImageInput.new("bg.jpeg"))
-               input1_last = input1
-       end
-
-       local mix_effect = chain:add_effect(MixEffect.new(), input0_last, input1_last)
+       local mix_effect = chain:add_effect(MixEffect.new(), input0.last, input1.last)
        chain:finalize(hq)
 
        return {
                chain = chain,
-               input0 = {
-                       input = input0,
-                       wb_effect = wb0_effect
-               },
-               input1 = {
-                       input = input1,
-                       wb_effect = wb1_effect
-               },
+               input0 = input0,
+               input1 = input1,
                mix_effect = mix_effect
        }
 end
 
 -- Chains to fade between two inputs, in various configurations.
-local fade_chains = {}
-for input0_type, input0_live in pairs({static = false, live = true, livedeint = true}) do
-       local input0_deint = (input0_live == "livedeint")
-       fade_chains[input0_type] = {}
-       for input1_type, input1_live in pairs({static = false, live = true, livedeint = true}) do
-               local input1_deint = (input1_live == "livedeint")
-               fade_chains[input0_type][input1_type] = {}
-               for _, hq in pairs({true, false}) do
-                       fade_chains[input0_type][input1_type][hq] =
-                               make_fade_chain(input0_live, input0_deint, input1_live, input1_deint, hq)
-               end
-       end
-end
+local fade_chains = make_cartesian_product({
+       {"static", "live", "livedeint"},  -- input0_type
+       {true, false},                    -- input0_scale
+       {"static", "live", "livedeint"},  -- input1_type
+       {true, false},                    -- input1_scale
+       {true, false}                     -- hq
+}, function(input0_type, input0_scale, input1_type, input1_scale, hq)
+       local input0_live = (input0_type ~= "static")
+       local input1_live = (input1_type ~= "static")
+       local input0_deint = (input0_type == "livedeint")
+       local input1_deint = (input1_type == "livedeint")
+       return make_fade_chain(input0_live, input0_deint, input0_scale, input1_live, input1_deint, input1_scale, hq)
+end)
 
 -- A chain to show a single input on screen.
-function make_simple_chain(input_deint, hq)
+function make_simple_chain(input_deint, input_scale, hq)
        local chain = EffectChain.new(16, 9)
 
        local input = chain:add_live_input(false, input_deint)
@@ -167,21 +175,33 @@ function make_simple_chain(input_deint, hq)
        local wb_effect = chain:add_effect(WhiteBalanceEffect.new())
        chain:finalize(hq)
 
+       local resample_effect, resize_effect
+       if scale then
+               if hq then
+                       resample_effect = chain:add_effect(ResampleEffect.new())
+               else
+                       resize_effect = chain:add_effect(ResizeEffect.new())
+               end
+       end
+
        return {
                chain = chain,
                input = input,
-               wb_effect = wb_effect
+               wb_effect = wb_effect,
+               resample_effect = resample_effect,
+               resize_effect = resize_effect
        }
 end
 
 -- Make all possible combinations of single-input chains.
-local simple_chains = {}
-for input_type, input_deint in pairs({live = false, livedeint = true}) do
-       simple_chains[input_type] = {}
-       for _, hq in pairs({true, false}) do
-               simple_chains[input_type][hq] = make_simple_chain(input_deint, hq)
-       end
-end
+local simple_chains = make_cartesian_product({
+       {"live", "livedeint"},  -- input_type
+       {true, false},          -- input_scale
+       {true, false}           -- hq
+}, function(input_type, input_scale, hq)
+       local input_deint = (input_type == "livedeint")
+       return make_simple_chain(input_deint, input_scale, hq)
+end)
 
 -- A chain to show a single static picture on screen (HQ version).
 local static_chain_hq = EffectChain.new(16, 9)
@@ -204,6 +224,20 @@ function get_input_type(signals, signal_num)
        end
 end
 
+function needs_scale(signals, signal_num, width, height)
+       return (signals:get_width(signal_num) ~= width or signals:get_height(signal_num) ~= height)
+end
+
+function set_scale_parameters_if_needed(chain_or_input, width, height)
+       if chain_or_input.resample_effect then
+               chain_or_input.resample_effect:set_int("width", width)
+               chain_or_input.resample_effect:set_int("height", height)
+       elseif chain_or_input.resize_effect then
+               chain_or_input.resize_effect:set_int("width", width)
+               chain_or_input.resize_effect:set_int("height", height)
+       end
+end
+
 -- 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()
@@ -399,9 +433,11 @@ function get_chain(num, t, width, height, signals)
        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)
-                       local chain = simple_chains[input_type][true]
+                       local input_scale = needs_scale(signals, live_signal_num, width, height)
+                       local chain = simple_chains[input_type][input_scale][true]
                        prepare = function()
                                chain.input:connect_signal(live_signal_num)
+                               set_scale_parameters_if_needed(chain, width, height)
                                set_neutral_color_from_signal(chain.wb_effect, live_signal_num)
                        end
                        return chain.chain, prepare
@@ -411,17 +447,21 @@ function get_chain(num, t, width, height, signals)
                        return static_chain_hq, prepare
                elseif live_signal_num == FADE_SIGNAL_NUM then  -- Fade.
                        local input0_type = get_input_type(signals, fade_src_signal)
+                       local input0_scale = needs_scale(signals, fade_src_signal, width, height)
                        local input1_type = get_input_type(signals, fade_dst_signal)
-                       local chain = fade_chains[input0_type][input1_type][true]
+                       local input1_scale = needs_scale(signals, fade_dst_signal, width, height)
+                       local chain = fade_chains[input0_type][input0_scale][input1_type][input1_scale][true]
                        prepare = function()
                                if input0_type == "live" then
                                        chain.input0.input:connect_signal(fade_src_signal)
                                        set_neutral_color_from_signal(chain.input0.wb_effect, fade_src_signal)
                                end
+                               set_scale_parameters_if_needed(chain.input0, width, height)
                                if input1_type == "live" then
                                        chain.input1.input:connect_signal(fade_dst_signal)
                                        set_neutral_color_from_signal(chain.input1.wb_effect, fade_dst_signal)
                                end
+                               set_scale_parameters_if_needed(chain.input1, width, height)
                                local tt = calc_fade_progress(t, transition_start, transition_end)
 
                                chain.mix_effect:set_float("strength_first", 1.0 - tt)
@@ -435,9 +475,11 @@ function get_chain(num, t, width, height, signals)
                local input1_type = get_input_type(signals, INPUT1_SIGNAL_NUM)
                if t > transition_end and zoom_dst == 1.0 then
                        -- Special case: Show only the single image on screen.
-                       local chain = simple_chains[input0_type][true]
+                       local input0_scale = needs_scale(signals, fade_src_signal, width, height)
+                       local chain = simple_chains[input0_type][input0_scale][true]
                        prepare = function()
                                chain.input:connect_signal(INPUT0_SIGNAL_NUM)
+                               set_scale_parameters_if_needed(chain, width, height)
                                set_neutral_color(chain.wb_effect, input0_neutral_color)
                        end
                        return chain.chain, prepare
@@ -464,18 +506,22 @@ function get_chain(num, t, width, height, signals)
        -- Individual preview inputs.
        if num == INPUT0_SIGNAL_NUM + 2 then
                local input_type = get_input_type(signals, INPUT0_SIGNAL_NUM)
-               local chain = simple_chains[input_type][false]
+               local input_scale = needs_scale(signals, INPUT0_SIGNAL_NUM, width, height)
+               local chain = simple_chains[input_type][input_scale][false]
                prepare = function()
                        chain.input:connect_signal(INPUT0_SIGNAL_NUM)
+                       set_scale_parameters_if_needed(chain, width, height)
                        set_neutral_color(chain.wb_effect, input0_neutral_color)
                end
                return chain.chain, prepare
        end
        if num == INPUT1_SIGNAL_NUM + 2 then
                local input_type = get_input_type(signals, INPUT1_SIGNAL_NUM)
-               local chain = simple_chains[input_type][false]
+               local input_scale = needs_scale(signals, INPUT1_SIGNAL_NUM, width, height)
+               local chain = simple_chains[input_type][input_scale][false]
                prepare = function()
                        chain.input:connect_signal(INPUT1_SIGNAL_NUM)
+                       set_scale_parameters_if_needed(chain, width, height)
                        set_neutral_color(chain.wb_effect, input1_neutral_color)
                end
                return chain.chain, prepare