X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.lua;h=2884793ed4f5dae01d6b36853ce79168dffd77e8;hb=2a431ccd32a47fb0f40389cbd7d1a1e9d1902a64;hp=ee7283882fbfc3e5ca237d519510897c2334aa96;hpb=4306f4e919075eff62a42d318e899d5485139f9b;p=nageru diff --git a/theme.lua b/theme.lua index ee72838..2884793 100644 --- a/theme.lua +++ b/theme.lua @@ -31,6 +31,9 @@ local STATIC_SIGNAL_NUM = 3 -- to the next. local FADE_SIGNAL_NUM = 4 +-- Last width/height/resolution for each channel, if we have it. +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) @@ -244,13 +247,44 @@ 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 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) + 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 * 2) .. "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 @@ -430,6 +464,18 @@ 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 + input_resolution[signal_num] = { + 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) + } + 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) @@ -487,14 +533,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 @@ -531,7 +577,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 @@ -633,7 +679,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) @@ -688,8 +734,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)