-#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
int EffectChain_add_live_input(lua_State* L)
{
- assert(lua_gettop(L) == 1);
+ assert(lua_gettop(L) == 2);
Theme *theme = get_theme_updata(L);
EffectChain *chain = (EffectChain *)luaL_checkudata(L, 1, "EffectChain");
- return wrap_lua_object<LiveInputWrapper>(L, "LiveInputWrapper", theme, chain);
+ bool override_bounce = checkbool(L, 2);
+ return wrap_lua_object<LiveInputWrapper>(L, "LiveInputWrapper", theme, chain, override_bounce);
}
int EffectChain_add_effect(lua_State* L)
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_sRGB;
+ 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 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;
+
+ // 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);
chain->set_dither_bits(8);
} // namespace
-LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain)
+LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain, bool override_bounce)
: theme(theme)
{
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
+ // according to Rec. 601, but practical testing indicates it definitely
+ // is Rec. 709 (at least up to errors attributable to rounding errors).
+ // Perhaps 601 was only to indicate the subsampling positions, not the
+ // colorspace itself? Tested with a Lenovo X1 gen 3 as input.
YCbCrFormat input_ycbcr_format;
input_ycbcr_format.chroma_subsampling_x = 2;
input_ycbcr_format.chroma_subsampling_y = 1;
input_ycbcr_format.cr_x_position = 0.0;
input_ycbcr_format.cb_y_position = 0.5;
input_ycbcr_format.cr_y_position = 0.5;
- input_ycbcr_format.luma_coefficients = YCBCR_REC_601;
+ input_ycbcr_format.luma_coefficients = YCBCR_REC_709;
input_ycbcr_format.full_range = false;
- input = new YCbCrInput(inout_format, input_ycbcr_format, WIDTH, HEIGHT, YCBCR_INPUT_SPLIT_Y_AND_CBCR);
+ if (override_bounce) {
+ input = new NonBouncingYCbCrInput(inout_format, input_ycbcr_format, WIDTH, HEIGHT, YCBCR_INPUT_SPLIT_Y_AND_CBCR);
+ } else {
+ input = new YCbCrInput(inout_format, input_ycbcr_format, WIDTH, HEIGHT, YCBCR_INPUT_SPLIT_Y_AND_CBCR);
+ }
chain->add_input(input);
}
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);
}
num_channels = luaL_checknumber(L, 1);
+ lua_pop(L, 1);
+ assert(lua_gettop(L) == 0);
}
void Theme::register_class(const char *class_name, const luaL_Reg *funcs)
{
+ assert(lua_gettop(L) == 0);
luaL_newmetatable(L, class_name);
lua_pushlightuserdata(L, this);
luaL_setfuncs(L, funcs, 1);
lua_pushvalue(L, -1);
lua_setfield(L, -2, "__index");
lua_setglobal(L, class_name);
+ assert(lua_gettop(L) == 0);
}
pair<EffectChain *, function<void()>>
Theme::get_chain(unsigned num, float t, unsigned width, unsigned height)
{
unique_lock<mutex> lock(m);
+ assert(lua_gettop(L) == 0);
lua_getglobal(L, "get_chain"); /* function to be called */
lua_pushnumber(L, num);
lua_pushnumber(L, t);
lua_pushvalue(L, -1);
int funcref = luaL_ref(L, LUA_REGISTRYINDEX); // TODO: leak!
lua_pop(L, 2);
+ assert(lua_gettop(L) == 0);
return make_pair(chain, [this, funcref]{
unique_lock<mutex> lock(m);
fprintf(stderr, "error running chain setup callback: %s\n", lua_tostring(L, -1));
exit(1);
}
+ assert(lua_gettop(L) == 0);
});
}
ret.push_back(lua_tostring(L, -1));
lua_pop(L, 1);
}
+ lua_pop(L, 1);
+ assert(lua_gettop(L) == 0);
return ret;
}
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);
}
fprintf(stderr, "error running function `transition_clicked': %s\n", lua_tostring(L, -1));
exit(1);
}
+ assert(lua_gettop(L) == 0);
}
void Theme::channel_clicked(int preview_num)
fprintf(stderr, "error running function `channel_clicked': %s\n", lua_tostring(L, -1));
exit(1);
}
+ assert(lua_gettop(L) == 0);
}
projects / nageru / blobdiff