Add some primitive emergency card mapping. Useful for testing.

[nageru] / theme.cpp

diff --git a/theme.cpp b/theme.cpp
index 2c9af01cf69b36cc150d0f98c6140cefa814b650..2a84093cd6f37e915a5489e56ee6424d156ce70d 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -129,12 +129,10 @@ int EffectChain_finalize(lua_State* L)
        ImageFormat inout_format;
        inout_format.color_space = COLORSPACE_REC_709;
 
-       // Gamma curve depends on the input signal, and we don't really get any
-       // indications. A camera would be expected to do Rec. 709, but
-       // I haven't checked if any do in practice. However, computers _do_ output
-       // in sRGB gamma (ie., they don't convert from sRGB to Rec. 709), and
-       // I wouldn't really be surprised if most non-professional cameras do, too.
-       // So we pick sRGB as the least evil here.
+       // 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) {
@@ -337,6 +335,13 @@ LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain, bool overri
 {
        ImageFormat inout_format;
        inout_format.color_space = COLORSPACE_sRGB;
+
+       // Gamma curve depends on the input signal, and we don't really get any
+       // indications. A camera would be expected to do Rec. 709, but
+       // I haven't checked if any do in practice. However, computers _do_ output
+       // in sRGB gamma (ie., they don't convert from sRGB to Rec. 709), and
+       // I wouldn't really be surprised if most non-professional cameras do, too.
+       // So we pick sRGB as the least evil here.
        inout_format.gamma_curve = GAMMA_sRGB;
 
        // The Blackmagic driver docs claim that the device outputs Y'CbCr
@@ -367,8 +372,8 @@ void LiveInputWrapper::connect_signal(int signal_num)
        theme->connect_signal(input, signal_num);
 }
 
-Theme::Theme(const char *filename, ResourcePool *resource_pool)
-       : resource_pool(resource_pool)
+Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_cards)
+       : resource_pool(resource_pool), num_cards(num_cards)
 {
        L = luaL_newstate();
         luaL_openlibs(L);
@@ -478,6 +483,11 @@ std::vector<std::string> Theme::get_transition_names(float t)
 
 void Theme::connect_signal(YCbCrInput *input, int signal_num)
 {
+       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);
+               fprintf(stderr, "Mapping to card %d instead.\n", signal_num % num_cards);
+               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);
 }