X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fscene.cpp;h=2612de639961e8336d3eb4a6a8d8f8fb1f5f842a;hb=e4ebe67b6523038484df30d1d5fafc6055398acc;hp=d7da7db997ba1fbc3d4b74a7549ed36feaca1335;hpb=337e2d06624b4b46eb2e7e5365e2ece219f9f100;p=nageru diff --git a/nageru/scene.cpp b/nageru/scene.cpp index d7da7db..2612de6 100644 --- a/nageru/scene.cpp +++ b/nageru/scene.cpp @@ -42,7 +42,9 @@ size_t Scene::compute_chain_number(bool is_main_chain) const { assert(chains.size() > 0); assert(chains.size() % 2 == 0); - size_t chain_number = compute_chain_number_for_block(blocks.size() - 1); + bitset<256> disabled = find_disabled_blocks(size_t(-1)); + + size_t chain_number = compute_chain_number_for_block(blocks.size() - 1, disabled); assert(chain_number < chains.size() / 2); if (is_main_chain) { chain_number += chains.size() / 2; @@ -50,27 +52,81 @@ size_t Scene::compute_chain_number(bool is_main_chain) const return chain_number; } -size_t Scene::compute_chain_number_for_block(size_t block_idx) const +size_t Scene::compute_chain_number_for_block(size_t block_idx, const bitset<256> &disabled) const { Block *block = blocks[block_idx]; size_t chain_number; + + size_t currently_chosen_alternative; + if (disabled.test(block_idx)) { + // It doesn't matter, so pick 0 as the canonical choice + // (this is the only one that is actually instantiated). + currently_chosen_alternative = 0; + } else { + currently_chosen_alternative = block->currently_chosen_alternative; + } + assert(currently_chosen_alternative < block->alternatives.size()); + if (block_idx == 0) { assert(block->cardinality_base == 1); - chain_number = block->currently_chosen_alternative; + chain_number = currently_chosen_alternative; } else { - chain_number = compute_chain_number_for_block(block_idx - 1) + block->cardinality_base * block->currently_chosen_alternative; + chain_number = compute_chain_number_for_block(block_idx - 1, disabled) + block->cardinality_base * currently_chosen_alternative; } - assert(block->currently_chosen_alternative < int(block->alternatives.size())); return chain_number; } +bitset<256> Scene::find_disabled_blocks(size_t chain_idx) const +{ + assert(blocks.size() < 256); + + bitset<256> ret; + find_disabled_blocks(chain_idx, blocks.size() - 1, /*currently_disabled=*/false, &ret); + return ret; +} + +void Scene::find_disabled_blocks(size_t chain_idx, size_t block_idx, bool currently_disabled, bitset<256> *disabled) const +{ + if (currently_disabled) { + disabled->set(block_idx); + } + Block *block = blocks[block_idx]; + EffectType chosen_type = block->alternatives[block->chosen_alternative(chain_idx)]->effect_type; + for (size_t input_idx = 0; input_idx < block->inputs.size(); ++input_idx) { + if (chosen_type == IDENTITY_EFFECT && input_idx > 0) { + // Multi-input effect that has been replaced by + // IdentityEffect, so every effect but the first are + // disabled and will not participate in the chain. + find_disabled_blocks(chain_idx, block->inputs[input_idx], /*currently_disabled=*/true, disabled); + } else { + // Just keep on recursing down. + find_disabled_blocks(chain_idx, block->inputs[input_idx], currently_disabled, disabled); + } + } +} + +bool Scene::is_noncanonical_chain(size_t chain_idx) const +{ + bitset<256> disabled = find_disabled_blocks(chain_idx); + if (disabled.none()) { + return false; + } + assert(blocks.size() < 256); + for (size_t block_idx = 0; block_idx < blocks.size(); ++block_idx) { + if (disabled.test(block_idx) && blocks[block_idx]->chosen_alternative(chain_idx) != 0) { + return true; + } + } + return false; +} + int Scene::add_input(lua_State* L) { assert(lua_gettop(L) == 1 || lua_gettop(L) == 2); - Scene *chain = (Scene *)luaL_checkudata(L, 1, "Scene"); + Scene *scene = (Scene *)luaL_checkudata(L, 1, "Scene"); Block *block = new Block; - block->idx = chain->blocks.size(); + block->idx = scene->blocks.size(); if (lua_gettop(L) == 1) { // No parameter given, so a flexible input. block->alternatives.emplace_back(new EffectBlueprint(LIVE_INPUT_YCBCR)); @@ -104,18 +160,49 @@ int Scene::add_input(lua_State* L) assert(ok); } block->is_input = true; - chain->blocks.push_back(block); + scene->blocks.push_back(block); return wrap_lua_existing_object_nonowned(L, "Block", block); } +void Scene::find_inputs_for_block(lua_State *L, Scene *scene, Block *block) +{ + if (lua_gettop(L) == 2) { + // Implicitly the last added effect. + assert(!scene->blocks.empty()); + block->inputs.push_back(scene->blocks.size() - 1); + return; + } + + for (int idx = 3; 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); + } +} + int Scene::add_effect(lua_State* L) { assert(lua_gettop(L) >= 2); - Scene *chain = (Scene *)luaL_checkudata(L, 1, "Scene"); + Scene *scene = (Scene *)luaL_checkudata(L, 1, "Scene"); Block *block = new Block; - block->idx = chain->blocks.size(); + block->idx = scene->blocks.size(); if (lua_istable(L, 2)) { size_t len = lua_objlen(L, 2); @@ -130,34 +217,8 @@ int Scene::add_effect(lua_State* L) block->alternatives.push_back(blueprint); } - // Find the inputs. - if (lua_gettop(L) == 2) { - assert(!chain->blocks.empty()); - block->inputs.push_back(chain->blocks.size() - 1); - } else { - for (int idx = 3; 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 : chain->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 chain", idx - 1); - } - } - block->inputs.push_back(input_block->idx); - } - } - - chain->blocks.push_back(block); + find_inputs_for_block(L, scene, block); + scene->blocks.push_back(block); return wrap_lua_existing_object_nonowned(L, "Block", block); } @@ -165,11 +226,10 @@ int Scene::add_effect(lua_State* L) int Scene::add_optional_effect(lua_State* L) { assert(lua_gettop(L) >= 2); - Scene *chain = (Scene *)luaL_checkudata(L, 1, "Scene"); + Scene *scene = (Scene *)luaL_checkudata(L, 1, "Scene"); - // NOTE: We only support effects with a single parent, since that's what IdentityEffect does. Block *block = new Block; - block->idx = chain->blocks.size(); + block->idx = scene->blocks.size(); EffectBlueprint *blueprint = *(EffectBlueprint **)luaL_checkudata(L, 2, "EffectBlueprint"); block->alternatives.push_back(blueprint); @@ -177,22 +237,29 @@ int Scene::add_optional_effect(lua_State* L) // An IdentityEffect will be the alternative for when the effect is disabled. block->alternatives.push_back(new EffectBlueprint(IDENTITY_EFFECT)); - block->inputs.push_back(chain->blocks.size() - 1); - chain->blocks.push_back(block); + find_inputs_for_block(L, scene, block); + scene->blocks.push_back(block); return wrap_lua_existing_object_nonowned(L, "Block", block); } Effect *Scene::instantiate_effects(const Block *block, size_t chain_idx, Scene::Instantiation *instantiation) { + // Find the chosen alternative for this block in this instance. + EffectType chosen_type = block->alternatives[block->chosen_alternative(chain_idx)]->effect_type; + vector inputs; for (size_t input_idx : block->inputs) { inputs.push_back(instantiate_effects(blocks[input_idx], chain_idx, instantiation)); - } - // Find the chosen alternative for this block in this instance. - size_t chosen_alternative = (chain_idx / block->cardinality_base) % block->alternatives.size(); - EffectType chosen_type = block->alternatives[chosen_alternative]->effect_type; + // As a special case, we allow IdentityEffect to take only one input + // even if the other alternative (or alternatives) is multi-input. + // Thus, even if there are more than one inputs, instantiate only + // the first one. + if (chosen_type == IDENTITY_EFFECT) { + break; + } + } Effect *effect; switch (chosen_type) { @@ -225,7 +292,7 @@ Effect *Scene::instantiate_effects(const Block *block, size_t chain_idx, Scene:: break; } default: - effect = instantiate_effect(instantiation->chain.get(), block->alternatives[chosen_alternative]->effect_type); + effect = instantiate_effect(instantiation->chain.get(), chosen_type); instantiation->chain->add_effect(effect, inputs); break; } @@ -243,36 +310,43 @@ int Scene::finalize(lua_State* L) } else { assert(lua_gettop(L) == 1); } - Scene *chain = (Scene *)luaL_checkudata(L, 1, "Scene"); + Scene *scene = (Scene *)luaL_checkudata(L, 1, "Scene"); Theme *theme = get_theme_updata(L); size_t base = 1; - for (Block *block : chain->blocks) { + for (Block *block : scene->blocks) { block->cardinality_base = base; base *= block->alternatives.size(); } const size_t cardinality = base; - const size_t total_cardinality = cardinality * (only_one_mode ? 1 : 2); + size_t real_cardinality = 0; + for (size_t chain_idx = 0; chain_idx < cardinality; ++chain_idx) { + if (!scene->is_noncanonical_chain(chain_idx)) { + ++real_cardinality; + } + } + const size_t total_cardinality = real_cardinality * (only_one_mode ? 1 : 2); if (total_cardinality > 200) { print_warning(L, "The given Scene will instantiate %zu different versions. This will take a lot of time and RAM to compile; see if you could limit some options by e.g. locking the input type in some cases (by giving a fixed input to add_input()).\n", total_cardinality); } - Block *output_block = chain->blocks.back(); + Block *output_block = scene->blocks.back(); for (bool is_main_chain : { false, true }) { for (size_t chain_idx = 0; chain_idx < cardinality; ++chain_idx) { - if (only_one_mode && is_main_chain != chosen_mode) { - chain->chains.emplace_back(); + if ((only_one_mode && is_main_chain != chosen_mode) || + scene->is_noncanonical_chain(chain_idx)) { + scene->chains.emplace_back(); continue; } Scene::Instantiation instantiation; - instantiation.chain.reset(new EffectChain(chain->aspect_nom, chain->aspect_denom, theme->get_resource_pool())); - chain->instantiate_effects(output_block, chain_idx, &instantiation); + instantiation.chain.reset(new EffectChain(scene->aspect_nom, scene->aspect_denom, theme->get_resource_pool())); + scene->instantiate_effects(output_block, chain_idx, &instantiation); add_outputs_and_finalize(instantiation.chain.get(), is_main_chain); - chain->chains.emplace_back(move(instantiation)); + scene->chains.emplace_back(move(instantiation)); } } return 0; @@ -327,6 +401,8 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp #endif } else if (block->signal_type_to_connect == Block::CONNECT_VIDEO) { signals_to_connect.emplace(input, block->video_to_connect->get_card_index()); + } else if (block->signal_type_to_connect == Block::CONNECT_NONE) { + luaL_error(L, "An input in a scene was not connected to anything (forgot to call display())"); } else { assert(false); } @@ -364,16 +440,16 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp if (!block->alternatives.empty()) { EffectBlueprint *blueprint = block->alternatives[block->currently_chosen_alternative]; for (const auto &key_and_tuple : blueprint->int_parameters) { - int_to_set.emplace(make_pair(effect, key_and_tuple.first), key_and_tuple.second); + int_to_set[make_pair(effect, key_and_tuple.first)] = key_and_tuple.second; } for (const auto &key_and_tuple : blueprint->float_parameters) { - float_to_set.emplace(make_pair(effect, key_and_tuple.first), key_and_tuple.second); + float_to_set[make_pair(effect, key_and_tuple.first)] = key_and_tuple.second; } for (const auto &key_and_tuple : blueprint->vec3_parameters) { - vec3_to_set.emplace(make_pair(effect, key_and_tuple.first), key_and_tuple.second); + vec3_to_set[make_pair(effect, key_and_tuple.first)] = key_and_tuple.second; } for (const auto &key_and_tuple : blueprint->vec4_parameters) { - vec4_to_set.emplace(make_pair(effect, key_and_tuple.first), key_and_tuple.second); + vec4_to_set[make_pair(effect, key_and_tuple.first)] = key_and_tuple.second; } } } @@ -383,9 +459,6 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp 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]{ lock_guard lock(theme->m); - assert(theme->input_state == nullptr); - theme->input_state = &input_state; - // Set up state, including connecting signals. for (const auto &input_and_signal : signals_to_connect) { LiveInputWrapper *input = input_and_signal.first; @@ -428,8 +501,6 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp value[0], value[1], value[2], value[3]); } } - - theme->input_state = nullptr; }; return make_pair(effect_chain, move(setup_chain)); } @@ -494,17 +565,32 @@ int Block_display(lua_State* L) return 0; } -int Block_choose_alternative(lua_State* L) +int Block_choose(lua_State* L) { assert(lua_gettop(L) == 2); Block *block = *(Block **)luaL_checkudata(L, 1, "Block"); - int alternative_idx = luaL_checknumber(L, 2); + int alternative_idx = -1; + if (lua_isnumber(L, 2)) { + alternative_idx = luaL_checknumber(L, 2); + } else if (lua_istable(L, 2)) { + // See if it's an Effect metatable (e.g. foo:choose(ResampleEffect)) + lua_getfield(L, 2, "__effect_type_id"); + if (lua_isnumber(L, -1)) { + EffectType effect_type = EffectType(luaL_checknumber(L, -1)); + alternative_idx = find_index_of(block, effect_type); + } + lua_pop(L, 1); + } + + if (alternative_idx == -1) { + luaL_error(L, "choose() called with something that was not an index or an effect type (e.g. ResampleEffect) that was part of the alternatives"); + } assert(alternative_idx >= 0); assert(size_t(alternative_idx) < block->alternatives.size()); block->currently_chosen_alternative = alternative_idx; - return 0; + return wrap_lua_existing_object_nonowned(L, "EffectBlueprint", block->alternatives[alternative_idx]); } int Block_enable(lua_State *L) @@ -520,16 +606,29 @@ int Block_enable(lua_State *L) return 0; } -int Block_disable(lua_State *L) +int Block_enable_if(lua_State *L) { - assert(lua_gettop(L) == 1); + assert(lua_gettop(L) == 2); Block *block = *(Block **)luaL_checkudata(L, 1, "Block"); if (block->alternatives.size() != 2 || block->alternatives[1]->effect_type != IDENTITY_EFFECT) { - luaL_error(L, "disable() called on something that wasn't added with add_optional_effect()"); + luaL_error(L, "enable_if() called on something that wasn't added with add_optional_effect()"); } + bool enabled = checkbool(L, 2); + block->currently_chosen_alternative = enabled ? 0 : 1; + return 0; +} + +int Block_disable(lua_State *L) +{ + assert(lua_gettop(L) == 1); + Block *block = *(Block **)luaL_checkudata(L, 1, "Block"); + block->currently_chosen_alternative = find_index_of(block, IDENTITY_EFFECT); + if (block->currently_chosen_alternative == -1) { + luaL_error(L, "disable() called on something that didn't have an IdentityEffect fallback (try add_optional_effect())"); + } assert(block->currently_chosen_alternative != -1); return 0; }