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 c6cf4515805ad83be506f783d26df92b30ebc103..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;
@@ -860,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 },
@@ -873,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 },
@@ -1681,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);
@@ -1697,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);
@@ -1878,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;
+}