From: Steinar H. Gunderson Date: Thu, 8 Oct 2015 19:15:11 +0000 (+0200) Subject: Hook up a third input, the SBS mix. Required hooking up ResizeEffect. X-Git-Tag: 1.0.0~263 X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=ccc6ab80f92f39a4a3ae9580b95ff5703de027c4 Hook up a third input, the SBS mix. Required hooking up ResizeEffect. --- diff --git a/mainwindow.cpp b/mainwindow.cpp index 4ac21bf..bac1f31 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -17,8 +17,11 @@ MainWindow::MainWindow() ui->me_live->set_output(Mixer::OUTPUT_LIVE); ui->me_preview->set_output(Mixer::OUTPUT_PREVIEW); + + // TODO: Ask for the real number. ui->preview1->set_output(Mixer::OUTPUT_INPUT0); ui->preview2->set_output(Mixer::OUTPUT_INPUT1); + ui->preview3->set_output(Mixer::OUTPUT_INPUT2); } void MainWindow::cut() diff --git a/mixer.h b/mixer.h index 594cb04..3411a50 100644 --- a/mixer.h +++ b/mixer.h @@ -39,6 +39,8 @@ public: OUTPUT_PREVIEW, OUTPUT_INPUT0, OUTPUT_INPUT1, + OUTPUT_INPUT2, + OUTPUT_INPUT3, NUM_OUTPUTS }; diff --git a/theme.cpp b/theme.cpp index acfb27c..d75ac86 100644 --- a/theme.cpp +++ b/theme.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include "theme.h" @@ -50,7 +51,8 @@ Effect *get_effect(lua_State *L, int idx) luaL_testudata(L, idx, "ResampleEffect") || luaL_testudata(L, idx, "PaddingEffect") || luaL_testudata(L, idx, "IntegralPaddingEffect") || - luaL_testudata(L, idx, "OverlayEffect")) { + luaL_testudata(L, idx, "OverlayEffect") || + luaL_testudata(L, idx, "ResizeEffect")) { return (Effect *)lua_touserdata(L, idx); } fprintf(stderr, "Error: Index #%d was not an Effect type\n", idx); @@ -177,6 +179,12 @@ int OverlayEffect_new(lua_State* L) return wrap_lua_object(L, "OverlayEffect"); } +int ResizeEffect_new(lua_State* L) +{ + assert(lua_gettop(L) == 0); + return wrap_lua_object(L, "ResizeEffect"); +} + int Effect_set_float(lua_State *L) { assert(lua_gettop(L) == 3); @@ -270,6 +278,14 @@ const luaL_Reg OverlayEffect_funcs[] = { { NULL, NULL } }; +const luaL_Reg ResizeEffect_funcs[] = { + { "new", ResizeEffect_new }, + { "set_float", Effect_set_float }, + { "set_int", Effect_set_int }, + { "set_vec4", Effect_set_vec4 }, + { NULL, NULL } +}; + } // namespace LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain) @@ -313,6 +329,7 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool) register_class("PaddingEffect", PaddingEffect_funcs); register_class("IntegralPaddingEffect", IntegralPaddingEffect_funcs); register_class("OverlayEffect", OverlayEffect_funcs); + register_class("ResizeEffect", ResizeEffect_funcs); // Run script. lua_settop(L, 0); diff --git a/theme.lua b/theme.lua index 514cb03..3a59040 100644 --- a/theme.lua +++ b/theme.lua @@ -17,24 +17,59 @@ local live_signal_num = 0 local preview_signal_num = 1 -- The main live chain. -local main_chain = EffectChain.new(16, 9) -local input0 = main_chain:add_live_input() -input0:connect_signal(0) -local input1 = main_chain:add_live_input() -input1:connect_signal(1) -local resample_effect = main_chain:add_effect(ResampleEffect.new(), input0) -local padding_effect = main_chain:add_effect(IntegralPaddingEffect.new()) -padding_effect:set_vec4("border_color", 0.0, 0.0, 0.0, 1.0) - -local resample2_effect = main_chain:add_effect(ResampleEffect.new(), input1) --- Effect *saturation_effect = main_chain->add_effect(new SaturationEffect()) --- CHECK(saturation_effect->set_float("saturation", 0.3f)) -local wb_effect = main_chain:add_effect(WhiteBalanceEffect.new()) -wb_effect:set_float("output_color_temperature", 3500.0) -local padding2_effect = main_chain:add_effect(IntegralPaddingEffect.new()) - -main_chain:add_effect(OverlayEffect.new(), padding_effect, padding2_effect) -main_chain:finalize(true) +function make_sbs_chain(hq) + local chain = EffectChain.new(16, 9) + local input0 = chain:add_live_input() + input0:connect_signal(0) + local input1 = chain:add_live_input() + input1:connect_signal(1) + + local resample_effect = nil + local resize_effect = nil + if (hq) then + resample_effect = chain:add_effect(ResampleEffect.new(), input0) + else + resize_effect = chain:add_effect(ResizeEffect.new(), input0) + end + + local padding_effect = chain:add_effect(IntegralPaddingEffect.new()) + padding_effect:set_vec4("border_color", 0.0, 0.0, 0.0, 1.0) + + local resample2_effect = nil + local resize2_effect = nil + if (hq) then + resample2_effect = chain:add_effect(ResampleEffect.new(), input1) + else + resize2_effect = chain:add_effect(ResizeEffect.new(), input1) + end + -- Effect *saturation_effect = chain->add_effect(new SaturationEffect()) + -- CHECK(saturation_effect->set_float("saturation", 0.3f)) + local wb_effect = chain:add_effect(WhiteBalanceEffect.new()) + wb_effect:set_float("output_color_temperature", 3500.0) + local padding2_effect = chain:add_effect(IntegralPaddingEffect.new()) + + chain:add_effect(OverlayEffect.new(), padding_effect, padding2_effect) + chain:finalize(hq) + + return { + chain = chain, + input0 = { + input = input0, + resample_effect = resample_effect, + resize_effect = resize_effect, + padding_effect = padding_effect + }, + input1 = { + input = input1, + resample_effect = resample2_effect, + resize_effect = resize2_effect, + padding_effect = padding2_effect + } + } +end + +local main_chain_hq = make_sbs_chain(true) +local main_chain_lq = make_sbs_chain(false) -- A chain to show a single input on screen (HQ version). local simple_chain_hq = EffectChain.new(16, 9) @@ -51,7 +86,7 @@ simple_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 2 + return 3 end -- Called every frame. @@ -106,17 +141,17 @@ function get_chain(num, t, width, height) end prepare = function() if t < zoom_start then - prepare_sbs_chain(zoom_src, width, height) + prepare_sbs_chain(main_chain_hq, zoom_src, width, height) elseif t > zoom_end then - prepare_sbs_chain(zoom_dst, width, height) + prepare_sbs_chain(main_chain_hq, zoom_dst, width, height) else local tt = (t - zoom_start) / (zoom_end - zoom_start) -- Smooth it a bit. tt = math.sin(tt * 3.14159265358 * 0.5) - prepare_sbs_chain(zoom_src + (zoom_dst - zoom_src) * tt, width, height) + prepare_sbs_chain(main_chain_hq, zoom_src + (zoom_dst - zoom_src) * tt, width, height) end end - return main_chain, prepare + return main_chain_hq.chain, prepare end if num == 1 then -- Preview. prepare = function() @@ -136,9 +171,15 @@ function get_chain(num, t, width, height) end return simple_chain_lq, prepare end + if num == 4 then + prepare = function() + prepare_sbs_chain(main_chain_lq, 0.0, width, height) + end + return main_chain_lq.chain, prepare + end end -function place_rectangle(resample_effect, padding_effect, x0, y0, x1, y1, screen_width, screen_height) +function place_rectangle(resample_effect, resize_effect, padding_effect, x0, y0, x1, y1, screen_width, screen_height) local srcx0 = 0.0 local srcx1 = 1.0 local srcy0 = 0.0 @@ -165,38 +206,51 @@ function place_rectangle(resample_effect, padding_effect, x0, y0, x1, y1, screen y1 = screen_height end - local x_subpixel_offset = x0 - math.floor(x0) - local y_subpixel_offset = y0 - math.floor(y0) - - -- Resampling must be to an integral number of pixels. Round up, - -- and then add an extra pixel so we have some leeway for the border. - local width = math.ceil(x1 - x0) + 1 - local height = math.ceil(y1 - y0) + 1 - resample_effect:set_int("width", width) - resample_effect:set_int("height", height) - - -- Correct the discrepancy with zoom. (This will leave a small - -- excess edge of pixels and subpixels, which we'll correct for soon.) - local zoom_x = (x1 - x0) / (width * (srcx1 - srcx0)) - local zoom_y = (y1 - y0) / (height * (srcy1 - srcy0)) - resample_effect:set_float("zoom_x", zoom_x) - resample_effect:set_float("zoom_y", zoom_y) - resample_effect:set_float("zoom_center_x", 0.0) - resample_effect:set_float("zoom_center_y", 0.0) - - -- Padding must also be to a whole-pixel offset. - padding_effect:set_int("left", math.floor(x0)) - padding_effect:set_int("top", math.floor(y0)) - - -- Correct _that_ discrepancy by subpixel offset in the resampling. - resample_effect:set_float("left", -x_subpixel_offset / zoom_x) - resample_effect:set_float("top", -y_subpixel_offset / zoom_y) - - -- Finally, adjust the border so it is exactly where we want it. - padding_effect:set_float("border_offset_left", x_subpixel_offset) - padding_effect:set_float("border_offset_right", x1 - (math.floor(x0) + width)) - padding_effect:set_float("border_offset_top", y_subpixel_offset) - padding_effect:set_float("border_offset_bottom", y1 - (math.floor(y0) + height)) + if resample_effect ~= nil then + -- High-quality resampling. + local x_subpixel_offset = x0 - math.floor(x0) + local y_subpixel_offset = y0 - math.floor(y0) + + -- Resampling must be to an integral number of pixels. Round up, + -- and then add an extra pixel so we have some leeway for the border. + local width = math.ceil(x1 - x0) + 1 + local height = math.ceil(y1 - y0) + 1 + resample_effect:set_int("width", width) + resample_effect:set_int("height", height) + + -- Correct the discrepancy with zoom. (This will leave a small + -- excess edge of pixels and subpixels, which we'll correct for soon.) + local zoom_x = (x1 - x0) / (width * (srcx1 - srcx0)) + local zoom_y = (y1 - y0) / (height * (srcy1 - srcy0)) + resample_effect:set_float("zoom_x", zoom_x) + resample_effect:set_float("zoom_y", zoom_y) + resample_effect:set_float("zoom_center_x", 0.0) + resample_effect:set_float("zoom_center_y", 0.0) + + -- Padding must also be to a whole-pixel offset. + padding_effect:set_int("left", math.floor(x0)) + padding_effect:set_int("top", math.floor(y0)) + + -- Correct _that_ discrepancy by subpixel offset in the resampling. + resample_effect:set_float("left", -x_subpixel_offset / zoom_x) + resample_effect:set_float("top", -y_subpixel_offset / zoom_y) + + -- Finally, adjust the border so it is exactly where we want it. + padding_effect:set_float("border_offset_left", x_subpixel_offset) + padding_effect:set_float("border_offset_right", x1 - (math.floor(x0) + width)) + padding_effect:set_float("border_offset_top", y_subpixel_offset) + padding_effect:set_float("border_offset_bottom", y1 - (math.floor(y0) + height)) + else + -- Lower-quality simple resizing. + local width = round(x1 - x0) + local height = round(y1 - y0) + resize_effect:set_int("width", width) + resize_effect:set_int("height", height) + + -- Padding must also be to a whole-pixel offset. + padding_effect:set_int("left", math.floor(x0)) + padding_effect:set_int("top", math.floor(y0)) + end end -- This is broken, of course (even for positive numbers), but Lua doesn't give us access to real rounding. @@ -204,9 +258,9 @@ function round(x) return math.floor(x + 0.5) end -function prepare_sbs_chain(t, screen_width, screen_height) - input0:connect_signal(live_signal_num) - input1:connect_signal(1) +function prepare_sbs_chain(chain, t, screen_width, screen_height) + chain.input0.input:connect_signal(live_signal_num) + chain.input1.input:connect_signal(1) -- First input is positioned (16,48) from top-left. local width0 = round(848 * screen_width/1280.0) @@ -240,6 +294,6 @@ function prepare_sbs_chain(t, screen_width, screen_height) bottom1 = bottom1 * scale0 + ty0 left1 = left1 * scale0 + tx0 right1 = right1 * scale0 + tx0 - place_rectangle(resample_effect, padding_effect, left0, top0, right0, bottom0, screen_width, screen_height) - place_rectangle(resample2_effect, padding2_effect, left1, top1, right1, bottom1, screen_width, screen_height) + place_rectangle(chain.input0.resample_effect, chain.input0.resize_effect, chain.input0.padding_effect, left0, top0, right0, bottom0, screen_width, screen_height) + place_rectangle(chain.input1.resample_effect, chain.input1.resize_effect, chain.input1.padding_effect, left1, top1, right1, bottom1, screen_width, screen_height) end diff --git a/ui_mainwindow.ui b/ui_mainwindow.ui index 439c5d8..8b143d8 100644 --- a/ui_mainwindow.ui +++ b/ui_mainwindow.ui @@ -160,7 +160,7 @@ - + 1