X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.cpp;h=ed34faed2c9a1411ce7417c06da9ab68f5e1fd40;hb=fa54f2630c56a1df0046923d6a77b1bd58abf240;hp=ce1389f7cc4ea635ec0c2fbe4a295c8a8c3832fc;hpb=8cefe0ef1926be7931d4a9bbfed93ee6e85f3540;p=nageru diff --git a/theme.cpp b/theme.cpp index ce1389f..ed34fae 100644 --- a/theme.cpp +++ b/theme.cpp @@ -5,9 +5,11 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -26,11 +28,9 @@ #include #include "defs.h" -#include "deinterlace_effect.h" #include "ffmpeg_capture.h" #include "flags.h" #include "image_input.h" -#include "input.h" #include "input_state.h" #include "pbo_frame_allocator.h" @@ -222,7 +222,7 @@ int EffectChain_add_video_input(lua_State* L) // doesn't care about the object anymore. (If we change this, we'd need // to also unregister the signal connection on __gc.) int ret = wrap_lua_object_nonowned( - L, "LiveInputWrapper", theme, chain, bmusb::PixelFormat_8BitBGRA, + L, "LiveInputWrapper", theme, chain, (*capture)->get_current_pixel_format(), /*override_bounce=*/false, deinterlace); if (ret == 1) { Theme *theme = get_theme_updata(L); @@ -341,12 +341,21 @@ int ImageInput_new(lua_State* L) int VideoInput_new(lua_State* L) { - assert(lua_gettop(L) == 1); + assert(lua_gettop(L) == 2); string filename = checkstdstring(L, 1); + 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); + pixel_format = bmusb::PixelFormat_8BitYCbCrPlanar; + } int ret = wrap_lua_object_nonowned(L, "VideoInput", filename, global_flags.width, global_flags.height); if (ret == 1) { - Theme *theme = get_theme_updata(L); FFmpegCapture **capture = (FFmpegCapture **)lua_touserdata(L, -1); + (*capture)->set_pixel_format(bmusb::PixelFormat(pixel_format)); + + Theme *theme = get_theme_updata(L); theme->register_video_input(*capture); } return ret; @@ -766,12 +775,12 @@ void LiveInputWrapper::connect_signal(int signal_num) } signal_num = theme->map_signal(signal_num); - connect_signal_raw(signal_num); + connect_signal_raw(signal_num, *theme->input_state); } -void LiveInputWrapper::connect_signal_raw(int signal_num) +void LiveInputWrapper::connect_signal_raw(int signal_num, const InputState &input_state) { - BufferedFrame first_frame = theme->input_state->buffered_frames[signal_num][0]; + BufferedFrame first_frame = input_state.buffered_frames[signal_num][0]; if (first_frame.frame == nullptr) { // No data yet. return; @@ -783,10 +792,10 @@ void LiveInputWrapper::connect_signal_raw(int signal_num) height = userdata->last_height[first_frame.field_number]; } - movit::YCbCrLumaCoefficients ycbcr_coefficients = theme->input_state->ycbcr_coefficients[signal_num]; - bool full_range = theme->input_state->full_range[signal_num]; + movit::YCbCrLumaCoefficients ycbcr_coefficients = input_state.ycbcr_coefficients[signal_num]; + bool full_range = input_state.full_range[signal_num]; - if (theme->input_state->ycbcr_coefficients_auto[signal_num]) { + if (input_state.ycbcr_coefficients_auto[signal_num]) { full_range = false; // The Blackmagic driver docs claim that the device outputs Y'CbCr @@ -810,7 +819,7 @@ void LiveInputWrapper::connect_signal_raw(int signal_num) BufferedFrame last_good_frame = first_frame; for (unsigned i = 0; i < max(ycbcr_inputs.size(), rgba_inputs.size()); ++i) { - BufferedFrame frame = theme->input_state->buffered_frames[signal_num][i]; + BufferedFrame frame = input_state.buffered_frames[signal_num][i]; if (frame.frame == nullptr) { // Not enough data; reuse last frame (well, field). // This is suboptimal, but we have nothing better. @@ -862,7 +871,7 @@ void LiveInputWrapper::connect_signal_raw(int signal_num) } if (deinterlace) { - BufferedFrame frame = theme->input_state->buffered_frames[signal_num][0]; + BufferedFrame frame = input_state.buffered_frames[signal_num][0]; CHECK(deinterlace_effect->set_int("current_field_position", frame.field_number)); } } @@ -892,6 +901,7 @@ Theme::Theme(const string &filename, const vector &search_dirs, Resource L = luaL_newstate(); luaL_openlibs(L); + register_constants(); register_class("EffectChain", EffectChain_funcs); register_class("LiveInputWrapper", LiveInputWrapper_funcs); register_class("ImageInput", ImageInput_funcs); @@ -949,6 +959,26 @@ Theme::~Theme() lua_close(L); } +void Theme::register_constants() +{ + // Set Nageru.VIDEO_FORMAT_BGRA = bmusb::PixelFormat_8BitBGRA, etc. + const vector> constants = { + { "VIDEO_FORMAT_BGRA", bmusb::PixelFormat_8BitBGRA }, + { "VIDEO_FORMAT_YCBCR", bmusb::PixelFormat_8BitYCbCrPlanar }, + }; + + lua_newtable(L); // t = {} + + for (const pair &constant : constants) { + lua_pushstring(L, constant.first.c_str()); + lua_pushinteger(L, constant.second); + lua_settable(L, 1); // t[key] = value + } + + lua_setglobal(L, "Nageru"); // Nageru = t + assert(lua_gettop(L) == 0); +} + void Theme::register_class(const char *class_name, const luaL_Reg *funcs) { assert(lua_gettop(L) == 0); @@ -997,6 +1027,7 @@ Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned he chain.setup_chain = [this, funcref, input_state]{ unique_lock lock(m); + assert(this->input_state == nullptr); this->input_state = &input_state; // Set up state, including connecting signals. @@ -1006,6 +1037,8 @@ Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned he exit(1); } assert(lua_gettop(L) == 0); + + this->input_state = nullptr; }; // TODO: Can we do better, e.g. by running setup_chain() and seeing what it references?