X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fscene.cpp;h=7a8e882fc038b1c092cdb2e4f68e5ac040586b01;hb=f7752bad9a473d26ff1fa7c83ac82dca098b63bb;hp=06392c031e9f7c133547396c1d8caa619825e579;hpb=9ece26cae09110a3c6a0c74aefb2269a6dd9a7d9;p=nageru diff --git a/nageru/scene.cpp b/nageru/scene.cpp index 06392c0..7a8e882 100644 --- a/nageru/scene.cpp +++ b/nageru/scene.cpp @@ -18,7 +18,7 @@ extern "C" { using namespace movit; using namespace std; -bool display(Block *block, lua_State *L, int idx); +static bool display(Block *block, lua_State *L, int idx); EffectType current_type(const Block *block) { @@ -178,8 +178,8 @@ bool Scene::is_noncanonical_chain(size_t chain_idx) const } // Auto white balance is always disabled for image inputs. - if (block->root_input_block != nullptr) { - const Block *input = block->root_input_block; + if (block->white_balance_controller_block != nullptr) { + const Block *input = block->white_balance_controller_block; if (input->alternatives[input->chosen_alternative(chain_idx)]->effect_type == IMAGE_INPUT) { return true; } @@ -235,6 +235,24 @@ int Scene::add_input(lua_State* L) return wrap_lua_existing_object_nonowned(L, "Block", block); } +Block *Scene::find_block_from_arg(lua_State *L, Scene *scene, int idx) +{ + if (luaL_testudata(L, idx, "Block")) { + return *(Block **)luaL_checkudata(L, idx, "Block"); + } else { + EffectBlueprint *blueprint = *(EffectBlueprint **)luaL_checkudata(L, idx, "EffectBlueprint"); + + // Search through all the blocks to figure out which one contains this effect. + for (Block *block : scene->blocks) { + if (find(block->alternatives.begin(), block->alternatives.end(), blueprint) != block->alternatives.end()) { + return block; + } + } + luaL_error(L, "Input effect in parameter #%d has not been added to this scene", idx - 1); + return nullptr; // Dead code. + } +} + void Scene::find_inputs_for_block(lua_State *L, Scene *scene, Block *block, int first_input_idx) { if (lua_gettop(L) == first_input_idx - 1) { @@ -245,24 +263,7 @@ void Scene::find_inputs_for_block(lua_State *L, Scene *scene, Block *block, int } for (int idx = first_input_idx; idx <= lua_gettop(L); ++idx) { - Block *input_block = nullptr; - if (luaL_testudata(L, idx, "Block")) { - input_block = *(Block **)luaL_checkudata(L, idx, "Block"); - } else { - EffectBlueprint *blueprint = *(EffectBlueprint **)luaL_checkudata(L, idx, "EffectBlueprint"); - - // Search through all the blocks to figure out which one contains this effect. - for (Block *block : scene->blocks) { - if (find(block->alternatives.begin(), block->alternatives.end(), blueprint) != block->alternatives.end()) { - input_block = block; - break; - } - } - if (input_block == nullptr) { - luaL_error(L, "Input effect in parameter #%d has not been added to this scene", idx - 1); - } - } - block->inputs.push_back(input_block->idx); + block->inputs.push_back(find_block_from_arg(L, scene, idx)->idx); } } @@ -360,14 +361,24 @@ int Scene::add_auto_white_balance(lua_State* L) block->canonical_alternative = 1; - find_inputs_for_block(L, scene, block, /*first_input_idx=*/2); - - if (block->inputs.size() != 1) { - luaL_error(L, "add_auto_white_balance() needs exactly one input"); + if (lua_gettop(L) == 1) { + // The last added effect is implicitly both the input and gives the white balance controller. + assert(!scene->blocks.empty()); + block->inputs.push_back(scene->blocks.size() - 1); + block->white_balance_controller_block = scene->find_root_input_block(L, block); + } else if (lua_gettop(L) == 2) { + // The given effect is both the input and the white balance controller. + block->inputs.push_back(find_block_from_arg(L, scene, 2)->idx); + block->white_balance_controller_block = scene->find_root_input_block(L, block); + } else if (lua_gettop(L) == 3) { + // We have explicit input and white balance controller. + block->inputs.push_back(find_block_from_arg(L, scene, 2)->idx); + block->white_balance_controller_block = find_block_from_arg(L, scene, 3); + } else { + luaL_error(L, "add_auto_white_balance([input], [white_balance_controller]) takes zero, one or two arguments"); } - block->root_input_block = scene->find_root_input_block(L, block); - if (block->root_input_block == nullptr) { - luaL_error(L, "add_auto_white_balance() was not connected to an input"); + if (block->white_balance_controller_block == nullptr || !block->white_balance_controller_block->is_input) { + luaL_error(L, "add_auto_white_balance() does not get its white balance from an input"); } scene->blocks.push_back(block); @@ -484,10 +495,10 @@ int Scene::finalize(lua_State* L) return 0; } -int find_signal_to_connect(lua_State *L, const Block *block) +int find_card_to_connect(Theme *theme, lua_State *L, const Block *block) { if (block->signal_type_to_connect == Block::CONNECT_SIGNAL) { - return block->signal_to_connect; + return theme->map_signal_to_card(block->signal_to_connect); #ifdef HAVE_CEF } else if (block->signal_type_to_connect == Block::CONNECT_CEF) { return block->cef_to_connect->get_card_index(); @@ -512,7 +523,8 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp if (block->is_input && block->signal_type_to_connect == Block::CONNECT_SIGNAL) { EffectType chosen_type = current_type(block); assert(chosen_type == LIVE_INPUT_YCBCR || chosen_type == LIVE_INPUT_YCBCR_WITH_DEINTERLACE); - if (info.last_interlaced[block->signal_to_connect]) { + int card_index = theme->map_signal_to_card(block->signal_to_connect); + if (info.last_interlaced[card_index]) { block->currently_chosen_alternative = find_index_of(block, LIVE_INPUT_YCBCR_WITH_DEINTERLACE); } else { block->currently_chosen_alternative = find_index_of(block, LIVE_INPUT_YCBCR); @@ -525,7 +537,7 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp map> white_balance; for (size_t block_idx = 0; block_idx < blocks.size(); ++block_idx) { Block *block = blocks[block_idx]; - const Block *input = block->root_input_block; + const Block *input = block->white_balance_controller_block; if (input == nullptr) { continue; // Not an auto white balance block. } @@ -541,8 +553,8 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp chosen_type == LIVE_INPUT_YCBCR_WITH_DEINTERLACE || chosen_type == LIVE_INPUT_YCBCR_PLANAR || chosen_type == LIVE_INPUT_BGRA); - int signal = find_signal_to_connect(L, input); - Theme::WhiteBalance wb = theme->get_white_balance_for_signal(signal); + int card_idx = find_card_to_connect(theme, L, input); + RGBTriplet wb = theme->get_white_balance_for_card(card_idx); if (fabs(wb.r - 1.0) < 1e-3 && fabs(wb.g - 1.0) < 1e-3 && fabs(wb.b - 1.0) < 1e-3) { // Neutral white balance. block->currently_chosen_alternative = find_index_of(block, IDENTITY_EFFECT); @@ -578,7 +590,7 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp const Scene::Instantiation &instantiation = chains[chain_idx]; EffectChain *effect_chain = instantiation.chain.get(); - map signals_to_connect; + map cards_to_connect; map images_to_select; map, int> int_to_set; map, float> float_to_set; @@ -592,7 +604,7 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp chosen_type == LIVE_INPUT_YCBCR_PLANAR || chosen_type == LIVE_INPUT_BGRA) { LiveInputWrapper *input = index_and_input.second; - signals_to_connect.emplace(input, find_signal_to_connect(L, block)); + cards_to_connect.emplace(input, find_card_to_connect(theme, L, block)); } } for (const auto &index_and_input : instantiation.image_inputs) { @@ -671,13 +683,13 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp lua_pop(L, 1); - auto setup_chain = [L, theme, signals_to_connect, images_to_select, int_to_set, float_to_set, vec3_to_set, vec4_to_set, input_state]{ + auto setup_chain = [L, theme, cards_to_connect, images_to_select, int_to_set, float_to_set, vec3_to_set, vec4_to_set, input_state]{ lock_guard lock(theme->m); - // Set up state, including connecting signals. - for (const auto &input_and_signal : signals_to_connect) { - LiveInputWrapper *input = input_and_signal.first; - input->connect_signal_raw(input_and_signal.second, input_state); + // Set up state, including connecting cards. + for (const auto &input_and_card : cards_to_connect) { + LiveInputWrapper *input = input_and_card.first; + input->connect_card(input_and_card.second, input_state); } for (const auto &input_and_filename : images_to_select) { input_and_filename.first->switch_image(input_and_filename.second); @@ -723,10 +735,9 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp bool display(Block *block, lua_State *L, int idx) { if (lua_isnumber(L, idx)) { - Theme *theme = get_theme_updata(L); int signal_idx = luaL_checknumber(L, idx); block->signal_type_to_connect = Block::CONNECT_SIGNAL; - block->signal_to_connect = theme->map_signal(signal_idx); + block->signal_to_connect = signal_idx; block->currently_chosen_alternative = find_index_of(block, LIVE_INPUT_YCBCR); // Will be changed to deinterlaced at get_chain() time if needed. return true; #ifdef HAVE_CEF