Put the white balance after scaling; sometimes saves a bounce.

diff --git a/theme.lua b/theme.lua
index 1b874dcf876cf6337cbb9dd1ad450e53ebeb22b6..1abaae9c32e955695a986a16a0383aae835672e5 100644 (file)
--- a/theme.lua
+++ b/theme.lua
@@ -57,7 +57,6 @@ 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
@@ -66,6 +65,7 @@ function make_sbs_input(chain, signal, deint, hq)
        else
                resize_effect = chain:add_effect(ResizeEffect.new())
        end
+       local wb_effect = chain:add_effect(WhiteBalanceEffect.new())
 
        local padding_effect = chain:add_effect(IntegralPaddingEffect.new())
 
@@ -113,9 +113,8 @@ 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
+               last = input
        else
                input = chain:add_effect(ImageInput.new("bg.jpeg"))
                last = input
@@ -128,6 +127,12 @@ function make_fade_input(chain, signal, live, deint, scale)
                last = resample_effect
        end
 
+       -- Make sure to put the white balance after the scaling (usually more efficient).
+       if live then
+               wb_effect = chain:add_effect(WhiteBalanceEffect.new())
+               last = wb_effect
+       end
+
        return {
                input = input,
                wb_effect = wb_effect,
@@ -177,8 +182,6 @@ function make_simple_chain(input_deint, input_scale, hq)
 
        local input = chain:add_live_input(false, input_deint)
        input:connect_signal(0)  -- First input card. Can be changed whenever you want.
-       local wb_effect = chain:add_effect(WhiteBalanceEffect.new())
-       chain:finalize(hq)
 
        local resample_effect, resize_effect
        if scale then
@@ -189,6 +192,9 @@ function make_simple_chain(input_deint, input_scale, hq)
                end
        end
 
+       local wb_effect = chain:add_effect(WhiteBalanceEffect.new())
+       chain:finalize(hq)
+
        return {
                chain = chain,
                input = input,