Update the commented-out phase timing code for some renamed variables.

[nageru] / theme.cpp

diff --git a/theme.cpp b/theme.cpp
index f7ec8e8b8db32fcd4890c93b56b583e28d046e4c..62e3640f509f2844df951df5db2b4e7476a8af1d 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -22,21 +22,20 @@
 #include <utility>
 #include <memory>
 
+#include "defs.h"
 #include "image_input.h"
+#include "mixer.h"
 
 namespace movit {
 class ResourcePool;
 }  // namespace movit
 
-#define WIDTH 1280  // FIXME
-#define HEIGHT 720  // FIXME
-
 using namespace std;
 using namespace movit;
 
-namespace {
+extern Mixer *global_mixer;
 
-vector<LiveInputWrapper *> live_inputs;
+namespace {
 
 class LuaRefWithDeleter {
 public:
@@ -443,7 +442,19 @@ LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain, bool overri
 
 void LiveInputWrapper::connect_signal(int signal_num)
 {
-       theme->connect_signal(input, signal_num);
+       if (global_mixer == nullptr) {
+               return;
+       }
+
+       signal_num = theme->map_signal(signal_num);
+
+       BufferedFrame frame = theme->input_state->buffered_frames[signal_num][0];
+       const PBOFrameAllocator::Userdata *userdata = (const PBOFrameAllocator::Userdata *)frame.frame->userdata;
+
+       input->set_texture_num(0, userdata->tex_y[frame.field_number]);
+       input->set_texture_num(1, userdata->tex_cbcr[frame.field_number]);
+       input->set_width(userdata->last_width[frame.field_number]);
+       input->set_height(userdata->last_height[frame.field_number]);
 }
 
 Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_cards)
@@ -497,9 +508,10 @@ void Theme::register_class(const char *class_name, const luaL_Reg *funcs)
        assert(lua_gettop(L) == 0);
 }
 
-pair<EffectChain *, function<void()>>
-Theme::get_chain(unsigned num, float t, unsigned width, unsigned height)
+Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned height, InputState input_state) 
 {
+       Chain chain;
+
        unique_lock<mutex> lock(m);
        assert(lua_gettop(L) == 0);
        lua_getglobal(L, "get_chain");  /* function to be called */
@@ -513,7 +525,7 @@ Theme::get_chain(unsigned num, float t, unsigned width, unsigned height)
                exit(1);
        }
 
-       EffectChain *chain = (EffectChain *)luaL_checkudata(L, -2, "EffectChain");
+       chain.chain = (EffectChain *)luaL_checkudata(L, -2, "EffectChain");
        if (!lua_isfunction(L, -1)) {
                fprintf(stderr, "Argument #-1 should be a function\n");
                exit(1);
@@ -522,9 +534,12 @@ Theme::get_chain(unsigned num, float t, unsigned width, unsigned height)
        shared_ptr<LuaRefWithDeleter> funcref(new LuaRefWithDeleter(&m, L, luaL_ref(L, LUA_REGISTRYINDEX)));
        lua_pop(L, 2);
        assert(lua_gettop(L) == 0);
-       return make_pair(chain, [this, funcref]{
+
+       chain.setup_chain = [this, funcref, input_state]{
                unique_lock<mutex> lock(m);
 
+               this->input_state = &input_state;
+
                // Set up state, including connecting signals.
                lua_rawgeti(L, LUA_REGISTRYINDEX, funcref->get());
                if (lua_pcall(L, 0, 0, 0) != 0) {
@@ -532,7 +547,17 @@ Theme::get_chain(unsigned num, float t, unsigned width, unsigned height)
                        exit(1);
                }
                assert(lua_gettop(L) == 0);
-       });
+       };
+
+       // TODO: Can we do better, e.g. by running setup_chain() and seeing what it references?
+       // Actually, setup_chain does maybe hold all the references we need now anyway?
+       for (unsigned card_index = 0; card_index < num_cards; ++card_index) {
+               for (unsigned frame_num = 0; frame_num < FRAME_HISTORY_LENGTH; ++frame_num) {
+                       chain.input_frames.push_back(input_state.buffered_frames[card_index][frame_num].frame);
+               }
+       }
+
+       return chain;
 }
 
 std::string Theme::get_channel_name(unsigned channel)
@@ -604,7 +629,7 @@ std::vector<std::string> Theme::get_transition_names(float t)
        return ret;
 }      
 
-void Theme::connect_signal(YCbCrInput *input, int signal_num)
+int Theme::map_signal(int signal_num)
 {
        if (signal_num >= int(num_cards)) {
                if (signals_warned_about.insert(signal_num).second) {
@@ -613,8 +638,7 @@ void Theme::connect_signal(YCbCrInput *input, int signal_num)
                }
                signal_num %= num_cards;
        }
-       input->set_texture_num(0, input_textures[signal_num].tex_y);
-       input->set_texture_num(1, input_textures[signal_num].tex_cbcr);
+       return signal_num;
 }
 
 void Theme::transition_clicked(int transition_num, float t)