X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.lua;h=1243ad15de6be7cfb64d059969f958487de837f3;hb=af1ca12b6b39b2ef4c97fba0ceed45311d593a1c;hp=907d1068b95ab1d6201f35e9f1f548b67e0601a4;hpb=0482693cae5af2c48d0909d0170accbb8cd1bee9;p=nageru diff --git a/theme.lua b/theme.lua index 907d106..1243ad1 100644 --- a/theme.lua +++ b/theme.lua @@ -7,13 +7,15 @@ -- 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 local zoom_dst = 1.0 local zoom_poi = 0 -- which input to zoom in on -local fade_src = 0.0 -local fade_dst = 1.0 +local fade_src_signal = 0 +local fade_dst_signal = 0 local input0_neutral_color = {0.5, 0.5, 0.5} local input1_neutral_color = {0.5, 0.5, 0.5} @@ -25,10 +27,12 @@ local preview_signal_num = 1 local INPUT0_SIGNAL_NUM = 0 local INPUT1_SIGNAL_NUM = 1 local SBS_SIGNAL_NUM = 2 +local STATIC_SIGNAL_NUM = 3 --- A “fake” signal number that signifies that we are fading from one input +-- “fake” signal numbers that signifies that we are fading from one input -- to the next. -local FADE_SIGNAL_NUM = 3 +local FADE_VTV_SIGNAL_NUM = 4 -- Video to/from video. +local FADE_VTP_SIGNAL_NUM = 5 -- Video to/from static picture. -- The main live chain. function make_sbs_chain(hq) @@ -86,15 +90,24 @@ local main_chain_hq = make_sbs_chain(true) local main_chain_lq = make_sbs_chain(false) -- A chain to fade between two inputs (live chain only) -local fade_chain_hq = EffectChain.new(16, 9) -local fade_chain_hq_input0 = fade_chain_hq:add_live_input(true) -local fade_chain_hq_wb0_effect = fade_chain_hq:add_effect(WhiteBalanceEffect.new()) -local fade_chain_hq_input1 = fade_chain_hq:add_live_input(true) -local fade_chain_hq_wb1_effect = fade_chain_hq:add_effect(WhiteBalanceEffect.new()) -fade_chain_hq_input0:connect_signal(0) -fade_chain_hq_input1:connect_signal(1) -local fade_chain_mix_effect = fade_chain_hq:add_effect(MixEffect.new(), fade_chain_hq_wb0_effect, fade_chain_hq_wb1_effect) -fade_chain_hq:finalize(true) +local fade_vtv_chain_hq = EffectChain.new(16, 9) +local fade_vtv_chain_hq_input0 = fade_vtv_chain_hq:add_live_input(true) +local fade_vtv_chain_hq_wb0_effect = fade_vtv_chain_hq:add_effect(WhiteBalanceEffect.new()) +local fade_vtv_chain_hq_input1 = fade_vtv_chain_hq:add_live_input(true) +local fade_vtv_chain_hq_wb1_effect = fade_vtv_chain_hq:add_effect(WhiteBalanceEffect.new()) +fade_vtv_chain_hq_input0:connect_signal(0) +fade_vtv_chain_hq_input1:connect_signal(1) +local fade_vtv_chain_mix_effect = fade_vtv_chain_hq:add_effect(MixEffect.new(), fade_vtv_chain_hq_wb0_effect, fade_vtv_chain_hq_wb1_effect) +fade_vtv_chain_hq:finalize(true) + +-- A chain to fade between an inputs and a picture (live chain only) +local fade_vtp_chain_hq = EffectChain.new(16, 9) +local fade_vtp_chain_hq_input0 = fade_vtp_chain_hq:add_live_input(true) +local fade_vtp_chain_hq_wb0_effect = fade_vtp_chain_hq:add_effect(WhiteBalanceEffect.new()) +local fade_vtp_chain_hq_input1 = fade_vtp_chain_hq:add_effect(ImageInput.new("bg.jpeg")) +fade_vtp_chain_hq_input0:connect_signal(0) +local fade_vtp_chain_mix_effect = fade_vtp_chain_hq:add_effect(MixEffect.new(), fade_vtp_chain_hq_wb0_effect, fade_vtp_chain_hq_input1) +fade_vtp_chain_hq:finalize(true) -- A chain to show a single input on screen (HQ version). local simple_chain_hq = EffectChain.new(16, 9) @@ -110,10 +123,20 @@ simple_chain_lq_input:connect_signal(0) -- First input card. Can be changed whe local simple_chain_lq_wb_effect = simple_chain_lq:add_effect(WhiteBalanceEffect.new()) simple_chain_lq:finalize(false) +-- A chain to show a single static picture on screen (HQ version). +local static_chain_hq = EffectChain.new(16, 9) +local static_chain_hq_input = static_chain_hq:add_effect(ImageInput.new("bg.jpeg")) +static_chain_hq:finalize(true) + +-- A chain to show a single static picture on screen (LQ version). +local static_chain_lq = EffectChain.new(16, 9) +local static_chain_lq_input = static_chain_lq:add_effect(ImageInput.new("bg.jpeg")) +static_chain_lq:finalize(false) + -- 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() - return 3 + return 4 end -- Returns the name for each additional channel (starting from 2). @@ -125,6 +148,8 @@ function channel_name(channel) return "Input 2" elseif channel == 4 then return "Side-by-side" + elseif channel == 5 then + return "Static picture" end end @@ -151,11 +176,8 @@ function finish_transitions(t) end -- If live is fade but de-facto single, make it so. - if live_signal_num == FADE_SIGNAL_NUM and t >= transition_end and fade_dst == 1.0 then - live_signal_num = INPUT0_SIGNAL_NUM - end - if live_signal_num == FADE_SIGNAL_NUM and t >= transition_end and fade_dst == 0.0 then - live_signal_num = INPUT1_SIGNAL_NUM + if (live_signal_num == FADE_VTV_SIGNAL_NUM or live_signal_num == FADE_VTP_SIGNAL_NUM) and t >= transition_end then + live_signal_num = fade_dst_signal end end @@ -172,8 +194,12 @@ function get_transitions(t) return {"Cut"} end - if (live_signal_num == INPUT0_SIGNAL_NUM and preview_signal_num == INPUT1_SIGNAL_NUM) or - (live_signal_num == INPUT1_SIGNAL_NUM and preview_signal_num == INPUT0_SIGNAL_NUM) then + if (live_signal_num == INPUT0_SIGNAL_NUM or + live_signal_num == INPUT1_SIGNAL_NUM or + live_signal_num == STATIC_SIGNAL_NUM) and + (preview_signal_num == INPUT0_SIGNAL_NUM or + preview_signal_num == INPUT1_SIGNAL_NUM or + preview_signal_num == STATIC_SIGNAL_NUM) then return {"Cut", "", "Fade"} end @@ -192,7 +218,7 @@ end function transition_clicked(num, t) if num == 0 then -- Cut. - if live_signal_num == FADE_SIGNAL_NUM then + if live_signal_num == FADE_VTV_SIGNAL_NUM or live_signal_num == FADE_VTP_SIGNAL_NUM then -- Ongoing fade; finish it immediately. finish_transitions(transition_end) end @@ -252,20 +278,24 @@ function transition_clicked(num, t) finish_transitions(t) -- Fade. - if live_signal_num == INPUT0_SIGNAL_NUM and preview_signal_num == INPUT1_SIGNAL_NUM then + if (live_signal_num == INPUT0_SIGNAL_NUM and preview_signal_num == INPUT1_SIGNAL_NUM) or + (live_signal_num == INPUT1_SIGNAL_NUM and preview_signal_num == INPUT0_SIGNAL_NUM) then transition_start = t transition_end = t + 1.0 - fade_src = 1.0 - fade_dst = 0.0 - preview_signal_num = 0 - live_signal_num = FADE_SIGNAL_NUM - elseif live_signal_num == INPUT1_SIGNAL_NUM and preview_signal_num == INPUT0_SIGNAL_NUM then + fade_src_signal = live_signal_num + fade_dst_signal = preview_signal_num + preview_signal_num = live_signal_num + live_signal_num = FADE_VTV_SIGNAL_NUM + elseif ((live_signal_num == INPUT0_SIGNAL_NUM or live_signal_num == INPUT1_SIGNAL_NUM) and + preview_signal_num == STATIC_SIGNAL_NUM) or + ((preview_signal_num == INPUT0_SIGNAL_NUM or preview_signal_num == INPUT1_SIGNAL_NUM) and + live_signal_num == STATIC_SIGNAL_NUM) then transition_start = t transition_end = t + 1.0 - fade_src = 0.0 - fade_dst = 1.0 - preview_signal_num = 1 - live_signal_num = FADE_SIGNAL_NUM + fade_src_signal = live_signal_num + fade_dst_signal = preview_signal_num + preview_signal_num = live_signal_num + live_signal_num = FADE_VTP_SIGNAL_NUM else -- Fades involving SBS are ignored (we have no chain for it). end @@ -296,42 +326,44 @@ end -- if and only if num==0. function get_chain(num, t, width, height) if num == 0 then -- Live. - if live_signal_num == INPUT0_SIGNAL_NUM then -- Plain input. + if live_signal_num == INPUT0_SIGNAL_NUM or live_signal_num == INPUT1_SIGNAL_NUM then -- Plain input. prepare = function() - simple_chain_hq_input:connect_signal(INPUT0_SIGNAL_NUM) - set_neutral_color(simple_chain_hq_wb_effect, input0_neutral_color) + simple_chain_hq_input:connect_signal(live_signal_num) + set_neutral_color_from_signal(simple_chain_hq_wb_effect, live_signal_num) end return simple_chain_hq, prepare - elseif live_signal_num == INPUT1_SIGNAL_NUM then -- Plain input. + elseif live_signal_num == STATIC_SIGNAL_NUM then -- Static picture. prepare = function() - simple_chain_hq_input:connect_signal(INPUT1_SIGNAL_NUM) - set_neutral_color(simple_chain_hq_wb_effect, input1_neutral_color) end - return simple_chain_hq, prepare - elseif live_signal_num == FADE_SIGNAL_NUM then -- Fade. + return static_chain_hq, prepare + elseif live_signal_num == FADE_VTV_SIGNAL_NUM then -- Fade video-to-video. prepare = function() - fade_chain_hq_input0:connect_signal(0) - set_neutral_color(fade_chain_hq_wb0_effect, input0_neutral_color) - fade_chain_hq_input1:connect_signal(1) - set_neutral_color(fade_chain_hq_wb1_effect, input1_neutral_color) - local tt = (t - transition_start) / (transition_end - transition_start) - if tt < 0.0 then - tt = 0.0 - elseif tt > 1.0 then - tt = 1.0 + fade_vtv_chain_hq_input0:connect_signal(fade_src_signal) + set_neutral_color_from_signal(fade_vtv_chain_hq_wb0_effect, fade_src_signal) + fade_vtv_chain_hq_input1:connect_signal(fade_dst_signal) + set_neutral_color_from_signal(fade_vtv_chain_hq_wb1_effect, fade_dst_signal) + local tt = calc_fade_progress(t, transition_start, transition_end) + + fade_vtv_chain_mix_effect:set_float("strength_first", 1.0 - tt) + fade_vtv_chain_mix_effect:set_float("strength_second", tt) + end + return fade_vtv_chain_hq, prepare + elseif live_signal_num == FADE_VTP_SIGNAL_NUM then -- Fade video-to-picture (or picture-to-video). + prepare = function() + local tt + if fade_src_signal == STATIC_SIGNAL_NUM then + fade_vtp_chain_hq_input0:connect_signal(fade_dst_signal) + set_neutral_color_from_signal(fade_vtp_chain_hq_wb0_effect, fade_dst_signal) + tt = 1.0 - calc_fade_progress(t, transition_start, transition_end) + else + fade_vtp_chain_hq_input0:connect_signal(fade_src_signal) + set_neutral_color_from_signal(fade_vtp_chain_hq_wb0_effect, fade_src_signal) + tt = calc_fade_progress(t, transition_start, transition_end) end - - tt = fade_src + tt * (fade_dst - fade_src) - - -- Make the fade look maybe a tad more natural, by pumping it - -- through a sigmoid function. - tt = 10.0 * tt - 5.0 - tt = 1.0 / (1.0 + math.exp(-tt)) - - fade_chain_mix_effect:set_float("strength_first", tt) - fade_chain_mix_effect:set_float("strength_second", 1.0 - tt) + fade_vtp_chain_mix_effect:set_float("strength_first", 1.0 - tt) + fade_vtp_chain_mix_effect:set_float("strength_second", tt) end - return fade_chain_hq, prepare + return fade_vtp_chain_hq, prepare end -- SBS code (live_signal_num == SBS_SIGNAL_NUM). @@ -380,6 +412,11 @@ function get_chain(num, t, width, height) end return main_chain_lq.chain, prepare end + if num == STATIC_SIGNAL_NUM + 2 then + prepare = function() + end + return static_chain_lq, prepare + end end function place_rectangle(resample_effect, resize_effect, padding_effect, x0, y0, x1, y1, screen_width, screen_height, input_width, input_height) @@ -499,7 +536,7 @@ function prepare_sbs_chain(chain, t, screen_width, screen_height) -- Interpolate between the fullscreen and side-by-side views. local scale0, tx0, tx0 - if zoom_poi == 0 then + if zoom_poi == INPUT0_SIGNAL_NUM then local new_left0 = lerp(left0, 0, t) local new_right0 = lerp(right0, screen_width, t) local new_top0 = lerp(top0, 0, t) @@ -535,3 +572,27 @@ end function set_neutral_color(effect, color) effect:set_vec3("neutral_color", color[1], color[2], color[3]) end + +function set_neutral_color_from_signal(effect, signal) + if signal == INPUT0_SIGNAL_NUM then + set_neutral_color(effect, input0_neutral_color) + else + set_neutral_color(effect, input1_neutral_color) + end +end + +function calc_fade_progress(t, transition_start, transition_end) + local tt = (t - transition_start) / (transition_end - transition_start) + if tt < 0.0 then + tt = 0.0 + elseif tt > 1.0 then + tt = 1.0 + end + + -- Make the fade look maybe a tad more natural, by pumping it + -- through a sigmoid function. + tt = 10.0 * tt - 5.0 + tt = 1.0 / (1.0 + math.exp(-tt)) + + return tt +end