Implement x264 speedcontrol.

[nageru] / theme.cpp

diff --git a/theme.cpp b/theme.cpp
index aefc081e97847d9349079fcc502d1e9161f1cd90..ed187e5561189eda91a3e8e2d389a72aadec58a0 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -11,6 +11,7 @@
 #include <movit/padding_effect.h>
 #include <movit/resample_effect.h>
 #include <movit/resize_effect.h>
+#include <movit/multiply_effect.h>
 #include <movit/util.h>
 #include <movit/white_balance_effect.h>
 #include <movit/ycbcr.h>
@@ -23,6 +24,7 @@
 #include <memory>
 
 #include "defs.h"
+#include "flags.h"
 #include "image_input.h"
 #include "mixer.h"
 
@@ -135,6 +137,7 @@ Effect *get_effect(lua_State *L, int idx)
            luaL_testudata(L, idx, "IntegralPaddingEffect") ||
            luaL_testudata(L, idx, "OverlayEffect") ||
            luaL_testudata(L, idx, "ResizeEffect") ||
+           luaL_testudata(L, idx, "MultiplyEffect") ||
            luaL_testudata(L, idx, "MixEffect") ||
            luaL_testudata(L, idx, "ImageInput")) {
                return *(Effect **)lua_touserdata(L, idx);
@@ -325,6 +328,12 @@ int ResizeEffect_new(lua_State* L)
        return wrap_lua_object_nonowned<ResizeEffect>(L, "ResizeEffect");
 }
 
+int MultiplyEffect_new(lua_State* L)
+{
+       assert(lua_gettop(L) == 0);
+       return wrap_lua_object_nonowned<MultiplyEffect>(L, "MultiplyEffect");
+}
+
 int MixEffect_new(lua_State* L)
 {
        assert(lua_gettop(L) == 0);
@@ -525,6 +534,15 @@ const luaL_Reg ResizeEffect_funcs[] = {
        { NULL, NULL }
 };
 
+const luaL_Reg MultiplyEffect_funcs[] = {
+       { "new", MultiplyEffect_new },
+       { "set_float", Effect_set_float },
+       { "set_int", Effect_set_int },
+       { "set_vec3", Effect_set_vec3 },
+       { "set_vec4", Effect_set_vec4 },
+       { NULL, NULL }
+};
+
 const luaL_Reg MixEffect_funcs[] = {
        { "new", MixEffect_new },
        { "set_float", Effect_set_float },
@@ -678,7 +696,7 @@ int call_num_channels(lua_State *L)
 }  // namespace
 
 Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_cards)
-       : resource_pool(resource_pool), num_cards(num_cards)
+       : resource_pool(resource_pool), num_cards(num_cards), signal_to_card_mapping(global_flags.default_stream_mapping)
 {
        L = luaL_newstate();
         luaL_openlibs(L);
@@ -692,6 +710,7 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_car
        register_class("IntegralPaddingEffect", IntegralPaddingEffect_funcs);
        register_class("OverlayEffect", OverlayEffect_funcs);
        register_class("ResizeEffect", ResizeEffect_funcs);
+       register_class("MultiplyEffect", MultiplyEffect_funcs);
        register_class("MixEffect", MixEffect_funcs);
        register_class("InputStateInfo", InputStateInfo_funcs);
 
@@ -743,7 +762,12 @@ Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned he
                exit(1);
        }
 
-       chain.chain = (EffectChain *)luaL_checkudata(L, -2, "EffectChain");
+       chain.chain = (EffectChain *)luaL_testudata(L, -2, "EffectChain");
+       if (chain.chain == nullptr) {
+               fprintf(stderr, "get_chain() for chain number %d did not return an EffectChain\n",
+                       num);
+               exit(1);
+       }
        if (!lua_isfunction(L, -1)) {
                fprintf(stderr, "Argument #-1 should be a function\n");
                exit(1);
@@ -787,11 +811,16 @@ string Theme::get_channel_name(unsigned channel)
                fprintf(stderr, "error running function `channel_name': %s\n", lua_tostring(L, -1));
                exit(1);
        }
+       const char *ret = lua_tostring(L, -1);
+       if (ret == nullptr) {
+               fprintf(stderr, "function `channel_name' returned nil for channel %d\n", channel);
+               exit(1);
+       }
 
-       string ret = lua_tostring(L, -1);
+       string retstr = ret;
        lua_pop(L, 1);
        assert(lua_gettop(L) == 0);
-       return ret;
+       return retstr;
 }
 
 int Theme::get_channel_signal(unsigned channel)
@@ -820,10 +849,16 @@ std::string Theme::get_channel_color(unsigned channel)
                exit(1);
        }
 
-       std::string ret = checkstdstring(L, -1);
+       const char *ret = lua_tostring(L, -1);
+       if (ret == nullptr) {
+               fprintf(stderr, "function `channel_color' returned nil for channel %d\n", channel);
+               exit(1);
+       }
+
+       string retstr = ret;
        lua_pop(L, 1);
        assert(lua_gettop(L) == 0);
-       return ret;
+       return retstr;
 }
 
 bool Theme::get_supports_set_wb(unsigned channel)