Collapse all the 10-bit flags.

[nageru] / nageru / scene.cpp

diff --git a/nageru/scene.cpp b/nageru/scene.cpp
index f4320b45f9e6d02de38c3ffa608c7ae2a109de5e..11a3d2171de11851f89bf4e3f663a2f7b51780f6 100644 (file)
--- 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)
 {
@@ -209,6 +209,11 @@ int Scene::add_input(lua_State* L)
                if (lua_isnumber(L, 2)) {
                        block->alternatives.emplace_back(new EffectBlueprint(LIVE_INPUT_YCBCR));
                        block->alternatives.emplace_back(new EffectBlueprint(LIVE_INPUT_YCBCR_WITH_DEINTERLACE));
+#ifdef HAVE_SRT
+                       if (global_flags.srt_port >= 0) {
+                               block->alternatives.emplace_back(new EffectBlueprint(LIVE_INPUT_YCBCR_PLANAR));
+                       }
+#endif
 #ifdef HAVE_CEF
                } else if (luaL_testudata(L, 2, "HTMLInput")) {
                        block->alternatives.emplace_back(new EffectBlueprint(LIVE_INPUT_BGRA));
@@ -339,7 +344,7 @@ const Block *Scene::find_root_input_block(lua_State *L, const Block *block)
                const Block *parent = find_root_input_block(L, blocks[input_idx]);
                if (parent != nullptr) {
                        if (ret != nullptr) {
-                               luaL_error(L, "add_auto_white_balance() was connected to more than one input");
+                               luaL_error(L, "add_white_balance() was connected to more than one input");
                        }
                        ret = parent;
                }
@@ -347,7 +352,7 @@ const Block *Scene::find_root_input_block(lua_State *L, const Block *block)
        return ret;
 }
 
-int Scene::add_auto_white_balance(lua_State* L)
+int Scene::add_white_balance(lua_State* L)
 {
        assert(lua_gettop(L) >= 1);
        Scene *scene = (Scene *)luaL_checkudata(L, 1, "Scene");
@@ -375,10 +380,10 @@ int Scene::add_auto_white_balance(lua_State* L)
                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");
+               luaL_error(L, "add_white_balance([input], [white_balance_controller]) takes zero, one or two arguments");
        }
        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");
+               luaL_error(L, "add_white_balance() does not get its white balance from an input");
        }
 
        scene->blocks.push_back(block);
@@ -417,7 +422,7 @@ Effect *Scene::instantiate_effects(const Block *block, size_t chain_idx, Scene::
                        pixel_format = bmusb::PixelFormat_8BitBGRA;
                } else if (chosen_type == LIVE_INPUT_YCBCR_PLANAR) {
                        pixel_format = bmusb::PixelFormat_8BitYCbCrPlanar;
-               } else if (global_flags.ten_bit_input) {
+               } else if (global_flags.bit_depth > 8) {
                        pixel_format = bmusb::PixelFormat_10BitYCbCr;
                } else {
                        pixel_format = bmusb::PixelFormat_8BitYCbCr;
@@ -495,10 +500,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();
@@ -521,13 +526,22 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp
        InputStateInfo info(input_state);
        for (Block *block : blocks) {
                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]) {
+                               assert(info.last_pixel_format[card_index] == bmusb::PixelFormat_8BitYCbCr ||
+                                      info.last_pixel_format[card_index] == bmusb::PixelFormat_10BitYCbCr);
                                block->currently_chosen_alternative = find_index_of(block, LIVE_INPUT_YCBCR_WITH_DEINTERLACE);
+                       } else if (info.last_pixel_format[card_index] == bmusb::PixelFormat_8BitYCbCrPlanar) {
+                               block->currently_chosen_alternative = find_index_of(block, LIVE_INPUT_YCBCR_PLANAR);
+                       } else if (info.last_pixel_format[card_index] == bmusb::PixelFormat_8BitBGRA) {
+                               block->currently_chosen_alternative = find_index_of(block, LIVE_INPUT_BGRA);
                        } else {
                                block->currently_chosen_alternative = find_index_of(block, LIVE_INPUT_YCBCR);
                        }
+                       if (block->currently_chosen_alternative == -1) {
+                               fprintf(stderr, "ERROR: Input connected to a video card pixel format that it was not ready for.\n");
+                               abort();
+                       }
                }
        }
 
@@ -552,8 +566,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);
-               RGBTriplet 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);
@@ -589,7 +603,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<LiveInputWrapper *, int> signals_to_connect;
+       map<LiveInputWrapper *, int> cards_to_connect;
        map<ImageInput *, string> images_to_select;
        map<pair<Effect *, string>, int> int_to_set;
        map<pair<Effect *, string>, float> float_to_set;
@@ -603,7 +617,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) {
@@ -682,13 +696,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<mutex> 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);
@@ -734,10 +748,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