X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.lua;h=e59ccc86cb0ed0ef4d6cc29f352f3c510ffdea95;hb=c667195e19ec9898b21cc5ebfa29dc8804ec96ad;hp=b623541c2a1b38bfa8024e1983be6e097ed27850;hpb=5828abe9cdab7f63333676f8275475ba83c19523;p=nageru diff --git a/theme.lua b/theme.lua index b623541..e59ccc8 100644 --- 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,6 +31,11 @@ local STATIC_SIGNAL_NUM = 3 -- to the next. 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 -- in a free set of chosen parameters. function make_cartesian_product(parms, callback) @@ -106,8 +109,8 @@ local sbs_chains = make_cartesian_product({ return make_sbs_chain(input0_deint, input1_deint, hq) end) -function make_fade_input(chain, signal, live, deint) - local input, wb_effect, last +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()) @@ -118,9 +121,17 @@ function make_fade_input(chain, signal, live, deint) 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 @@ -128,11 +139,11 @@ 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 = make_fade_input(chain, INPUT0_SIGNAL_NUM, input0_live, input0_deint) - local input1 = make_fade_input(chain, INPUT1_SIGNAL_NUM, input1_live, input1_deint) + 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) local mix_effect = chain:add_effect(MixEffect.new(), input0.last, input1.last) chain:finalize(hq) @@ -148,18 +159,20 @@ end -- Chains to fade between two inputs, in various configurations. local fade_chains = make_cartesian_product({ {"static", "live", "livedeint"}, -- input0_type + {true, false}, -- input0_scale {"static", "live", "livedeint"}, -- input1_type - {true, false} -- hq -}, function(input0_type, input1_type, hq) + {true, false}, -- input1_scale + {true} -- 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, input1_live, input1_deint, hq) + 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,20 +180,32 @@ 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 = make_cartesian_product({ {"live", "livedeint"}, -- input_type + {true, false}, -- input_scale {true, false} -- hq -}, function(input_type, hq) +}, function(input_type, input_scale, hq) local input_deint = (input_type == "livedeint") - return make_simple_chain(input_deint, hq) + return make_simple_chain(input_deint, input_scale, hq) end) -- A chain to show a single static picture on screen (HQ version). @@ -204,19 +229,66 @@ function get_input_type(signals, signal_num) end 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 + +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() return 4 end +-- Helper function to write e.g. “60” or “59.94”. +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 nom % den == 0 then + return nom / den + else + return string.format("%.2f", nom / den) + end +end + +-- Helper function to write e.g. “720p60”. +function get_channel_resolution(signal_num) + if last_resolution[signal_num] then + if last_resolution[signal_num].height == 0 or + last_resolution[signal_num].height == 525 then + return "no signal" + elseif last_resolution[signal_num].interlaced then + 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 + else + return "no signal" + end +end + -- Returns the name for each additional channel (starting from 2). --- Called only once for each channel, at the start of the program. +-- Called at the start of the program, and then each frame for live +-- channels in case they change resolution. function channel_name(channel) if channel == 2 then - return "Input 1" + return "Input 1 (" .. get_channel_resolution(0) .. ")" elseif channel == 3 then - return "Input 2" + return "Input 2 (" .. get_channel_resolution(1) .. ")" elseif channel == 4 then return "Side-by-side" elseif channel == 5 then @@ -396,12 +468,39 @@ 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 + 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. 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 +510,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 +538,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 @@ -445,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 @@ -464,18 +569,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 @@ -485,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 @@ -587,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) @@ -642,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)