Re-run IWYU, again with lots of manual cleanup.

[nageru] / theme.cpp

diff --git a/theme.cpp b/theme.cpp
index 5573c5562c0abce6cb651cfa1fb56690fa86f760..f32f637c03cb0aa683cece7d1fbaa4ed1cf60433 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -1,20 +1,29 @@
-#include <stdio.h>
+#include "theme.h"
+
+#include <assert.h>
+#include <lauxlib.h>
 #include <lua.h>
 #include <lualib.h>
-#include <lauxlib.h>
-#include <new>
-#include <utility>
-
+#include <movit/effect.h>
 #include <movit/effect_chain.h>
-#include <movit/ycbcr_input.h>
-#include <movit/white_balance_effect.h>
-#include <movit/resample_effect.h>
-#include <movit/padding_effect.h>
+#include <movit/image_format.h>
+#include <movit/mix_effect.h>
 #include <movit/overlay_effect.h>
+#include <movit/padding_effect.h>
+#include <movit/resample_effect.h>
 #include <movit/resize_effect.h>
-#include <movit/mix_effect.h>
+#include <movit/white_balance_effect.h>
+#include <movit/ycbcr.h>
+#include <movit/ycbcr_input.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <cstddef>
+#include <new>
+#include <utility>
 
-#include "theme.h"
+namespace movit {
+class ResourcePool;
+}  // namespace movit
 
 #define WIDTH 1280  // FIXME
 #define HEIGHT 720  // FIXME
@@ -128,15 +137,27 @@ int EffectChain_finalize(lua_State* L)
        // what's put in the H.264 stream (sps_rbsp()).
        ImageFormat inout_format;
        inout_format.color_space = COLORSPACE_REC_709;
-       inout_format.gamma_curve = GAMMA_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 in the end, but chroma subsampling
                // happens in a pass not run by Movit (see Mixer::subsample_chroma()).
                output_ycbcr_format.chroma_subsampling_x = 1;
                output_ycbcr_format.chroma_subsampling_y = 1;
-               output_ycbcr_format.luma_coefficients = YCBCR_REC_709;
-               output_ycbcr_format.full_range = true;
+
+               // Rec. 709 would be the sane thing to do, but it seems many players
+               // (e.g. MPlayer and VLC) just default to BT.601 coefficients no matter
+               // what (see discussions in e.g. https://trac.ffmpeg.org/ticket/4978).
+               // We _do_ set the right flags, though, so that a player that works
+               // properly doesn't have to guess.
+               output_ycbcr_format.luma_coefficients = YCBCR_REC_601;
+               output_ycbcr_format.full_range = false;
                output_ycbcr_format.num_levels = 256;
 
                chain->add_ycbcr_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED, output_ycbcr_format, YCBCR_OUTPUT_SPLIT_Y_AND_CBCR);
@@ -323,6 +344,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
@@ -353,8 +381,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);
@@ -464,6 +492,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);
 }