X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Ftheme.cpp;h=71a59a24525a8c123da024212e40d9395f5d1769;hb=021fa9fa5ce103ae5843647fee3d5d1d7038d32f;hp=386a425fd024be011e1d4591f05b655db92007c8;hpb=b44bf7cfce6a5aaffbcd1e37df39068a163438ad;p=nageru diff --git a/nageru/theme.cpp b/nageru/theme.cpp index 386a425..71a59a2 100644 --- a/nageru/theme.cpp +++ b/nageru/theme.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -36,6 +37,7 @@ #include "flags.h" #include "image_input.h" #include "input_state.h" +#include "lua_utils.h" #include "pbo_frame_allocator.h" class Mixer; @@ -55,6 +57,20 @@ Theme *get_theme_updata(lua_State* L) return (Theme *)lua_touserdata(L, lua_upvalueindex(1)); } +void print_warning(lua_State* L, const char *format, ...) +{ + char buf[4096]; + va_list ap; + va_start(ap, format); + vsnprintf(buf, sizeof(buf), format, ap); + va_end(ap); + + lua_Debug ar; + lua_getstack(L, 1, &ar); + lua_getinfo(L, "nSl", &ar); + fprintf(stderr, "WARNING: %s:%d: %s", ar.source, ar.currentline, buf); +} + int ThemeMenu_set(lua_State *L) { Theme *theme = get_theme_updata(L); @@ -72,6 +88,8 @@ struct InputStateInfo { unsigned last_width[MAX_VIDEO_CARDS], last_height[MAX_VIDEO_CARDS]; bool last_interlaced[MAX_VIDEO_CARDS], last_has_signal[MAX_VIDEO_CARDS], last_is_connected[MAX_VIDEO_CARDS]; unsigned last_frame_rate_nom[MAX_VIDEO_CARDS], last_frame_rate_den[MAX_VIDEO_CARDS]; + bool has_last_subtitle[MAX_VIDEO_CARDS]; + std::string last_subtitle[MAX_VIDEO_CARDS]; }; InputStateInfo::InputStateInfo(const InputState &input_state) @@ -93,78 +111,101 @@ InputStateInfo::InputStateInfo(const InputState &input_state) last_is_connected[signal_num] = userdata->last_is_connected; last_frame_rate_nom[signal_num] = userdata->last_frame_rate_nom; last_frame_rate_den[signal_num] = userdata->last_frame_rate_den; + has_last_subtitle[signal_num] = userdata->has_last_subtitle; + last_subtitle[signal_num] = userdata->last_subtitle; } } -class LuaRefWithDeleter { -public: - LuaRefWithDeleter(mutex *m, lua_State *L, int ref) : m(m), L(L), ref(ref) {} - ~LuaRefWithDeleter() { - lock_guard lock(*m); - luaL_unref(L, LUA_REGISTRYINDEX, ref); - } - int get() const { return ref; } - -private: - LuaRefWithDeleter(const LuaRefWithDeleter &) = delete; - - mutex *m; - lua_State *L; - int ref; +enum EffectType { + WHITE_BALANCE_EFFECT, + RESAMPLE_EFFECT, + PADDING_EFFECT, + INTEGRAL_PADDING_EFFECT, + OVERLAY_EFFECT, + RESIZE_EFFECT, + MULTIPLY_EFFECT, + MIX_EFFECT, + LIFT_GAMMA_GAIN_EFFECT }; -template -int wrap_lua_object(lua_State* L, const char *class_name, Args&&... args) -{ - // Construct the C++ object and put it on the stack. - void *mem = lua_newuserdata(L, sizeof(T)); - new(mem) T(forward(args)...); - - // Look up the metatable named , and set it on the new object. - luaL_getmetatable(L, class_name); - lua_setmetatable(L, -2); - - return 1; +Effect *instantiate_effect(EffectChain *chain, EffectType effect_type) +{ + switch (effect_type) { + case WHITE_BALANCE_EFFECT: + return new WhiteBalanceEffect; + case RESAMPLE_EFFECT: + return new ResampleEffect; + case PADDING_EFFECT: + return new PaddingEffect; + case INTEGRAL_PADDING_EFFECT: + return new IntegralPaddingEffect; + case OVERLAY_EFFECT: + return new OverlayEffect; + case RESIZE_EFFECT: + return new ResizeEffect; + case MULTIPLY_EFFECT: + return new MultiplyEffect; + case MIX_EFFECT: + return new MixEffect; + case LIFT_GAMMA_GAIN_EFFECT: + return new LiftGammaGainEffect; + default: + fprintf(stderr, "Unhandled effect type %d\n", effect_type); + abort(); + } } -// Like wrap_lua_object, but the object is not owned by Lua; ie. it's not freed -// by Lua GC. This is typically the case for Effects, which are owned by EffectChain -// and expected to be destructed by it. The object will be of type T** instead of T* -// when exposed to Lua. -// -// Note that we currently leak if you allocate an Effect in this way and never call -// add_effect. We should see if there's a way to e.g. set __gc on it at construction time -// and then release that once add_effect() takes ownership. -template -int wrap_lua_object_nonowned(lua_State* L, const char *class_name, Args&&... args) -{ - // Construct the pointer ot the C++ object and put it on the stack. - T **obj = (T **)lua_newuserdata(L, sizeof(T *)); - *obj = new T(forward(args)...); +// An EffectBlueprint refers to an Effect before it's being added to the graph. +// It contains enough information to instantiate the effect, including any +// parameters that were set before it was added to the graph. Once it is +// instantiated, it forwards its calls on to the real Effect instead. +struct EffectBlueprint { + EffectBlueprint(EffectType effect_type) : effect_type(effect_type) {} - // Look up the metatable named , and set it on the new object. - luaL_getmetatable(L, class_name); - lua_setmetatable(L, -2); + EffectType effect_type; + map int_parameters; + map float_parameters; + map> vec3_parameters; + map> vec4_parameters; - return 1; -} + Effect *effect = nullptr; // Gets filled out when it's instantiated. +}; -Effect *get_effect(lua_State *L, int idx) +Effect *get_effect_from_blueprint(EffectChain *chain, lua_State *L, int idx) { - if (luaL_testudata(L, idx, "WhiteBalanceEffect") || - luaL_testudata(L, idx, "ResampleEffect") || - luaL_testudata(L, idx, "PaddingEffect") || - 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, "LiftGammaGainEffect") || - luaL_testudata(L, idx, "ImageInput")) { - return *(Effect **)lua_touserdata(L, idx); + EffectBlueprint *blueprint = *(EffectBlueprint **)luaL_checkudata(L, idx, "EffectBlueprint"); + if (blueprint->effect != nullptr) { + // NOTE: This will change in the future. + luaL_error(L, "An effect can currently only be added to one chain.\n"); } - luaL_error(L, "Error: Index #%d was not an Effect type\n", idx); - return nullptr; + + Effect *effect = instantiate_effect(chain, blueprint->effect_type); + + // Set the parameters that were deferred earlier. + for (const auto &kv : blueprint->int_parameters) { + if (!effect->set_int(kv.first, kv.second)) { + luaL_error(L, "Effect refused set_int(\"%s\", %d) (invalid key?)", kv.first.c_str(), kv.second); + } + } + for (const auto &kv : blueprint->float_parameters) { + if (!effect->set_float(kv.first, kv.second)) { + luaL_error(L, "Effect refused set_float(\"%s\", %f) (invalid key?)", kv.first.c_str(), kv.second); + } + } + for (const auto &kv : blueprint->vec3_parameters) { + if (!effect->set_vec3(kv.first, kv.second.data())) { + luaL_error(L, "Effect refused set_vec3(\"%s\", %f, %f, %f) (invalid key?)", kv.first.c_str(), + kv.second[0], kv.second[1], kv.second[2]); + } + } + for (const auto &kv : blueprint->vec4_parameters) { + if (!effect->set_vec4(kv.first, kv.second.data())) { + luaL_error(L, "Effect refused set_vec4(\"%s\", %f, %f, %f, %f) (invalid key?)", kv.first.c_str(), + kv.second[0], kv.second[1], kv.second[2], kv.second[3]); + } + } + blueprint->effect = effect; + return effect; } InputStateInfo *get_input_state_info(lua_State *L, int idx) @@ -189,6 +230,57 @@ string checkstdstring(lua_State *L, int index) return string(cstr, len); } +void add_outputs_and_finalize(EffectChain *chain, bool is_main_chain) +{ + // Add outputs as needed. + // NOTE: If you change any details about the output format, you will need to + // also update what's given to the muxer (HTTPD::Mux constructor) and + // what's put in the H.264 stream (sps_rbsp()). + ImageFormat inout_format; + inout_format.color_space = COLORSPACE_REC_709; + + // Output gamma is tricky. We should output Rec. 709 for TV, except that + // we expect to run with web players and others that don't really care and + // just output with no conversion. So that means we'll need to output sRGB, + // even though H.264 has no setting for that (we use “unspecified”). + inout_format.gamma_curve = GAMMA_sRGB; + + if (is_main_chain) { + YCbCrFormat output_ycbcr_format; + // We actually output 4:2:0 and/or 4:2:2 in the end, but chroma subsampling + // happens in a pass not run by Movit (see ChromaSubsampler::subsample_chroma()). + output_ycbcr_format.chroma_subsampling_x = 1; + output_ycbcr_format.chroma_subsampling_y = 1; + + // This will be overridden if HDMI/SDI output is in force. + if (global_flags.ycbcr_rec709_coefficients) { + output_ycbcr_format.luma_coefficients = YCBCR_REC_709; + } else { + output_ycbcr_format.luma_coefficients = YCBCR_REC_601; + } + + output_ycbcr_format.full_range = false; + output_ycbcr_format.num_levels = 1 << global_flags.x264_bit_depth; + + GLenum type = global_flags.x264_bit_depth > 8 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_BYTE; + + chain->add_ycbcr_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED, output_ycbcr_format, YCBCR_OUTPUT_SPLIT_Y_AND_CBCR, type); + + // If we're using zerocopy video encoding (so the destination + // Y texture is owned by VA-API and will be unavailable for + // display), add a copy, where we'll only be using the Y component. + if (global_flags.use_zerocopy) { + chain->add_ycbcr_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED, output_ycbcr_format, YCBCR_OUTPUT_INTERLEAVED, type); // Add a copy where we'll only be using the Y component. + } + chain->set_dither_bits(global_flags.x264_bit_depth > 8 ? 16 : 8); + chain->set_output_origin(OUTPUT_ORIGIN_TOP_LEFT); + } else { + chain->add_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); + } + + chain->finalize(); +} + int EffectChain_new(lua_State* L) { assert(lua_gettop(L) == 2); @@ -273,7 +365,12 @@ int EffectChain_add_effect(lua_State* L) EffectChain *chain = (EffectChain *)luaL_checkudata(L, 1, "EffectChain"); // TODO: Better error reporting. - Effect *effect = get_effect(L, 2); + Effect *effect; + if (luaL_testudata(L, 2, "ImageInput")) { + effect = *(ImageInput **)luaL_checkudata(L, 2, "ImageInput"); + } else { + effect = get_effect_from_blueprint(chain, L, 2); + } if (lua_gettop(L) == 2) { if (effect->num_inputs() == 0) { chain->add_input((Input *)effect); @@ -286,8 +383,13 @@ int EffectChain_add_effect(lua_State* L) if (luaL_testudata(L, idx, "LiveInputWrapper")) { LiveInputWrapper **input = (LiveInputWrapper **)lua_touserdata(L, idx); inputs.push_back((*input)->get_effect()); + } else if (luaL_testudata(L, idx, "ImageInput")) { + ImageInput *image = *(ImageInput **)luaL_checkudata(L, idx, "ImageInput"); + inputs.push_back(image); } else { - inputs.push_back(get_effect(L, idx)); + EffectBlueprint *blueprint = *(EffectBlueprint **)luaL_checkudata(L, idx, "EffectBlueprint"); + assert(blueprint->effect != nullptr); // Parent must be added to the graph. + inputs.push_back(blueprint->effect); } } chain->add_effect(effect, inputs); @@ -307,54 +409,7 @@ int EffectChain_finalize(lua_State* L) assert(lua_gettop(L) == 2); EffectChain *chain = (EffectChain *)luaL_checkudata(L, 1, "EffectChain"); bool is_main_chain = checkbool(L, 2); - - // Add outputs as needed. - // NOTE: If you change any details about the output format, you will need to - // also update what's given to the muxer (HTTPD::Mux constructor) and - // what's put in the H.264 stream (sps_rbsp()). - ImageFormat inout_format; - inout_format.color_space = COLORSPACE_REC_709; - - // Output gamma is tricky. We should output Rec. 709 for TV, except that - // we expect to run with web players and others that don't really care and - // just output with no conversion. So that means we'll need to output sRGB, - // even though H.264 has no setting for that (we use “unspecified”). - inout_format.gamma_curve = GAMMA_sRGB; - - if (is_main_chain) { - YCbCrFormat output_ycbcr_format; - // We actually output 4:2:0 and/or 4:2:2 in the end, but chroma subsampling - // happens in a pass not run by Movit (see ChromaSubsampler::subsample_chroma()). - output_ycbcr_format.chroma_subsampling_x = 1; - output_ycbcr_format.chroma_subsampling_y = 1; - - // This will be overridden if HDMI/SDI output is in force. - if (global_flags.ycbcr_rec709_coefficients) { - output_ycbcr_format.luma_coefficients = YCBCR_REC_709; - } else { - output_ycbcr_format.luma_coefficients = YCBCR_REC_601; - } - - output_ycbcr_format.full_range = false; - output_ycbcr_format.num_levels = 1 << global_flags.x264_bit_depth; - - GLenum type = global_flags.x264_bit_depth > 8 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_BYTE; - - chain->add_ycbcr_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED, output_ycbcr_format, YCBCR_OUTPUT_SPLIT_Y_AND_CBCR, type); - - // If we're using zerocopy video encoding (so the destination - // Y texture is owned by VA-API and will be unavailable for - // display), add a copy, where we'll only be using the Y component. - if (global_flags.use_zerocopy) { - chain->add_ycbcr_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED, output_ycbcr_format, YCBCR_OUTPUT_INTERLEAVED, type); // Add a copy where we'll only be using the Y component. - } - chain->set_dither_bits(global_flags.x264_bit_depth > 8 ? 16 : 8); - chain->set_output_origin(OUTPUT_ORIGIN_TOP_LEFT); - } else { - chain->add_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); - } - - chain->finalize(); + add_outputs_and_finalize(chain, is_main_chain); return 0; } @@ -365,11 +420,7 @@ int LiveInputWrapper_connect_signal(lua_State* L) int signal_num = luaL_checknumber(L, 2); bool success = (*input)->connect_signal(signal_num); if (!success) { - lua_Debug ar; - lua_getstack(L, 1, &ar); - lua_getinfo(L, "nSl", &ar); - fprintf(stderr, "ERROR: %s:%d: Calling connect_signal() on a video or HTML input. Ignoring.\n", - ar.source, ar.currentline); + print_warning(L, "Calling connect_signal() on a video or HTML input. Ignoring.\n"); } return 0; } @@ -388,8 +439,7 @@ int VideoInput_new(lua_State* L) int pixel_format = luaL_checknumber(L, 2); if (pixel_format != bmusb::PixelFormat_8BitYCbCrPlanar && pixel_format != bmusb::PixelFormat_8BitBGRA) { - fprintf(stderr, "WARNING: Invalid enum %d used for video format, choosing Y'CbCr.\n", - pixel_format); + print_warning(L, "Invalid enum %d used for video format, choosing Y'CbCr.\n", pixel_format); pixel_format = bmusb::PixelFormat_8BitYCbCrPlanar; } int ret = wrap_lua_object_nonowned(L, "VideoInput", filename, global_flags.width, global_flags.height); @@ -451,7 +501,7 @@ int HTMLInput_new(lua_State* L) #else fprintf(stderr, "This version of Nageru has been compiled without CEF support.\n"); fprintf(stderr, "HTMLInput is not available.\n"); - exit(1); + abort(); #endif } @@ -513,55 +563,55 @@ int HTMLInput_get_signal_num(lua_State* L) int WhiteBalanceEffect_new(lua_State* L) { assert(lua_gettop(L) == 0); - return wrap_lua_object_nonowned(L, "WhiteBalanceEffect"); + return wrap_lua_object_nonowned(L, "EffectBlueprint", WHITE_BALANCE_EFFECT); } int ResampleEffect_new(lua_State* L) { assert(lua_gettop(L) == 0); - return wrap_lua_object_nonowned(L, "ResampleEffect"); + return wrap_lua_object_nonowned(L, "EffectBlueprint", RESAMPLE_EFFECT); } int PaddingEffect_new(lua_State* L) { assert(lua_gettop(L) == 0); - return wrap_lua_object_nonowned(L, "PaddingEffect"); + return wrap_lua_object_nonowned(L, "EffectBlueprint", PADDING_EFFECT); } int IntegralPaddingEffect_new(lua_State* L) { assert(lua_gettop(L) == 0); - return wrap_lua_object_nonowned(L, "IntegralPaddingEffect"); + return wrap_lua_object_nonowned(L, "EffectBlueprint", INTEGRAL_PADDING_EFFECT); } int OverlayEffect_new(lua_State* L) { assert(lua_gettop(L) == 0); - return wrap_lua_object_nonowned(L, "OverlayEffect"); + return wrap_lua_object_nonowned(L, "EffectBlueprint", OVERLAY_EFFECT); } int ResizeEffect_new(lua_State* L) { assert(lua_gettop(L) == 0); - return wrap_lua_object_nonowned(L, "ResizeEffect"); + return wrap_lua_object_nonowned(L, "EffectBlueprint", RESIZE_EFFECT); } int MultiplyEffect_new(lua_State* L) { assert(lua_gettop(L) == 0); - return wrap_lua_object_nonowned(L, "MultiplyEffect"); + return wrap_lua_object_nonowned(L, "EffectBlueprint", MULTIPLY_EFFECT); } int MixEffect_new(lua_State* L) { assert(lua_gettop(L) == 0); - return wrap_lua_object_nonowned(L, "MixEffect"); + return wrap_lua_object_nonowned(L, "EffectBlueprint", MIX_EFFECT); } int LiftGammaGainEffect_new(lua_State* L) { assert(lua_gettop(L) == 0); - return wrap_lua_object_nonowned(L, "LiftGammaGainEffect"); + return wrap_lua_object_nonowned(L, "EffectBlueprint", LIFT_GAMMA_GAIN_EFFECT); } int InputStateInfo_get_width(lua_State* L) @@ -634,63 +684,108 @@ int InputStateInfo_get_frame_rate_den(lua_State* L) return 1; } -int Effect_set_float(lua_State *L) +int InputStateInfo_get_last_subtitle(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)); + if (!input_state_info->has_last_subtitle[signal_num]) { + lua_pushnil(L); + } else { + lua_pushstring(L, input_state_info->last_subtitle[signal_num].c_str()); + } + return 1; +} + +int EffectBlueprint_set_int(lua_State *L) { assert(lua_gettop(L) == 3); - Effect *effect = (Effect *)get_effect(L, 1); + EffectBlueprint *blueprint = *(EffectBlueprint **)luaL_checkudata(L, 1, "EffectBlueprint"); string key = checkstdstring(L, 2); float value = luaL_checknumber(L, 3); - if (!effect->set_float(key, value)) { - luaL_error(L, "Effect refused set_float(\"%s\", %d) (invalid key?)", key.c_str(), int(value)); + if (blueprint->effect != nullptr) { + if (!blueprint->effect->set_int(key, value)) { + luaL_error(L, "Effect refused set_int(\"%s\", %d) (invalid key?)", key.c_str(), int(value)); + } + } else { + // TODO: check validity already here, if possible? + blueprint->int_parameters[key] = value; } return 0; } -int Effect_set_int(lua_State *L) +int EffectBlueprint_set_float(lua_State *L) { assert(lua_gettop(L) == 3); - Effect *effect = (Effect *)get_effect(L, 1); + EffectBlueprint *blueprint = *(EffectBlueprint **)luaL_checkudata(L, 1, "EffectBlueprint"); string key = checkstdstring(L, 2); float value = luaL_checknumber(L, 3); - if (!effect->set_int(key, value)) { - luaL_error(L, "Effect refused set_int(\"%s\", %d) (invalid key?)", key.c_str(), int(value)); + if (blueprint->effect != nullptr) { + if (!blueprint->effect->set_float(key, value)) { + luaL_error(L, "Effect refused set_float(\"%s\", %d) (invalid key?)", key.c_str(), int(value)); + } + } else { + // TODO: check validity already here, if possible? + blueprint->float_parameters[key] = value; } return 0; } -int Effect_set_vec3(lua_State *L) +int EffectBlueprint_set_vec3(lua_State *L) { assert(lua_gettop(L) == 5); - Effect *effect = (Effect *)get_effect(L, 1); + EffectBlueprint *blueprint = *(EffectBlueprint **)luaL_checkudata(L, 1, "EffectBlueprint"); string key = checkstdstring(L, 2); - float v[3]; + array v; v[0] = luaL_checknumber(L, 3); v[1] = luaL_checknumber(L, 4); v[2] = luaL_checknumber(L, 5); - if (!effect->set_vec3(key, v)) { - luaL_error(L, "Effect refused set_vec3(\"%s\", %f, %f, %f) (invalid key?)", key.c_str(), - v[0], v[1], v[2]); + + if (blueprint->effect != nullptr) { + if (!blueprint->effect->set_vec3(key, v.data())) { + luaL_error(L, "Effect refused set_vec3(\"%s\", %f, %f, %f) (invalid key?)", key.c_str(), + v[0], v[1], v[2]); + } + } else { + // TODO: check validity already here, if possible? + blueprint->vec3_parameters[key] = v; } + return 0; } -int Effect_set_vec4(lua_State *L) +int EffectBlueprint_set_vec4(lua_State *L) { assert(lua_gettop(L) == 6); - Effect *effect = (Effect *)get_effect(L, 1); + EffectBlueprint *blueprint = *(EffectBlueprint **)luaL_checkudata(L, 1, "EffectBlueprint"); string key = checkstdstring(L, 2); - float v[4]; + array v; v[0] = luaL_checknumber(L, 3); v[1] = luaL_checknumber(L, 4); v[2] = luaL_checknumber(L, 5); v[3] = luaL_checknumber(L, 6); - if (!effect->set_vec4(key, v)) { - luaL_error(L, "Effect refused set_vec4(\"%s\", %f, %f, %f, %f) (invalid key?)", key.c_str(), - v[0], v[1], v[2], v[3]); + if (blueprint->effect != nullptr) { + if (!blueprint->effect->set_vec4(key, v.data())) { + luaL_error(L, "Effect refused set_vec4(\"%s\", %f, %f, %f, %f) (invalid key?)", key.c_str(), + v[0], v[1], v[2], v[3]); + } + } else { + // TODO: check validity already here, if possible? + blueprint->vec4_parameters[key] = v; } return 0; } +const luaL_Reg EffectBlueprint_funcs[] = { + // NOTE: No new() function; that's for the individual effects. + { "set_int", EffectBlueprint_set_int }, + { "set_float", EffectBlueprint_set_float }, + { "set_vec3", EffectBlueprint_set_vec3 }, + { "set_vec4", EffectBlueprint_set_vec4 }, + { NULL, NULL } +}; + const luaL_Reg EffectChain_funcs[] = { { "new", EffectChain_new }, { "__gc", EffectChain_gc }, @@ -711,10 +806,6 @@ const luaL_Reg LiveInputWrapper_funcs[] = { const luaL_Reg ImageInput_funcs[] = { { "new", ImageInput_new }, - { "set_float", Effect_set_float }, - { "set_int", Effect_set_int }, - { "set_vec3", Effect_set_vec3 }, - { "set_vec4", Effect_set_vec4 }, { NULL, NULL } }; @@ -740,87 +831,57 @@ const luaL_Reg HTMLInput_funcs[] = { { NULL, NULL } }; +// Effects. +// All of these are solely for new(); the returned metatable will be that of +// EffectBlueprint, and Effect (returned from add_effect()) is its own type. + const luaL_Reg WhiteBalanceEffect_funcs[] = { { "new", WhiteBalanceEffect_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 ResampleEffect_funcs[] = { { "new", ResampleEffect_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 PaddingEffect_funcs[] = { { "new", PaddingEffect_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 IntegralPaddingEffect_funcs[] = { { "new", IntegralPaddingEffect_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 OverlayEffect_funcs[] = { { "new", OverlayEffect_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 ResizeEffect_funcs[] = { { "new", ResizeEffect_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 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 }, - { "set_int", Effect_set_int }, - { "set_vec3", Effect_set_vec3 }, - { "set_vec4", Effect_set_vec4 }, { NULL, NULL } }; const luaL_Reg LiftGammaGainEffect_funcs[] = { { "new", LiftGammaGainEffect_new }, - { "set_float", Effect_set_float }, - { "set_int", Effect_set_int }, - { "set_vec3", Effect_set_vec3 }, - { "set_vec4", Effect_set_vec4 }, { NULL, NULL } }; +// End of effects. + const luaL_Reg InputStateInfo_funcs[] = { { "get_width", InputStateInfo_get_width }, { "get_height", InputStateInfo_get_height }, @@ -829,6 +890,7 @@ const luaL_Reg InputStateInfo_funcs[] = { { "get_is_connected", InputStateInfo_get_is_connected }, { "get_frame_rate_nom", InputStateInfo_get_frame_rate_nom }, { "get_frame_rate_den", InputStateInfo_get_frame_rate_den }, + { "get_last_subtitle", InputStateInfo_get_last_subtitle }, { NULL, NULL } }; @@ -882,11 +944,7 @@ LiveInputWrapper::LiveInputWrapper( for (unsigned i = 0; i < num_inputs; ++i) { // We upload our textures ourselves, and Movit swaps // R and B in the shader if we specify BGRA, so lie and say RGBA. - if (global_flags.can_disable_srgb_decoder) { - rgba_inputs.push_back(new sRGBSwitchingFlatInput(inout_format, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, GL_UNSIGNED_BYTE, global_flags.width, global_flags.height)); - } else { - rgba_inputs.push_back(new NonsRGBCapableFlatInput(inout_format, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, GL_UNSIGNED_BYTE, global_flags.width, global_flags.height)); - } + rgba_inputs.push_back(new sRGBSwitchingFlatInput(inout_format, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, GL_UNSIGNED_BYTE, global_flags.width, global_flags.height)); chain->add_input(rgba_inputs.back()); } @@ -1060,7 +1118,7 @@ int call_num_channels(lua_State *L) if (lua_pcall(L, 0, 1, 0) != 0) { fprintf(stderr, "error running function `num_channels': %s\n", lua_tostring(L, -1)); - exit(1); + abort(); } int num_channels = luaL_checknumber(L, 1); @@ -1123,7 +1181,7 @@ Theme::Theme(const string &filename, const vector &search_dirs, Resource for (const string &error : errors) { fprintf(stderr, "%s\n", error.c_str()); } - exit(1); + abort(); } assert(lua_gettop(L) == 0); @@ -1142,6 +1200,7 @@ Theme::Theme(const string &filename, const vector &search_dirs, Resource // Set up the API we provide. register_constants(); + register_class("EffectBlueprint", EffectBlueprint_funcs); register_class("EffectChain", EffectChain_funcs); register_class("LiveInputWrapper", LiveInputWrapper_funcs); register_class("ImageInput", ImageInput_funcs); @@ -1164,7 +1223,7 @@ Theme::Theme(const string &filename, const vector &search_dirs, Resource luaL_unref(L, LUA_REGISTRYINDEX, theme_code_ref); if (lua_pcall(L, 0, 0, 0)) { fprintf(stderr, "Error when running %s: %s\n", path.c_str(), lua_tostring(L, -1)); - exit(1); + abort(); } assert(lua_gettop(L) == 0); @@ -1232,19 +1291,19 @@ Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned he if (lua_pcall(L, 5, 2, 0) != 0) { fprintf(stderr, "error running function `get_chain': %s\n", lua_tostring(L, -1)); - exit(1); + abort(); } EffectChain *effect_chain = (EffectChain *)luaL_testudata(L, -2, "EffectChain"); if (effect_chain == nullptr) { fprintf(stderr, "get_chain() for chain number %d did not return an EffectChain\n", num); - exit(1); + abort(); } chain.chain = effect_chain; if (!lua_isfunction(L, -1)) { fprintf(stderr, "Argument #-1 should be a function\n"); - exit(1); + abort(); } lua_pushvalue(L, -1); shared_ptr funcref(new LuaRefWithDeleter(&m, L, luaL_ref(L, LUA_REGISTRYINDEX))); @@ -1261,8 +1320,8 @@ Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned he lua_rawgeti(L, LUA_REGISTRYINDEX, funcref->get()); if (lua_pcall(L, 0, 0, 0) != 0) { fprintf(stderr, "error running chain setup callback: %s\n", lua_tostring(L, -1)); - exit(1); - } + abort(); + } assert(lua_gettop(L) == 0); // The theme can't (or at least shouldn't!) call connect_signal() on @@ -1302,12 +1361,12 @@ string Theme::get_channel_name(unsigned channel) lua_pushnumber(L, channel); if (lua_pcall(L, 1, 1, 0) != 0) { fprintf(stderr, "error running function `channel_name': %s\n", lua_tostring(L, -1)); - exit(1); + abort(); } const char *ret = lua_tostring(L, -1); if (ret == nullptr) { fprintf(stderr, "function `channel_name' returned nil for channel %d\n", channel); - exit(1); + abort(); } string retstr = ret; @@ -1323,7 +1382,7 @@ int Theme::get_channel_signal(unsigned channel) lua_pushnumber(L, channel); if (lua_pcall(L, 1, 1, 0) != 0) { fprintf(stderr, "error running function `channel_signal': %s\n", lua_tostring(L, -1)); - exit(1); + abort(); } int ret = luaL_checknumber(L, 1); @@ -1339,13 +1398,13 @@ std::string Theme::get_channel_color(unsigned channel) lua_pushnumber(L, channel); if (lua_pcall(L, 1, 1, 0) != 0) { fprintf(stderr, "error running function `channel_color': %s\n", lua_tostring(L, -1)); - exit(1); + abort(); } const char *ret = lua_tostring(L, -1); if (ret == nullptr) { fprintf(stderr, "function `channel_color' returned nil for channel %d\n", channel); - exit(1); + abort(); } string retstr = ret; @@ -1361,7 +1420,7 @@ bool Theme::get_supports_set_wb(unsigned channel) lua_pushnumber(L, channel); if (lua_pcall(L, 1, 1, 0) != 0) { fprintf(stderr, "error running function `supports_set_wb': %s\n", lua_tostring(L, -1)); - exit(1); + abort(); } bool ret = checkbool(L, -1); @@ -1380,7 +1439,7 @@ void Theme::set_wb(unsigned channel, double r, double g, double b) lua_pushnumber(L, b); if (lua_pcall(L, 4, 0, 0) != 0) { fprintf(stderr, "error running function `set_wb': %s\n", lua_tostring(L, -1)); - exit(1); + abort(); } assert(lua_gettop(L) == 0); @@ -1393,7 +1452,7 @@ vector Theme::get_transition_names(float t) lua_pushnumber(L, t); if (lua_pcall(L, 1, 1, 0) != 0) { fprintf(stderr, "error running function `get_transitions': %s\n", lua_tostring(L, -1)); - exit(1); + abort(); } vector ret; @@ -1405,7 +1464,7 @@ vector Theme::get_transition_names(float t) lua_pop(L, 1); assert(lua_gettop(L) == 0); return ret; -} +} int Theme::map_signal(int signal_num) { @@ -1427,14 +1486,14 @@ int Theme::map_signal(int signal_num) ++card_index; } if (signal_num >= int(num_cards - 1)) { - fprintf(stderr, "WARNING: Theme asked for input %d, but we only have %u input card(s) (card %d is busy with output).\n", + print_warning(L, "Theme asked for input %d, but we only have %u input card(s) (card %d is busy with output).\n", signal_num, num_cards - 1, global_flags.output_card); fprintf(stderr, "Mapping to card %d instead.\n", card_index); } } else { card_index = signal_num % num_cards; if (signal_num >= int(num_cards)) { - fprintf(stderr, "WARNING: Theme asked for input %d, but we only have %u card(s).\n", signal_num, num_cards); + print_warning(L, "Theme asked for input %d, but we only have %u card(s).\n", signal_num, num_cards); fprintf(stderr, "Mapping to card %d instead.\n", card_index); } } @@ -1458,7 +1517,7 @@ void Theme::transition_clicked(int transition_num, float t) if (lua_pcall(L, 2, 0, 0) != 0) { fprintf(stderr, "error running function `transition_clicked': %s\n", lua_tostring(L, -1)); - exit(1); + abort(); } assert(lua_gettop(L) == 0); } @@ -1471,7 +1530,7 @@ void Theme::channel_clicked(int preview_num) if (lua_pcall(L, 1, 0, 0) != 0) { fprintf(stderr, "error running function `channel_clicked': %s\n", lua_tostring(L, -1)); - exit(1); + abort(); } assert(lua_gettop(L) == 0); } @@ -1511,6 +1570,6 @@ void Theme::theme_menu_entry_clicked(int lua_ref) lua_rawgeti(L, LUA_REGISTRYINDEX, lua_ref); if (lua_pcall(L, 0, 0, 0) != 0) { fprintf(stderr, "error running menu callback: %s\n", lua_tostring(L, -1)); - exit(1); + abort(); } }