Heed the Exif white point when playing back (MJPEG) video.

[nageru] / nageru / theme.cpp

diff --git a/nageru/theme.cpp b/nageru/theme.cpp
index 35046c18ee17a0b77dc474c51d3cf5fae9c21b39..f3e1aa1c64bb53cdc913e7f5fdb6d326362ff860 100644 (file)
--- a/nageru/theme.cpp
+++ b/nageru/theme.cpp
@@ -116,6 +116,7 @@ Effect *instantiate_effect(EffectChain *chain, EffectType effect_type)
        case IDENTITY_EFFECT:
                return new IdentityEffect;
        case WHITE_BALANCE_EFFECT:
+       case AUTO_WHITE_BALANCE_EFFECT:
                return new WhiteBalanceEffect;
        case RESAMPLE_EFFECT:
                return new ResampleEffect;
@@ -636,6 +637,20 @@ int InputStateInfo_get_height(lua_State* L)
        return 1;
 }
 
+int InputStateInfo_get_frame_height(lua_State* L)
+{
+       assert(lua_gettop(L) == 2);
+       InputStateInfo *input_state_info = get_input_state_info(L, 1);
+       Theme *theme = get_theme_updata(L);
+       int signal_num = theme->map_signal(luaL_checknumber(L, 2));
+       unsigned height = input_state_info->last_height[signal_num];
+       if (input_state_info->last_interlaced[signal_num]) {
+               height *= 2;
+       }
+       lua_pushnumber(L, height);
+       return 1;
+}
+
 int InputStateInfo_get_interlaced(lua_State* L)
 {
        assert(lua_gettop(L) == 2);
@@ -846,6 +861,7 @@ const luaL_Reg Scene_funcs[] = {
        { "new", Scene_new },
        { "__gc", Scene_gc },
        { "add_input", Scene::add_input },
+       { "add_auto_white_balance", Scene::add_auto_white_balance },
        { "add_effect", Scene::add_effect },
        { "add_optional_effect", Scene::add_optional_effect },
        { "finalize", Scene::finalize },
@@ -859,6 +875,7 @@ const luaL_Reg Block_funcs[] = {
        { "enable_if", Block_enable_if },
        { "disable", Block_disable },
        { "always_disable_if_disabled", Block_always_disable_if_disabled },
+       { "promise_to_disable_if_enabled", Block_promise_to_disable_if_enabled },
        { "set_int", Block_set_int },
        { "set_float", Block_set_float },
        { "set_vec3", Block_set_vec3 },
@@ -979,6 +996,8 @@ const luaL_Reg LiftGammaGainEffect_funcs[] = {
 const luaL_Reg InputStateInfo_funcs[] = {
        { "get_width", InputStateInfo_get_width },
        { "get_height", InputStateInfo_get_height },
+       { "get_frame_width", InputStateInfo_get_width },  // Same as get_width().
+       { "get_frame_height", InputStateInfo_get_frame_height },
        { "get_interlaced", InputStateInfo_get_interlaced },
        { "get_has_signal", InputStateInfo_get_has_signal },
        { "get_is_connected", InputStateInfo_get_is_connected },
@@ -1279,6 +1298,10 @@ int Nageru_set_supports_wb(lua_State *L)
 Theme::Theme(const string &filename, const vector<string> &search_dirs, ResourcePool *resource_pool, unsigned num_cards)
        : resource_pool(resource_pool), num_cards(num_cards), signal_to_card_mapping(global_flags.default_stream_mapping)
 {
+       // Defaults.
+       channel_names[0] = "Live";
+       channel_names[1] = "Preview";
+
        L = luaL_newstate();
         luaL_openlibs(L);
 
@@ -1396,6 +1419,8 @@ void Theme::register_globals()
        const vector<pair<string, int>> num_constants = {
                { "VIDEO_FORMAT_BGRA", bmusb::PixelFormat_8BitBGRA },
                { "VIDEO_FORMAT_YCBCR", bmusb::PixelFormat_8BitYCbCrPlanar },
+               { "CHECKABLE", MenuEntry::CHECKABLE },
+               { "CHECKED", MenuEntry::CHECKED },
        };
        const vector<pair<string, string>> str_constants = {
                { "THEME_PATH", theme_path },
@@ -1551,6 +1576,12 @@ string Theme::get_channel_name(unsigned channel)
 {
        lock_guard<mutex> lock(m);
 
+       // We never ask the legacy channel_name() about live and preview.
+       // The defaults are set in our constructor.
+       if (channel == 0 || channel == 1) {
+               return channel_names[channel];
+       }
+
        lua_getglobal(L, "channel_name");
        if (lua_isnil(L, -1)) {
                lua_pop(L, 1);
@@ -1653,10 +1684,37 @@ bool Theme::get_supports_set_wb(unsigned channel)
        return ret;
 }
 
-void Theme::set_wb(unsigned channel, double r, double g, double b)
+void Theme::set_wb(unsigned channel, float r, float g, float b)
+{
+       lock_guard<mutex> lock(m);
+       if (channel_signals.count(channel)) {
+               white_balance_for_signal[channel_signals[channel]] = RGBTriplet{ r, g, b };
+       }
+
+       call_lua_wb_callback(channel, r, g, b);
+}
+
+void Theme::set_wb_for_signal(int signal, float r, float g, float b)
 {
        lock_guard<mutex> lock(m);
+       white_balance_for_signal[signal] = RGBTriplet{ r, g, b };
+
+       for (const auto &channel_and_signal : channel_signals) {
+               if (channel_and_signal.second == signal) {
+                       call_lua_wb_callback(channel_and_signal.first, r, g, b);
+               }
+       }
+}
+
+void Theme::call_lua_wb_callback(unsigned channel, float r, float g, float b)
+{
        lua_getglobal(L, "set_wb");
+       if (lua_isnil(L, -1)) {
+               // The function doesn't exist, to just ignore. We've stored the white balance,
+               // and most likely, it will be picked up by auto white balance instead.
+               lua_pop(L, 1);
+               return;
+       }
        lua_pushnumber(L, channel);
        lua_pushnumber(L, r);
        lua_pushnumber(L, g);
@@ -1669,6 +1727,15 @@ void Theme::set_wb(unsigned channel, double r, double g, double b)
        assert(lua_gettop(L) == 0);
 }
 
+RGBTriplet Theme::get_white_balance_for_signal(int signal)
+{
+       if (white_balance_for_signal.count(signal)) {
+               return white_balance_for_signal[signal];
+       } else {
+               return RGBTriplet{ 1.0, 1.0, 1.0 };
+       }
+}
+
 vector<string> Theme::get_transition_names(float t)
 {
        lock_guard<mutex> lock(m);
@@ -1786,6 +1853,13 @@ unique_ptr<Theme::MenuEntry> create_theme_menu_entry(lua_State *L, int index)
        const string text = checkstdstring(L, -1);
        lua_pop(L, 1);
 
+       unsigned flags = 0;
+       if (lua_objlen(L, -1) > 2) {
+               lua_rawgeti(L, -1, 3);
+               flags = luaL_checknumber(L, -1);
+               lua_pop(L, 1);
+       }
+
        lua_rawgeti(L, index, 2);
        if (lua_istable(L, -1)) {
                vector<unique_ptr<Theme::MenuEntry>> submenu = create_recursive_theme_menu(L);
@@ -1794,7 +1868,7 @@ unique_ptr<Theme::MenuEntry> create_theme_menu_entry(lua_State *L, int index)
        } else {
                luaL_checktype(L, -1, LUA_TFUNCTION);
                int ref = luaL_ref(L, LUA_REGISTRYINDEX);
-               entry.reset(new Theme::MenuEntry{ text, L, ref });
+               entry.reset(new Theme::MenuEntry{ text, L, ref, flags });
        }
        return entry;
 }
@@ -1843,3 +1917,24 @@ void Theme::theme_menu_entry_clicked(int lua_ref)
                abort();
        }
 }
+
+string Theme::format_status_line(const string &disk_space_left_text, double file_length_seconds)
+{
+       lock_guard<mutex> lock(m);
+       lua_getglobal(L, "format_status_line");
+       if (lua_isnil(L, -1)) {
+               lua_pop(L, 1);
+               return disk_space_left_text;
+       }
+
+       lua_pushstring(L, disk_space_left_text.c_str());
+       lua_pushnumber(L, file_length_seconds);
+       if (lua_pcall(L, 2, 1, 0) != 0) {
+               fprintf(stderr, "error running function format_status_line(): %s\n", lua_tostring(L, -1));
+               abort();
+       }
+       string text = checkstdstring(L, 1);
+       lua_pop(L, 1);
+       assert(lua_gettop(L) == 0);
+       return text;
+}