X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fultimate.lua;h=3045e6f4d745601bfd8131dd67eb2bb795c3ed06;hb=c70bf291fa8efc5975031d5c01f7282babeaaf9b;hp=3f51fd87379f921e3509422a6b6146d9f4b53032;hpb=88b917906a87df7068d5b0d713a212bf878d2286;p=ultimatescore diff --git a/nageru/ultimate.lua b/nageru/ultimate.lua index 3f51fd8..3045e6f 100644 --- a/nageru/ultimate.lua +++ b/nageru/ultimate.lua @@ -1,28 +1,58 @@ --- Nageru theme for ultimate productions, based on the default theme. - -local transition_start = -2.0 -local transition_end = -1.0 -local transition_type = 0 -local transition_src_signal = 0 -local transition_dst_signal = 0 - -local neutral_colors = { - {0.5, 0.5, 0.5}, -- Input 0. - {0.5, 0.5, 0.5}, -- Input 1. - {0.5, 0.5, 0.5}, -- Input 2. - {0.5, 0.5, 0.5}, -- Input 3. - {0.5, 0.5, 0.5} -- Input 4. +-- Nageru theme for TFK mini-tournament 2017, based on the default theme. + +local http_request = require("http.request") +local cqueues = require("cqueues") +local cq = cqueues.new() +local futatabi_server = "http://gruessi.trd.sesse.net:9095" + +local state = { + transition_start = -2.0, + transition_end = -1.0, + transition_type = 0, + transition_src_signal = 0, + transition_dst_signal = 0, + + neutral_colors = { + {0.5, 0.5, 0.5}, -- Input 0. + {0.5, 0.5, 0.5}, -- Input 1. + {0.5, 0.5, 0.5}, -- Input 2. + {0.5, 0.5, 0.5}, -- Input 3. + {0.5, 0.5, 0.5}, -- Input 4. + {0.5, 0.5, 0.5} -- Input 5. + -- Will also be filled with VIDEO_SIGNAL_NUM below. + }, + + overlay_transition_start = -2.0, + overlay_transition_end = -1.0, + overlay_alpha_src = 0.0, + overlay_alpha_dst = 1.0, + overlay_enabled = false, + + stinger_in_progress = false, + stinger_frame = 0, + stinger_src_signal = 0, + stinger_dst_signal = 0, + stinger_save_overlay = false, + + live_signal_num = 0, + preview_signal_num = 1 } - -local overlay_transition_start = -2.0 -local overlay_transition_end = -1.0 -local overlay_alpha_src = 0.0 -local overlay_alpha_dst = 1.0 -local overlay_enabled = false - -local live_signal_num = 0 -local preview_signal_num = 1 -local NUM_CAMERAS = 5 -- Remember to update neutral_colors, too. +local NUM_CAMERAS = 6 -- Remember to update neutral_colors, too. + +-- Update the Futatabi status in the title. +replay_title = "IPTV" +cq:wrap(function() + while true do + local headers, stream = assert(http_request.new_from_uri(futatabi_server .. "/queue_status"):go()) + replay_title = "IPTV" + if headers:get ":status" == "200" then + local body = assert(stream:get_body_as_string()) + if body then + replay_title = "IPTV " .. body + end + end + end +end) -- Valid values for live_signal_num and preview_signal_num. local INPUT0_SIGNAL_NUM = 0 @@ -30,12 +60,16 @@ local INPUT1_SIGNAL_NUM = 1 local INPUT2_SIGNAL_NUM = 2 local INPUT3_SIGNAL_NUM = 3 local INPUT4_SIGNAL_NUM = 4 +local INPUT5_SIGNAL_NUM = 5 local SBS_SIGNAL_NUM = NUM_CAMERAS local STATIC_SIGNAL_NUM = NUM_CAMERAS + 1 +local VIDEO_SIGNAL_NUM = NUM_CAMERAS + 2 + +state.neutral_colors[VIDEO_SIGNAL_NUM - INPUT0_SIGNAL_NUM + 1] = {0.5, 0.5, 0.5} -- Preview-only signal showing the current signal with the overlay. -- Not valid for live_signal_num! -local OVERLAY_SIGNAL_NUM = NUM_CAMERAS + 2 +local OVERLAY_SIGNAL_NUM = NUM_CAMERAS + 3 -- Valid values for transition_type. (Cuts are done directly, so they need no entry.) local NO_TRANSITION = 0 @@ -52,12 +86,18 @@ local cef_input = HTMLInput.new("file://" .. cef_path .. "/score.html") cef_input:execute_javascript_async("play()") local bg_video = VideoInput.new(cef_path .. "/flow-720.mp4", Nageru.VIDEO_FORMAT_YCBCR) +-- local iptv_video = VideoInput.new("http://10.34.129.69:9060/1/v.flv", Nageru.VIDEO_FORMAT_YCBCR) +local iptv_video = VideoInput.new("http://home.samfundet.no/~sesse/videostuff", Nageru.VIDEO_FORMAT_YCBCR) function reload_cef() cef_input:reload() cef_input:execute_javascript_async("play()") end +function disconnect_iptv() + iptv_video:disconnect() +end + -- Utility function to help creating many similar chains that can differ -- in a free set of chosen parameters. function make_cartesian_product(parms, callback) @@ -96,9 +136,12 @@ function possibly_make_overlay(has_overlay, chain, base) end end -function make_fade_input(chain, signal, live, deint, scale) +function make_fade_input(chain, signal, live, deint, scale, video) local input, wb_effect, resample_effect, last - if live then + if video then + input = chain:add_video_input(iptv_video, false) + last = input + elseif live then input = chain:add_live_input(false, deint) input:connect_signal(signal) last = input @@ -131,11 +174,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, input0_scale, input1_live, input1_deint, input1_scale, has_overlay, hq) +function make_fade_chain(input0_live, input0_deint, input0_scale, input0_video, input1_live, input1_deint, input1_scale, input1_video, has_overlay, hq) local chain = EffectChain.new(16, 9) - 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 input0 = make_fade_input(chain, INPUT0_SIGNAL_NUM, input0_live, input0_deint, input0_scale, input0_video) + local input1 = make_fade_input(chain, INPUT1_SIGNAL_NUM, input1_live, input1_deint, input1_scale, input1_video) -- If fading between two live inputs, the overlay is put on top. -- If fading between the static picture and a live input, @@ -171,9 +214,9 @@ end -- Chains to fade between two inputs, in various configurations. local fade_chains = make_cartesian_product({ - {"static", "live", "livedeint"}, -- input0_type + {"video", "static", "live", "livedeint"}, -- input0_type {true, false}, -- input0_scale - {"static", "live", "livedeint"}, -- input1_type + {"video", "static", "live", "livedeint"}, -- input1_type {true, false}, -- input1_scale {true, false}, -- has_overlay {true} -- hq @@ -182,16 +225,20 @@ local fade_chains = make_cartesian_product({ 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, has_overlay, hq) + local input0_video = (input0_type == "video") + local input1_video = (input1_type == "video") + return make_fade_chain(input0_live, input0_deint, input0_scale, input0_video, input1_live, input1_deint, input1_scale, input1_video, has_overlay, hq) end) function make_sbs_input(chain, signal, deint, has_overlay, 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()) -- Needs to be before the overlay. + local overlay = nil if has_overlay then - overlay = make_overlay(chain, input) + overlay = make_overlay(chain, wb_effect) end local resample_effect = nil @@ -201,7 +248,6 @@ function make_sbs_input(chain, signal, deint, has_overlay, 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()) @@ -250,15 +296,19 @@ local sbs_chains = make_cartesian_product({ return make_sbs_chain(input0_type, input0_overlay, input1_type, hq) end) --- A chain to show a single input on screen. -function make_simple_chain(input_deint, input_scale, has_overlay, hq) +function make_simple_chain_no_finalize(input_deint, input_video, input_scale, has_overlay, hq) local chain = EffectChain.new(16, 9) - local input = chain:add_live_input(false, input_deint) - input:connect_signal(0) -- First input card. Can be changed whenever you want. + local input + if input_video then + input = chain:add_video_input(iptv_video, false) + else + input = chain:add_live_input(false, input_deint) + input:connect_signal(0) -- First input card. Can be changed whenever you want. + end local resample_effect, resize_effect - if scale then + if input_scale then if hq then resample_effect = chain:add_effect(ResampleEffect.new()) else @@ -269,8 +319,6 @@ function make_simple_chain(input_deint, input_scale, has_overlay, hq) local wb_effect = chain:add_effect(WhiteBalanceEffect.new()) local overlay = possibly_make_overlay(has_overlay, chain, wb_effect) - chain:finalize(hq) - return { chain = chain, input = input, @@ -281,15 +329,53 @@ function make_simple_chain(input_deint, input_scale, has_overlay, hq) } end +-- A chain to show a single input on screen. +function make_simple_chain(input_deint, input_video, input_scale, has_overlay, hq) + local chain = make_simple_chain_no_finalize(input_deint, input_video, input_scale, has_overlay, hq) + chain.chain:finalize(hq) + return chain +end + -- Make all possible combinations of single-input chains. local simple_chains = make_cartesian_product({ - {"live", "livedeint"}, -- input_type + {"video", "live", "livedeint"}, -- input_type {true, false}, -- input_scale {true, false}, -- has_overlay {true, false} -- hq }, function(input_type, input_scale, has_overlay, hq) local input_deint = (input_type == "livedeint") - return make_simple_chain(input_deint, input_scale, has_overlay, hq) + local input_video = (input_type == "video") + return make_simple_chain(input_deint, input_video, input_scale, has_overlay, hq) +end) + +-- A chain to show a single input on screen, with a stinger on top. +function make_stinger_chain(input_deint, input_video, input_scale, has_overlay, stinger_frame, hq) + local chain = make_simple_chain_no_finalize(input_deint, input_video, input_scale, has_overlay, hq) + local filename = cef_path .. "/stinger/blur" .. string.rep("0", 3 - string.len(tostring(stinger_frame))) .. stinger_frame .. ".png" + + local last + if has_overlay then + last = chain.overlay.overlay_effect + else + last = chain.wb_effect + end + local input = chain.chain:add_effect(ImageInput.new(filename)) + chain.chain:add_effect(OverlayEffect.new(), last, input) + chain.chain:finalize(hq) + return chain +end + +-- Single-input chains with various stinger frames on top. +local stinger_chains = make_cartesian_product({ + {"video", "live", "livedeint"}, -- input_type + {true, false}, -- input_scale + {true, false}, -- has_overlay + {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24}, -- stinger_frame + {true, false} -- hq +}, function(input_type, input_scale, has_overlay, stinger_frame, hq) + local input_deint = (input_type == "livedeint") + local input_video = (input_type == "video") + return make_stinger_chain(input_deint, input_video, input_scale, has_overlay, stinger_frame, hq) end) -- A chain to show a single static picture on screen. Never with HTML overlay. @@ -315,6 +401,8 @@ overlay_chain_lq:finalize(false) function get_input_type(signals, signal_num) if signal_num == STATIC_SIGNAL_NUM then return "static" + elseif signal_num == VIDEO_SIGNAL_NUM then + return "video" elseif signals:get_interlaced(signal_num) then return "livedeint" else @@ -345,18 +433,18 @@ 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 NUM_CAMERAS + 3 -- sbs, static picture and overlay + return NUM_CAMERAS + 4 -- sbs, static picture, video and overlay end function is_plain_signal(num) - return num >= INPUT0_SIGNAL_NUM and num <= INPUT4_SIGNAL_NUM + return (num >= INPUT0_SIGNAL_NUM and num <= INPUT5_SIGNAL_NUM) or (num == VIDEO_SIGNAL_NUM) end -- Helper function to write e.g. “720p60”. The difference between this -- and get_channel_resolution_raw() is that this one also can say that -- there's no signal. function get_channel_resolution(signal_num) - res = last_resolution[signal_num] + local res = last_resolution[signal_num] if (not res) or not res.is_connected then return "disconnected" end @@ -410,10 +498,14 @@ function channel_name(channel) return "Goal R (" .. get_channel_resolution(signal_num) .. ")" elseif signal_num == INPUT4_SIGNAL_NUM then return "Commentators (" .. get_channel_resolution(signal_num) .. ")" + elseif signal_num == INPUT5_SIGNAL_NUM then + return "Laptop (" .. get_channel_resolution(signal_num) .. ")" elseif signal_num == SBS_SIGNAL_NUM then return "Side-by-side" elseif signal_num == STATIC_SIGNAL_NUM then return "Static picture" + elseif signal_num == VIDEO_SIGNAL_NUM then + return replay_title elseif signal_num == OVERLAY_SIGNAL_NUM then return "Overlay" end @@ -427,7 +519,9 @@ end -- Called once for each channel, at the start of the program. -- Will never be called for live (0) or preview (1). function channel_signal(channel) - if is_plain_signal(channel - 2) then + if channel - 2 == VIDEO_SIGNAL_NUM then + return iptv_video:get_signal_num() + elseif is_plain_signal(channel - 2) then return channel - 2 else return -1 @@ -440,17 +534,17 @@ end -- "transparent" is allowed. -- Will never be called for live (0) or preview (1). function channel_color(channel) - if transition_type ~= NO_TRANSITION then - if channel_involved_in(channel, transition_src_signal) or - channel_involved_in(channel, transition_dst_signal) then + if state.transition_type ~= NO_TRANSITION then + if channel_involved_in(channel, state.transition_src_signal) or + channel_involved_in(channel, state.transition_dst_signal) then return "#f00" end else - if channel_involved_in(channel, live_signal_num) then + if channel_involved_in(channel, state.live_signal_num) then return "#f00" end end - if channel_involved_in(channel, preview_signal_num) then + if channel_involved_in(channel, state.preview_signal_num) then return "#0f0" end return "transparent" @@ -466,6 +560,9 @@ function channel_involved_in(channel, signal_num) if signal_num == STATIC_SIGNAL_NUM then return (channel == NUM_CAMERAS) end + if signal_num == VIDEO_SIGNAL_NUM then + return (channel == NUM_CAMERAS + 1) + end return false end @@ -481,25 +578,25 @@ end -- The color is in linear light (not sRGB gamma). function set_wb(channel, red, green, blue) if is_plain_signal(channel - 2) then - neutral_colors[channel - 2 + 1] = { red, green, blue } + state.neutral_colors[channel - 2 + 1] = { red, green, blue } end end function finish_transitions(t) - if transition_type ~= NO_TRANSITION and t >= transition_end then - live_signal_num = transition_dst_signal - transition_type = NO_TRANSITION + if state.transition_type ~= NO_TRANSITION and t >= state.transition_end then + state.live_signal_num = state.transition_dst_signal + state.transition_type = NO_TRANSITION end -- Disable the overlay if it is no longer visible. - if overlay_enabled and t > overlay_transition_end and overlay_alpha_dst == 0.0 then - overlay_enabled = false + if state.overlay_enabled and t > state.overlay_transition_end and state.overlay_alpha_dst == 0.0 then + state.overlay_enabled = false print("Turning off overlay") end end function in_transition(t) - return t >= transition_start and t <= transition_end + return t >= state.transition_start and t <= state.transition_end end function is_sbs_participating_signal(signal_num) @@ -514,12 +611,12 @@ end -- API ENTRY POINT -- Called every frame. function get_transitions(t) - if preview_signal_num == OVERLAY_SIGNAL_NUM then - if t < overlay_transition_end then + if state.preview_signal_num == OVERLAY_SIGNAL_NUM then + if t < state.overlay_transition_end then -- Fade in progress. return {} end - if overlay_enabled then + if state.overlay_enabled then return {"Overlay off", "", "Fade ovl out"} else return {"Overlay on", "", "Fade ovl in"} @@ -532,20 +629,25 @@ function get_transitions(t) return {"Cut"} end - if live_signal_num == preview_signal_num then + if state.live_signal_num == state.preview_signal_num then -- No transitions possible. return {} end - if (is_plain_signal(live_signal_num) or live_signal_num == STATIC_SIGNAL_NUM) and - (is_plain_signal(preview_signal_num) or preview_signal_num == STATIC_SIGNAL_NUM) then + if (is_plain_signal(state.live_signal_num) and state.preview_signal_num == VIDEO_SIGNAL_NUM) or + (is_plain_signal(state.preview_signal_num) and state.live_signal_num == VIDEO_SIGNAL_NUM) then + return {"Cut", "Sting", "Fade"} + end + + if (is_plain_signal(state.live_signal_num) or state.live_signal_num == STATIC_SIGNAL_NUM) and + (is_plain_signal(state.preview_signal_num) or state.preview_signal_num == STATIC_SIGNAL_NUM) then return {"Cut", "", "Fade"} end -- Various zooms. - if live_signal_num == SBS_SIGNAL_NUM and is_sbs_participating_signal(preview_signal_num) then + if state.live_signal_num == SBS_SIGNAL_NUM and is_sbs_participating_signal(state.preview_signal_num) then return {"Cut", "Zoom in"} - elseif is_sbs_participating_signal(live_signal_num) and preview_signal_num == SBS_SIGNAL_NUM then + elseif is_sbs_participating_signal(state.live_signal_num) and state.preview_signal_num == SBS_SIGNAL_NUM then return {"Cut", "Zoom out"} end @@ -553,49 +655,50 @@ function get_transitions(t) end function swap_preview_live() - local temp = live_signal_num - live_signal_num = preview_signal_num - preview_signal_num = temp + local temp = state.live_signal_num + state.live_signal_num = state.preview_signal_num + state.preview_signal_num = temp end function start_transition(type_, t, duration) - transition_start = t - transition_end = t + duration - transition_type = type_ - transition_src_signal = live_signal_num - transition_dst_signal = preview_signal_num + state.transition_start = t + state.transition_end = t + duration + state.transition_type = type_ + state.transition_src_signal = state.live_signal_num + state.transition_dst_signal = state.preview_signal_num + state.stinger_in_progress = false swap_preview_live() end -- API ENTRY POINT -- Called when the user clicks a transition button. function transition_clicked(num, t) - if preview_signal_num == OVERLAY_SIGNAL_NUM then + if state.preview_signal_num == OVERLAY_SIGNAL_NUM then if num == 0 then -- Cut. - overlay_transition_start = -2.0 - overlay_transition_end = -1.0 - if overlay_enabled then - overlay_enabled = false - overlay_alpha_src = 0.0 - overlay_alpha_dst = 0.0 + state.overlay_transition_start = -2.0 + state.overlay_transition_end = -1.0 + if state.overlay_enabled then + state.overlay_enabled = false + state.overlay_alpha_src = 0.0 + state.overlay_alpha_dst = 0.0 else - overlay_enabled = true - overlay_alpha_src = 1.0 - overlay_alpha_dst = 1.0 + state.overlay_enabled = true + state.overlay_alpha_src = 1.0 + state.overlay_alpha_dst = 1.0 end elseif num == 2 then -- Fade. - overlay_transition_start = t - overlay_transition_end = t + 1.0 - if overlay_enabled then - overlay_alpha_src = 1.0 - overlay_alpha_dst = 0.0 + state.overlay_transition_start = t + state.overlay_transition_end = t + 1.0 + if state.overlay_enabled then + state.overlay_alpha_src = 1.0 + state.overlay_alpha_dst = 0.0 else - overlay_alpha_src = 0.0 - overlay_alpha_dst = 1.0 + state.overlay_alpha_src = 0.0 + state.overlay_alpha_dst = 1.0 end - overlay_enabled = true + state.overlay_enabled = true end return end @@ -604,39 +707,55 @@ function transition_clicked(num, t) -- Cut. if in_transition(t) then -- Ongoing transition; finish it immediately before the cut. - finish_transitions(transition_end) + finish_transitions(state.transition_end) end swap_preview_live() + state.stinger_in_progress = false elseif num == 1 then - -- Zoom. + -- Zoom or sting. finish_transitions(t) - if live_signal_num == preview_signal_num then + if state.live_signal_num == state.preview_signal_num then -- Nothing to do. return end - if is_plain_signal(live_signal_num) and is_plain_signal(preview_signal_num) then + if (is_plain_signal(state.live_signal_num) and state.preview_signal_num == VIDEO_SIGNAL_NUM) or + (is_plain_signal(state.preview_signal_num) and state.live_signal_num == VIDEO_SIGNAL_NUM) then + -- Sting. + if stinger_in_progress then + return + end + + state.stinger_in_progress = true + state.stinger_frame = 0 + state.stinger_src_signal = state.live_signal_num + state.stinger_dst_signal = state.preview_signal_num + return + end + + if is_plain_signal(state.live_signal_num) and is_plain_signal(state.preview_signal_num) then -- We can't zoom between these. Just make a cut. - io.write("Cutting from " .. live_signal_num .. " to " .. live_signal_num .. "\n") + io.write("Cutting from " .. state.live_signal_num .. " to " .. state.live_signal_num .. "\n") swap_preview_live() + state.stinger_in_progress = false return end - if (live_signal_num == SBS_SIGNAL_NUM and is_sbs_participating_signal(preview_signal_num)) or - (preview_signal_num == SBS_SIGNAL_NUM and is_sbs_participating_signal(live_signal_num)) then + if (state.live_signal_num == SBS_SIGNAL_NUM and is_sbs_participating_signal(state.preview_signal_num)) or + (state.preview_signal_num == SBS_SIGNAL_NUM and is_sbs_participating_signal(state.live_signal_num)) then start_transition(ZOOM_TRANSITION, t, 1.0) end elseif num == 2 then finish_transitions(t) -- Fade. - if (live_signal_num ~= preview_signal_num) and - (is_plain_signal(live_signal_num) or - live_signal_num == STATIC_SIGNAL_NUM) and - (is_plain_signal(preview_signal_num) or - preview_signal_num == STATIC_SIGNAL_NUM) then + if (state.live_signal_num ~= state.preview_signal_num) and + (is_plain_signal(state.live_signal_num) or + state.live_signal_num == STATIC_SIGNAL_NUM) and + (is_plain_signal(state.preview_signal_num) or + state.preview_signal_num == STATIC_SIGNAL_NUM) then start_transition(FADE_TRANSITION, t, 1.0) else -- Fades involving SBS are ignored (we have no chain for it). @@ -646,51 +765,55 @@ end -- API ENTRY POINT function channel_clicked(num) - preview_signal_num = num + state.preview_signal_num = num end -function get_fade_chain(signals, t, width, height, input_resolution) - local input0_type = get_input_type(signals, transition_src_signal) - local input0_scale = needs_scale(signals, transition_src_signal, width, height) - local input1_type = get_input_type(signals, transition_dst_signal) - local input1_scale = needs_scale(signals, transition_dst_signal, width, height) - local chain = fade_chains[input0_type][input0_scale][input1_type][input1_scale][overlay_enabled][true] - prepare = function() +function get_fade_chain(state, signals, t, width, height, input_resolution) + local input0_type = get_input_type(signals, state.transition_src_signal) + local input0_scale = needs_scale(signals, state.transition_src_signal, width, height) + local input1_type = get_input_type(signals, state.transition_dst_signal) + local input1_scale = needs_scale(signals, state.transition_dst_signal, width, height) + local chain = fade_chains[input0_type][input0_scale][input1_type][input1_scale][state.overlay_enabled][true] + local prepare = function() if input0_type == "live" or input0_type == "livedeint" then - chain.input0.input:connect_signal(transition_src_signal) - set_neutral_color_from_signal(chain.input0.wb_effect, transition_src_signal) + chain.input0.input:connect_signal(state.transition_src_signal) + end + if input0_type ~= "static" then + set_neutral_color_from_signal(state, chain.input0.wb_effect, state.transition_src_signal) end set_scale_parameters_if_needed(chain.input0, width, height) if input1_type == "live" or input1_type == "livedeint" then - chain.input1.input:connect_signal(transition_dst_signal) - set_neutral_color_from_signal(chain.input1.wb_effect, transition_dst_signal) + chain.input1.input:connect_signal(state.transition_dst_signal) + end + if input1_type ~= "static" then + set_neutral_color_from_signal(state, chain.input1.wb_effect, state.transition_dst_signal) end set_scale_parameters_if_needed(chain.input1, width, height) - local tt = calc_fade_progress(t, transition_start, transition_end) + local tt = calc_fade_progress(t, state.transition_start, state.transition_end) chain.mix_effect:set_float("strength_first", 1.0 - tt) chain.mix_effect:set_float("strength_second", tt) -- The commentator output has no overlay on it. local extra_alpha_factor = 1.0 - if not simple_signal_has_overlay(transition_src_signal) and - not simple_signal_has_overlay(transition_dst_signal) then + if not simple_signal_has_overlay(state.transition_src_signal) and + not simple_signal_has_overlay(state.transition_dst_signal) then extra_alpha_factor = 0.0 - elseif not simple_signal_has_overlay(transition_src_signal) then + elseif not simple_signal_has_overlay(state.transition_src_signal) then extra_alpha_factor = tt - elseif not simple_signal_has_overlay(transition_dst_signal) then + elseif not simple_signal_has_overlay(state.transition_dst_signal) then extra_alpha_factor = 1.0 - tt end - prepare_overlay_live(chain, t, extra_alpha_factor) + prepare_overlay_live(state, chain, t, extra_alpha_factor) end return chain.chain, prepare end -- SBS code (live_signal_num == SBS_SIGNAL_NUM, or in a transition to/from it). -function get_sbs_chain(signals, t, width, height, input_resolution) +function get_sbs_chain(state, signals) local input0_type = get_input_type(signals, INPUT0_SIGNAL_NUM) local input1_type = get_input_type(signals, INPUT4_SIGNAL_NUM) - return sbs_chains[input0_type][overlay_enabled][input1_type][true] + return sbs_chains[input0_type][state.overlay_enabled][input1_type][true] end local last_rate = 0.0 @@ -720,6 +843,8 @@ local last_rate = 0.0 -- 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) + cq:loop(0) + local input_resolution = {} for signal_num=0,(NUM_CAMERAS-1) do local res = { @@ -747,11 +872,21 @@ function get_chain(num, t, width, height, signals) end last_resolution = input_resolution + -- Make a (semi-shallow) copy of the current state, so that the returned prepare function + -- is unaffected by state changes made by the UI before it is rendered. + local state_copy = {} + for key, value in pairs(state) do + state_copy[key] = value + end + for key, value in pairs(state.neutral_colors) do + state_copy.neutral_colors[key] = value + end + -- Save some CPU time if we're not having SBS on live. local new_rate - if live_signal_num == SBS_SIGNAL_NUM or - preview_signal_num == SBS_SIGNAL_NUM or - transition_type == ZOOM_TRANSITION then + if state.live_signal_num == SBS_SIGNAL_NUM or + state.preview_signal_num == SBS_SIGNAL_NUM or + state.transition_type == ZOOM_TRANSITION then new_rate = 1.0 else new_rate = 0.0001 @@ -765,40 +900,62 @@ function get_chain(num, t, width, height, signals) if num == 0 then -- Live. -- See if we're in a transition. finish_transitions(t) - if transition_type == ZOOM_TRANSITION then + if state.transition_type == ZOOM_TRANSITION then -- Transition in or out of SBS. - local chain = get_sbs_chain(signals, t, width, height, input_resolution) - prepare = function() - prepare_sbs_chain(chain, calc_zoom_progress(t), transition_type, transition_src_signal, transition_dst_signal, width, height, input_resolution) - prepare_overlay_live(chain, t, 1.0) + local chain = get_sbs_chain(state_copy, signals) + local prepare = function() + prepare_sbs_chain(state_copy, chain, calc_zoom_progress(t), state_copy.transition_type, state_copy.transition_src_signal, state_copy.transition_dst_signal, width, height, input_resolution) + prepare_overlay_live(state_copy, chain, t, 1.0) end return chain.chain, prepare - elseif transition_type == NO_TRANSITION and live_signal_num == SBS_SIGNAL_NUM then + elseif state.transition_type == NO_TRANSITION and state.live_signal_num == SBS_SIGNAL_NUM then -- Static SBS view. - local chain = get_sbs_chain(signals, t, width, height, input_resolution) - prepare = function() - prepare_sbs_chain(chain, 0.0, NO_TRANSITION, 0, SBS_SIGNAL_NUM, width, height, input_resolution) - prepare_overlay_live(chain, t, 1.0) + local chain = get_sbs_chain(state_copy, signals) + local prepare = function() + prepare_sbs_chain(state_copy, chain, 0.0, NO_TRANSITION, 0, SBS_SIGNAL_NUM, width, height, input_resolution) + prepare_overlay_live(state_copy, chain, t, 1.0) end return chain.chain, prepare - elseif transition_type == FADE_TRANSITION then - return get_fade_chain(signals, t, width, height, input_resolution) - elseif is_plain_signal(live_signal_num) then - local input_type = get_input_type(signals, live_signal_num) - local input_scale = needs_scale(signals, live_signal_num, width, height) - local overlay_really_enabled = overlay_enabled and simple_signal_has_overlay(live_signal_num) - local chain = simple_chains[input_type][input_scale][overlay_really_enabled][true] - prepare = function() - chain.input:connect_signal(live_signal_num) + elseif state.transition_type == FADE_TRANSITION then + return get_fade_chain(state_copy, signals, t, width, height, input_resolution) + elseif is_plain_signal(state.live_signal_num) then + local input_type = get_input_type(signals, state.live_signal_num) + local input_scale = needs_scale(signals, state.live_signal_num, width, height) + local overlay_really_enabled = state.overlay_enabled and simple_signal_has_overlay(state.live_signal_num) + local chain + if state.stinger_in_progress then + chain = stinger_chains[input_type][input_scale][overlay_really_enabled][state.stinger_frame][true] + state.stinger_frame = state.stinger_frame + 1 + if state.stinger_frame >= 25 then + state.stinger_in_progress = false + state.preview_signal_num = state.stinger_src_signal + state.live_signal_num = state.stinger_dst_signal + + if state.stinger_dst_signal == VIDEO_SIGNAL_NUM then + -- Turn off the overlay when playing video. + state.stinger_save_overlay = state.overlay_enabled + state.overlay_enabled = false + else + -- Restore the state. + state.overlay_enabled = state.stinger_save_overlay + end + end + else + chain = simple_chains[input_type][input_scale][overlay_really_enabled][true] + end + local prepare = function() + if input_type ~= "video" then + chain.input:connect_signal(state.live_signal_num) + end + set_neutral_color_from_signal(state_copy, chain.wb_effect, state.live_signal_num) set_scale_parameters_if_needed(chain, width, height) - set_neutral_color_from_signal(chain.wb_effect, live_signal_num) - prepare_overlay_live(chain, t, 1.0) + prepare_overlay_live(state_copy, chain, t, 1.0) end return chain.chain, prepare - elseif live_signal_num == STATIC_SIGNAL_NUM then -- Static picture. + elseif state.live_signal_num == STATIC_SIGNAL_NUM then -- Static picture. local chain = static_chains[true] - prepare = function() - prepare_overlay_live(chain, t, 1.0) -- FIXME: Should this ever be here? + local prepare = function() + prepare_overlay_live(state_copy, chain, t, 1.0) -- FIXME: Should this ever be here? end return chain.chain, prepare else @@ -810,16 +967,16 @@ function get_chain(num, t, width, height, signals) -- The M/E preview matches what we'd put live by doing a transition, as always. local show_overlay = false if num == 1 then -- Preview. - if preview_signal_num == OVERLAY_SIGNAL_NUM then - num = live_signal_num + 2 - show_overlay = not overlay_enabled + if state.preview_signal_num == OVERLAY_SIGNAL_NUM then + num = state.live_signal_num + 2 + show_overlay = not state.overlay_enabled - if transition_type ~= NO_TRANSITION then - num = transition_dst_signal + 2 + if state.transition_type ~= NO_TRANSITION then + num = state.transition_dst_signal + 2 end else - num = preview_signal_num + 2 - show_overlay = overlay_enabled and simple_signal_has_overlay(preview_signal_num) + num = state.preview_signal_num + 2 + show_overlay = state.overlay_enabled and simple_signal_has_overlay(state.preview_signal_num) end end @@ -829,10 +986,12 @@ function get_chain(num, t, width, height, signals) local input_type = get_input_type(signals, signal_num) local input_scale = needs_scale(signals, signal_num, width, height) local chain = simple_chains[input_type][input_scale][show_overlay][false] - prepare = function() - chain.input:connect_signal(signal_num) + local prepare = function() + if input_type ~= "video" then + chain.input:connect_signal(signal_num) + end + set_neutral_color(chain.wb_effect, state_copy.neutral_colors[signal_num + 1]) set_scale_parameters_if_needed(chain, width, height) - set_neutral_color(chain.wb_effect, neutral_colors[signal_num + 1]) prepare_overlay_static(chain, t) end return chain.chain, prepare @@ -841,20 +1000,20 @@ function get_chain(num, t, width, height, signals) local input0_type = get_input_type(signals, INPUT0_SIGNAL_NUM) local input1_type = get_input_type(signals, INPUT4_SIGNAL_NUM) local chain = sbs_chains[input0_type][show_overlay][input1_type][false] - prepare = function() - prepare_sbs_chain(chain, 0.0, NO_TRANSITION, 0, SBS_SIGNAL_NUM, width, height, input_resolution) + local prepare = function() + prepare_sbs_chain(state_copy, chain, 0.0, NO_TRANSITION, 0, SBS_SIGNAL_NUM, width, height, input_resolution) end return chain.chain, prepare end if num == STATIC_SIGNAL_NUM + 2 then local chain = static_chains[false] - prepare = function() + local prepare = function() prepare_overlay_static(chain, t) end return chain.chain, prepare end if num == OVERLAY_SIGNAL_NUM + 2 then - prepare = function() + local prepare = function() -- prepare_overlay(overlay_chain_lq, t) end return overlay_chain_lq, prepare @@ -890,11 +1049,11 @@ function pos_from_top_left(x, y, width, height, screen_width, screen_height) } end -function prepare_sbs_chain(chain, t, transition_type, src_signal, dst_signal, screen_width, screen_height, input_resolution) +function prepare_sbs_chain(state, chain, t, transition_type, src_signal, dst_signal, screen_width, screen_height, input_resolution) chain.input0.input:connect_signal(0) chain.input1.input:connect_signal(4) - set_neutral_color(chain.input0.wb_effect, neutral_colors[1]) - set_neutral_color(chain.input1.wb_effect, neutral_colors[5]) + set_neutral_color(chain.input0.wb_effect, state.neutral_colors[1]) + set_neutral_color(chain.input1.wb_effect, state.neutral_colors[5]) -- Both inputs are the same size (true side-by-side). local pos0 = pos_from_top_left(1280 - 616 - 16, 186, 616, 347, screen_width, screen_height) @@ -1041,14 +1200,14 @@ function place_rectangle(resample_effect, resize_effect, padding_effect, x0, y0, end end -function prepare_overlay_live(chain, t, extra_alpha_factor) +function prepare_overlay_live(state, chain, t, extra_alpha_factor) if chain.overlay then - local tt = calc_fade_progress(t, overlay_transition_start, overlay_transition_end) - overlay_alpha = overlay_alpha_src + tt * (overlay_alpha_dst - overlay_alpha_src) + local tt = calc_fade_progress(t, state.overlay_transition_start, state.overlay_transition_end) + local overlay_alpha = state.overlay_alpha_src + tt * (state.overlay_alpha_dst - state.overlay_alpha_src) overlay_alpha = overlay_alpha * extra_alpha_factor - --print("overlay_alpha=" .. overlay_alpha .. " [" .. overlay_alpha_src .. "," .. overlay_alpha_dst .. "]@" .. tt) - if t > overlay_transition_end and overlay_alpha_dst == 0.0 then - overlay_enabled = false -- Takes effect next frame. + --print("overlay_alpha=" .. overlay_alpha .. " [" .. state.overlay_alpha_src .. "," .. state.overlay_alpha_dst .. "]@" .. tt) + if t > state.overlay_transition_end and state.overlay_alpha_dst == 0.0 then + state.overlay_enabled = false -- Takes effect next frame. -- print("Turning off overlay") end chain.overlay.multiply_effect:set_vec4("factor", overlay_alpha, overlay_alpha, overlay_alpha, overlay_alpha) @@ -1065,19 +1224,19 @@ 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) +function set_neutral_color_from_signal(state, effect, signal) if is_plain_signal(signal) then - set_neutral_color(effect, neutral_colors[signal - INPUT0_SIGNAL_NUM + 1]) + set_neutral_color(effect, state.neutral_colors[signal - INPUT0_SIGNAL_NUM + 1]) end end function calc_zoom_progress(t) - if t < transition_start then + if t < state.transition_start then return 0.0 - elseif t > transition_end then + elseif t > state.transition_end then return 1.0 else - local tt = (t - transition_start) / (transition_end - transition_start) + local tt = (t - state.transition_start) / (state.transition_end - state.transition_start) -- Smooth it a bit. return math.sin(tt * 3.14159265358 * 0.5) end @@ -1100,5 +1259,6 @@ function calc_fade_progress(t, transition_start, transition_end) end ThemeMenu.set( - { "Reload overlay", reload_cef } + { "Reload overlay", reload_cef }, + { "Disconnect IPTV", disconnect_iptv } )