}
}
-void ensure_texture_resolution(PBOFrameAllocator::Userdata *userdata, unsigned field, unsigned width, unsigned height, unsigned v210_width)
+void ensure_texture_resolution(PBOFrameAllocator::Userdata *userdata, unsigned field, unsigned width, unsigned height, unsigned cbcr_width, unsigned cbcr_height, unsigned v210_width)
{
bool first;
switch (userdata->pixel_format) {
- case bmusb::PixelFormat_10BitYCbCr:
+ case PixelFormat_10BitYCbCr:
first = userdata->tex_v210[field] == 0 || userdata->tex_444[field] == 0;
break;
- case bmusb::PixelFormat_8BitYCbCr:
+ case PixelFormat_8BitYCbCr:
first = userdata->tex_y[field] == 0 || userdata->tex_cbcr[field] == 0;
break;
- case bmusb::PixelFormat_8BitRGBA:
+ case PixelFormat_8BitBGRA:
first = userdata->tex_rgba[field] == 0;
break;
+ case PixelFormat_8BitYCbCrPlanar:
+ first = userdata->tex_y[field] == 0 || userdata->tex_cb[field] == 0 || userdata->tex_cr[field] == 0;
+ break;
default:
assert(false);
}
if (first ||
width != userdata->last_width[field] ||
- height != userdata->last_height[field]) {
+ height != userdata->last_height[field] ||
+ cbcr_width != userdata->last_cbcr_width[field] ||
+ cbcr_height != userdata->last_cbcr_height[field]) {
// We changed resolution since last use of this texture, so we need to create
// a new object. Note that this each card has its own PBOFrameAllocator,
// we don't need to worry about these flip-flopping between resolutions.
switch (userdata->pixel_format) {
- case bmusb::PixelFormat_10BitYCbCr:
+ case PixelFormat_10BitYCbCr:
glBindTexture(GL_TEXTURE_2D, userdata->tex_444[field]);
check_error();
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB10_A2, width, height, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, nullptr);
check_error();
break;
- case bmusb::PixelFormat_8BitYCbCr: {
- size_t cbcr_width = width / 2;
-
+ case PixelFormat_8BitYCbCr: {
glBindTexture(GL_TEXTURE_2D, userdata->tex_cbcr[field]);
check_error();
glTexImage2D(GL_TEXTURE_2D, 0, GL_RG8, cbcr_width, height, 0, GL_RG, GL_UNSIGNED_BYTE, nullptr);
check_error();
break;
}
- case bmusb::PixelFormat_8BitRGBA:
+ case PixelFormat_8BitYCbCrPlanar: {
+ glBindTexture(GL_TEXTURE_2D, userdata->tex_y[field]);
+ check_error();
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width, height, 0, GL_RED, GL_UNSIGNED_BYTE, nullptr);
+ check_error();
+ glBindTexture(GL_TEXTURE_2D, userdata->tex_cb[field]);
+ check_error();
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, cbcr_width, cbcr_height, 0, GL_RED, GL_UNSIGNED_BYTE, nullptr);
+ check_error();
+ glBindTexture(GL_TEXTURE_2D, userdata->tex_cr[field]);
+ check_error();
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, cbcr_width, cbcr_height, 0, GL_RED, GL_UNSIGNED_BYTE, nullptr);
+ check_error();
+ break;
+ }
+ case PixelFormat_8BitBGRA:
glBindTexture(GL_TEXTURE_2D, userdata->tex_rgba[field]);
check_error();
if (global_flags.can_disable_srgb_decoder) { // See the comments in tweaked_inputs.h.
- glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB8_ALPHA8, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB8_ALPHA8, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, nullptr);
} else {
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, nullptr);
}
check_error();
break;
}
userdata->last_width[field] = width;
userdata->last_height[field] = height;
+ userdata->last_cbcr_width[field] = cbcr_width;
+ userdata->last_cbcr_height[field] = cbcr_height;
}
if (global_flags.ten_bit_input &&
(first || v210_width != userdata->last_v210_width[field])) {
mixer_surface(create_surface(format)),
h264_encoder_surface(create_surface(format)),
decklink_output_surface(create_surface(format)),
+ ycbcr_interpretation(global_flags.ycbcr_interpretation),
audio_mixer(num_cards)
{
CHECK(init_movit(MOVIT_SHADER_DIR, MOVIT_DEBUG_OFF));
check_error();
// This nearly always should be true.
- global_flags.can_disable_srgb_decoder = epoxy_has_gl_extension("GL_EXT_texture_sRGB_decode");
+ global_flags.can_disable_srgb_decoder =
+ epoxy_has_gl_extension("GL_EXT_texture_sRGB_decode") &&
+ epoxy_has_gl_extension("GL_ARB_sampler_objects");
// Since we allow non-bouncing 4:2:2 YCbCrInputs, effective subpixel precision
// will be halved when sampling them, and we need to compensate here.
}
card->capture.reset(capture);
card->is_fake_capture = (card_type == CardType::FAKE_CAPTURE);
+ card->type = card_type;
if (card->output.get() != output) {
card->output.reset(output);
}
- bmusb::PixelFormat pixel_format;
+ PixelFormat pixel_format;
if (card_type == CardType::FFMPEG_INPUT) {
- pixel_format = bmusb::PixelFormat_8BitRGBA;
+ pixel_format = capture->get_current_pixel_format();
} else if (global_flags.ten_bit_input) {
pixel_format = PixelFormat_10BitYCbCr;
} else {
// Stop the fake card that we put into place.
// This needs to _not_ happen under the mutex, to avoid deadlock
// (delivering the last frame needs to take the mutex).
- bmusb::CaptureInterface *fake_capture = old_card->capture.get();
+ CaptureInterface *fake_capture = old_card->capture.get();
lock.unlock();
fake_capture->stop_dequeue_thread();
lock.lock();
}
if (card_index != -1) {
CaptureCard *card = &cards[card_index];
- bmusb::CaptureInterface *capture = card->capture.get();
+ CaptureInterface *capture = card->capture.get();
// TODO: DeckLinkCapture::stop_dequeue_thread can actually take
// several seconds to complete (blocking on DisableVideoInput);
// see if we can maybe do it asynchronously.
capture->stop_dequeue_thread();
lock.lock();
card->parked_capture = move(card->capture);
- bmusb::CaptureInterface *fake_capture = new FakeCapture(global_flags.width, global_flags.height, FAKE_FPS, OUTPUT_FREQUENCY, card_index, global_flags.fake_cards_audio);
+ CaptureInterface *fake_capture = new FakeCapture(global_flags.width, global_flags.height, FAKE_FPS, OUTPUT_FREQUENCY, card_index, global_flags.fake_cards_audio);
configure_card(card_index, fake_capture, CardType::FAKE_CAPTURE, card->output.release());
card->queue_length_policy.reset(card_index);
card->capture->start_bm_capture();
card->last_timecode = timecode;
+ PBOFrameAllocator::Userdata *userdata = (PBOFrameAllocator::Userdata *)video_frame.userdata;
+
+ size_t cbcr_width, cbcr_height, cbcr_offset, y_offset;
size_t expected_length = video_format.stride * (video_format.height + video_format.extra_lines_top + video_format.extra_lines_bottom);
+ if (userdata != nullptr && userdata->pixel_format == PixelFormat_8BitYCbCrPlanar) {
+ // The calculation above is wrong for planar Y'CbCr, so just override it.
+ assert(card->type == CardType::FFMPEG_INPUT);
+ assert(video_offset == 0);
+ expected_length = video_frame.len;
+
+ userdata->ycbcr_format = (static_cast<FFmpegCapture *>(card->capture.get()))->get_current_frame_ycbcr_format();
+ cbcr_width = video_format.width / userdata->ycbcr_format.chroma_subsampling_x;
+ cbcr_height = video_format.height / userdata->ycbcr_format.chroma_subsampling_y;
+ cbcr_offset = video_format.width * video_format.height;
+ y_offset = 0;
+ } else {
+ // All the other Y'CbCr formats are 4:2:2.
+ cbcr_width = video_format.width / 2;
+ cbcr_height = video_format.height;
+ cbcr_offset = video_offset / 2;
+ y_offset = video_frame.size / 2 + video_offset / 2;
+ }
if (video_frame.len - video_offset == 0 ||
video_frame.len - video_offset != expected_length) {
if (video_frame.len != 0) {
return;
}
- PBOFrameAllocator::Userdata *userdata = (PBOFrameAllocator::Userdata *)video_frame.userdata;
-
unsigned num_fields = video_format.interlaced ? 2 : 1;
steady_clock::time_point frame_upload_start;
bool interlaced_stride = false;
// a deinterlacer to actually get this right.
assert(video_format.height % 2 == 0);
video_format.height /= 2;
+ cbcr_height /= 2;
assert(frame_length % 2 == 0);
frame_length /= 2;
num_fields = 2;
RefCountedFrame frame(video_frame);
// Upload the textures.
- const size_t cbcr_width = video_format.width / 2;
- const size_t cbcr_offset = video_offset / 2;
- const size_t y_offset = video_frame.size / 2 + video_offset / 2;
-
for (unsigned field = 0; field < num_fields; ++field) {
// Put the actual texture upload in a lambda that is executed in the main thread.
// It is entirely possible to do this in the same thread (and it might even be
// Note that this means we must hold on to the actual frame data in <userdata>
// until the upload command is run, but we hold on to <frame> much longer than that
// (in fact, all the way until we no longer use the texture in rendering).
- auto upload_func = [this, field, video_format, y_offset, video_offset, cbcr_offset, cbcr_width, interlaced_stride, userdata]() {
+ auto upload_func = [this, field, video_format, y_offset, video_offset, cbcr_offset, cbcr_width, cbcr_height, interlaced_stride, userdata]() {
unsigned field_start_line;
if (field == 1) {
field_start_line = video_format.second_field_start;
// For anything not FRAME_FORMAT_YCBCR_10BIT, v210_width will be nonsensical but not used.
size_t v210_width = video_format.stride / sizeof(uint32_t);
- ensure_texture_resolution(userdata, field, video_format.width, video_format.height, v210_width);
+ ensure_texture_resolution(userdata, field, video_format.width, video_format.height, cbcr_width, cbcr_height, v210_width);
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, userdata->pbo);
check_error();
switch (userdata->pixel_format) {
- case bmusb::PixelFormat_10BitYCbCr: {
+ case PixelFormat_10BitYCbCr: {
size_t field_start = video_offset + video_format.stride * field_start_line;
upload_texture(userdata->tex_v210[field], v210_width, video_format.height, video_format.stride, interlaced_stride, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, field_start);
v210_converter->convert(userdata->tex_v210[field], userdata->tex_444[field], video_format.width, video_format.height);
break;
}
- case bmusb::PixelFormat_8BitYCbCr: {
+ case PixelFormat_8BitYCbCr: {
size_t field_y_start = y_offset + video_format.width * field_start_line;
size_t field_cbcr_start = cbcr_offset + cbcr_width * field_start_line * sizeof(uint16_t);
// Make up our own strides, since we are interleaving.
upload_texture(userdata->tex_y[field], video_format.width, video_format.height, video_format.width, interlaced_stride, GL_RED, GL_UNSIGNED_BYTE, field_y_start);
- upload_texture(userdata->tex_cbcr[field], cbcr_width, video_format.height, cbcr_width * sizeof(uint16_t), interlaced_stride, GL_RG, GL_UNSIGNED_BYTE, field_cbcr_start);
+ upload_texture(userdata->tex_cbcr[field], cbcr_width, cbcr_height, cbcr_width * sizeof(uint16_t), interlaced_stride, GL_RG, GL_UNSIGNED_BYTE, field_cbcr_start);
+ break;
+ }
+ case PixelFormat_8BitYCbCrPlanar: {
+ assert(field_start_line == 0); // We don't really support interlaced here.
+ size_t field_y_start = y_offset;
+ size_t field_cb_start = cbcr_offset;
+ size_t field_cr_start = cbcr_offset + cbcr_width * cbcr_height;
+
+ // Make up our own strides, since we are interleaving.
+ upload_texture(userdata->tex_y[field], video_format.width, video_format.height, video_format.width, interlaced_stride, GL_RED, GL_UNSIGNED_BYTE, field_y_start);
+ upload_texture(userdata->tex_cb[field], cbcr_width, cbcr_height, cbcr_width, interlaced_stride, GL_RED, GL_UNSIGNED_BYTE, field_cb_start);
+ upload_texture(userdata->tex_cr[field], cbcr_width, cbcr_height, cbcr_width, interlaced_stride, GL_RED, GL_UNSIGNED_BYTE, field_cr_start);
break;
}
- case bmusb::PixelFormat_8BitRGBA: {
+ case PixelFormat_8BitBGRA: {
size_t field_start = video_offset + video_format.stride * field_start_line;
- upload_texture(userdata->tex_rgba[field], video_format.width, video_format.height, video_format.stride, interlaced_stride, GL_RGBA, GL_UNSIGNED_BYTE, field_start);
+ upload_texture(userdata->tex_rgba[field], video_format.width, video_format.height, video_format.stride, interlaced_stride, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, field_start);
break;
}
default:
printf("Timecode: '%s'\n", timecode_text.c_str());
}
+ // Update Y'CbCr settings for all cards.
+ {
+ unique_lock<mutex> lock(card_mutex);
+ for (unsigned card_index = 0; card_index < num_cards; ++card_index) {
+ YCbCrInterpretation *interpretation = &ycbcr_interpretation[card_index];
+ input_state.ycbcr_coefficients_auto[card_index] = interpretation->ycbcr_coefficients_auto;
+ input_state.ycbcr_coefficients[card_index] = interpretation->ycbcr_coefficients;
+ input_state.full_range[card_index] = interpretation->full_range;
+ }
+ }
+
// Get the main chain from the theme, and set its state immediately.
Theme::Chain theme_main_chain = theme->get_chain(0, pts(), global_flags.width, global_flags.height, input_state);
EffectChain *chain = theme_main_chain.chain;
theme->channel_clicked(preview_num);
}
+YCbCrInterpretation Mixer::get_input_ycbcr_interpretation(unsigned card_index) const
+{
+ unique_lock<mutex> lock(card_mutex);
+ return ycbcr_interpretation[card_index];
+}
+
+void Mixer::set_input_ycbcr_interpretation(unsigned card_index, const YCbCrInterpretation &interpretation)
+{
+ unique_lock<mutex> lock(card_mutex);
+ ycbcr_interpretation[card_index] = interpretation;
+}
+
void Mixer::start_mode_scanning(unsigned card_index)
{
assert(card_index < num_cards);
last_mode_scan_change[card_index] = steady_clock::now();
}
-map<uint32_t, bmusb::VideoMode> Mixer::get_available_output_video_modes() const
+map<uint32_t, VideoMode> Mixer::get_available_output_video_modes() const
{
assert(desired_output_card_index != -1);
unique_lock<mutex> lock(card_mutex);
}
ready_frame = frame;
has_ready_frame = true;
- }
- if (new_frame_ready_callback) {
- new_frame_ready_callback();
+ // Call the callbacks under the mutex (they should be short),
+ // so that we don't race against a callback removal.
+ for (const auto &key_and_callback : new_frame_ready_callbacks) {
+ key_and_callback.second();
+ }
}
// Reduce the number of callbacks by filtering duplicates. The reason
return true;
}
-void Mixer::OutputChannel::set_frame_ready_callback(Mixer::new_frame_ready_callback_t callback)
+void Mixer::OutputChannel::add_frame_ready_callback(void *key, Mixer::new_frame_ready_callback_t callback)
{
- new_frame_ready_callback = callback;
+ unique_lock<mutex> lock(frame_mutex);
+ new_frame_ready_callbacks[key] = callback;
+}
+
+void Mixer::OutputChannel::remove_frame_ready_callback(void *key)
+{
+ unique_lock<mutex> lock(frame_mutex);
+ new_frame_ready_callbacks.erase(key);
}
void Mixer::OutputChannel::set_transition_names_updated_callback(Mixer::transition_names_updated_callback_t callback)