X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=fd3cbae4a058f9506a3b3d46aebb61dee8c6d96e;hb=8cbf100e6126c1550a6436970d777a652ac1182e;hp=2ae8276ae7ef3780885c54ccc5b1f390778390a4;hpb=6796837c2e3e08de8d530be233317a2fc4a43f72;p=nageru diff --git a/mixer.cpp b/mixer.cpp index 2ae8276..fd3cbae 100644 --- a/mixer.cpp +++ b/mixer.cpp @@ -58,94 +58,55 @@ Mixer::Mixer(const QSurfaceFormat &format) check_error(); resource_pool.reset(new ResourcePool); + theme.reset(new Theme("theme.lua", resource_pool.get())); output_channel[OUTPUT_LIVE].parent = this; output_channel[OUTPUT_PREVIEW].parent = this; + output_channel[OUTPUT_INPUT0].parent = this; + output_channel[OUTPUT_INPUT1].parent = this; ImageFormat inout_format; inout_format.color_space = COLORSPACE_sRGB; inout_format.gamma_curve = GAMMA_sRGB; - YCbCrFormat input_ycbcr_format; - input_ycbcr_format.chroma_subsampling_x = 2; - input_ycbcr_format.chroma_subsampling_y = 1; - input_ycbcr_format.cb_x_position = 0.0; - 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.full_range = false; - - YCbCrFormat output_ycbcr_format; - output_ycbcr_format.chroma_subsampling_x = 1; - output_ycbcr_format.chroma_subsampling_y = 1; - output_ycbcr_format.luma_coefficients = YCBCR_REC_601; - output_ycbcr_format.full_range = false; - - // Main chain. - chain.reset(new EffectChain(WIDTH, HEIGHT, resource_pool.get())); + // Display chain; shows the live output produced by the main chain (its RGBA version). + display_chain.reset(new EffectChain(WIDTH, HEIGHT, resource_pool.get())); check_error(); - input[0] = new YCbCrInput(inout_format, input_ycbcr_format, WIDTH, HEIGHT, YCBCR_INPUT_SPLIT_Y_AND_CBCR); - chain->add_input(input[0]); - input[1] = new YCbCrInput(inout_format, input_ycbcr_format, WIDTH, HEIGHT, YCBCR_INPUT_SPLIT_Y_AND_CBCR); - chain->add_input(input[1]); - resample_effect = chain->add_effect(new ResampleEffect(), input[0]); - padding_effect = chain->add_effect(new IntegralPaddingEffect()); - float border_color[] = { 0.0f, 0.0f, 0.0f, 1.0f }; - CHECK(padding_effect->set_vec4("border_color", border_color)); - - resample2_effect = chain->add_effect(new ResampleEffect(), input[1]); - Effect *saturation_effect = chain->add_effect(new SaturationEffect()); - CHECK(saturation_effect->set_float("saturation", 0.3f)); - Effect *wb_effect = chain->add_effect(new WhiteBalanceEffect()); - CHECK(wb_effect->set_float("output_color_temperature", 3500.0)); - padding2_effect = chain->add_effect(new IntegralPaddingEffect()); - - chain->add_effect(new OverlayEffect(), padding_effect, padding2_effect); - - chain->add_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); - chain->add_ycbcr_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED, output_ycbcr_format, YCBCR_OUTPUT_SPLIT_Y_AND_CBCR); - chain->set_dither_bits(8); - chain->set_output_origin(OUTPUT_ORIGIN_TOP_LEFT); - chain->finalize(); - - // Preview chain (always shows just first input for now). - preview_chain.reset(new EffectChain(WIDTH, HEIGHT, resource_pool.get())); - check_error(); - preview_input = new YCbCrInput(inout_format, input_ycbcr_format, WIDTH, HEIGHT, YCBCR_INPUT_SPLIT_Y_AND_CBCR); - preview_chain->add_input(preview_input); - preview_chain->add_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); - preview_chain->set_dither_bits(0); // Don't bother. - preview_chain->set_output_origin(OUTPUT_ORIGIN_TOP_LEFT); - preview_chain->finalize(); + display_input = new FlatInput(inout_format, FORMAT_RGB, GL_UNSIGNED_BYTE, WIDTH, HEIGHT); // FIXME: GL_UNSIGNED_BYTE is really wrong. + display_chain->add_input(display_input); + display_chain->add_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); + display_chain->set_dither_bits(0); // Don't bother. + display_chain->finalize(); h264_encoder.reset(new H264Encoder(h264_encoder_surface, WIDTH, HEIGHT, "test.mp4")); - printf("Configuring first card...\n"); - cards[0].usb = new BMUSBCapture(0x1edb, 0xbd3b); // 0xbd4f - cards[0].usb->set_frame_callback(std::bind(&Mixer::bm_frame, this, 0, _1, _2, _3, _4, _5, _6, _7)); - cards[0].frame_allocator.reset(new PBOFrameAllocator(1280 * 750 * 2 + 44, 1280, 720)); - cards[0].usb->set_video_frame_allocator(cards[0].frame_allocator.get()); - cards[0].usb->configure_card(); - cards[0].surface = create_surface(format); -#if NUM_CARDS == 2 - cards[1].surface = create_surface(format); -#endif - - if (NUM_CARDS == 2) { - printf("Configuring second card...\n"); - cards[1].usb = new BMUSBCapture(0x1edb, 0xbd4f); - cards[1].usb->set_frame_callback(std::bind(&Mixer::bm_frame, this, 1, _1, _2, _3, _4, _5, _6, _7)); - cards[1].frame_allocator.reset(new PBOFrameAllocator(1280 * 750 * 2 + 44, 1280, 720)); - cards[1].usb->set_video_frame_allocator(cards[1].frame_allocator.get()); - cards[1].usb->configure_card(); + for (int card_index = 0; card_index < NUM_CARDS; ++card_index) { + printf("Configuring card %d...\n", card_index); + CaptureCard *card = &cards[card_index]; + card->usb = new BMUSBCapture(0x1edb, card_index == 0 ? 0xbd3b : 0xbd4f); + card->usb->set_frame_callback(std::bind(&Mixer::bm_frame, this, card_index, _1, _2, _3, _4, _5, _6, _7)); + card->frame_allocator.reset(new PBOFrameAllocator(1280 * 750 * 2 + 44, 1280, 720)); + card->usb->set_video_frame_allocator(card->frame_allocator.get()); + card->surface = create_surface(format); + card->usb->set_dequeue_thread_callbacks( + [card]{ + eglBindAPI(EGL_OPENGL_API); + card->context = create_context(); + if (!make_current(card->context, card->surface)) { + printf("failed to create bmusb context\n"); + exit(1); + } + printf("inited!\n"); + }, + [this]{ + resource_pool->clean_context(); + }); + card->usb->configure_card(); } BMUSBCapture::start_bm_thread(); for (int card_index = 0; card_index < NUM_CARDS; ++card_index) { cards[card_index].usb->start_bm_capture(); - input[card_index]->set_pixel_data(0, nullptr, 0); - input[card_index]->set_pixel_data(1, nullptr, 0); } //chain->enable_phase_timing(true); @@ -168,6 +129,12 @@ Mixer::~Mixer() { resource_pool->release_glsl_program(cbcr_program_num); BMUSBCapture::stop_bm_thread(); + + for (int card_index = 0; card_index < NUM_CARDS; ++card_index) { + cards[card_index].new_data_ready = false; // Unblock thread. + cards[card_index].new_data_ready_changed.notify_all(); + cards[card_index].usb->stop_dequeue_thread(); + } } void Mixer::bm_frame(int card_index, uint16_t timecode, @@ -175,16 +142,6 @@ void Mixer::bm_frame(int card_index, uint16_t timecode, FrameAllocator::Frame audio_frame, size_t audio_offset, uint16_t audio_format) { CaptureCard *card = &cards[card_index]; - if (!card->thread_initialized) { - printf("initializing context for bmusb thread %d\n", card_index); - eglBindAPI(EGL_OPENGL_API); - card->context = create_context(); - if (!make_current(card->context, card->surface)) { - printf("failed to create bmusb context\n"); - exit(1); - } - card->thread_initialized = true; - } if (video_frame.len - video_offset != 1280 * 750 * 2) { printf("dropping frame with wrong length (%ld)\n", video_frame.len - video_offset); @@ -236,69 +193,7 @@ void Mixer::bm_frame(int card_index, uint16_t timecode, // Video frame will be released when last user of card->new_frame goes out of scope. card->usb->get_audio_frame_allocator()->release_frame(audio_frame); } - -void Mixer::place_rectangle(Effect *resample_effect, Effect *padding_effect, float x0, float y0, float x1, float y1) -{ - float srcx0 = 0.0f; - float srcx1 = 1.0f; - float srcy0 = 0.0f; - float srcy1 = 1.0f; - - // Cull. - if (x0 > 1280.0 || x1 < 0.0 || y0 > 720.0 || y1 < 0.0) { - CHECK(resample_effect->set_int("width", 1)); - CHECK(resample_effect->set_int("height", 1)); - CHECK(resample_effect->set_float("zoom_x", 1280.0)); - CHECK(resample_effect->set_float("zoom_y", 720.0)); - CHECK(padding_effect->set_int("left", 2000)); - CHECK(padding_effect->set_int("top", 2000)); - return; - } - // Clip. (TODO: Clip on upper/left sides, too.) - if (x1 > 1280.0) { - srcx1 = (1280.0 - x0) / (x1 - x0); - x1 = 1280.0; - } - if (y1 > 720.0) { - srcy1 = (720.0 - y0) / (y1 - y0); - y1 = 720.0; - } - - float x_subpixel_offset = x0 - floor(x0); - float y_subpixel_offset = y0 - floor(y0); - - // Resampling must be to an integral number of pixels. Round up, - // and then add an extra pixel so we have some leeway for the border. - int width = int(ceil(x1 - x0)) + 1; - int height = int(ceil(y1 - y0)) + 1; - CHECK(resample_effect->set_int("width", width)); - CHECK(resample_effect->set_int("height", height)); - - // Correct the discrepancy with zoom. (This will leave a small - // excess edge of pixels and subpixels, which we'll correct for soon.) - float zoom_x = (x1 - x0) / (width * (srcx1 - srcx0)); - float zoom_y = (y1 - y0) / (height * (srcy1 - srcy0)); - CHECK(resample_effect->set_float("zoom_x", zoom_x)); - CHECK(resample_effect->set_float("zoom_y", zoom_y)); - CHECK(resample_effect->set_float("zoom_center_x", 0.0f)); - CHECK(resample_effect->set_float("zoom_center_y", 0.0f)); - - // Padding must also be to a whole-pixel offset. - CHECK(padding_effect->set_int("left", floor(x0))); - CHECK(padding_effect->set_int("top", floor(y0))); - - // Correct _that_ discrepancy by subpixel offset in the resampling. - CHECK(resample_effect->set_float("left", -x_subpixel_offset / zoom_x)); - CHECK(resample_effect->set_float("top", -y_subpixel_offset / zoom_y)); - - // Finally, adjust the border so it is exactly where we want it. - CHECK(padding_effect->set_float("border_offset_left", x_subpixel_offset)); - CHECK(padding_effect->set_float("border_offset_right", x1 - (floor(x0) + width))); - CHECK(padding_effect->set_float("border_offset_top", y_subpixel_offset)); - CHECK(padding_effect->set_float("border_offset_bottom", y1 - (floor(y0) + height))); -} - void Mixer::thread_func() { eglBindAPI(EGL_OPENGL_API); @@ -314,65 +209,6 @@ void Mixer::thread_func() while (!should_quit) { ++frame; - //int width0 = lrintf(848 * (1.0 + 0.2 * sin(frame * 0.02))); - int width0 = 848; - int height0 = lrintf(width0 * 9.0 / 16.0); - - //float top0 = 96 + 48 * sin(frame * 0.005); - //float left0 = 96 + 48 * cos(frame * 0.006); - float top0 = 48; - float left0 = 16; - float bottom0 = top0 + height0; - float right0 = left0 + width0; - - int width1 = 384; - int height1 = 216; - - float bottom1 = 720 - 48; - float right1 = 1280 - 16; - float top1 = bottom1 - height1; - float left1 = right1 - width1; - - if (current_source == SOURCE_INPUT1) { - top0 = 0.0; - bottom0 = HEIGHT; - left0 = 0.0; - right0 = WIDTH; - - top1 = HEIGHT + 10; - bottom1 = HEIGHT + 20; - left1 = WIDTH + 10; - right1 = WIDTH + 20; - } else if (current_source == SOURCE_INPUT2) { - top1 = 0.0; - bottom1 = HEIGHT; - left1 = 0.0; - right1 = WIDTH; - - top0 = HEIGHT + 10; - bottom0 = HEIGHT + 20; - left0 = WIDTH + 10; - right0 = WIDTH + 20; - } else { - float t = 0.5 + 0.5 * cos(frame * 0.006); - float scale0 = 1.0 + t * (1280.0 / 848.0 - 1.0); - float tx0 = 0.0 + t * (-16.0 * scale0); - float ty0 = 0.0 + t * (-48.0 * scale0); - - top0 = top0 * scale0 + ty0; - bottom0 = bottom0 * scale0 + ty0; - left0 = left0 * scale0 + tx0; - right0 = right0 * scale0 + tx0; - - top1 = top1 * scale0 + ty0; - bottom1 = bottom1 * scale0 + ty0; - left1 = left1 * scale0 + tx0; - right1 = right1 * scale0 + tx0; - } - - place_rectangle(resample_effect, padding_effect, left0, top0, right0, bottom0); - place_rectangle(resample2_effect, padding2_effect, left1, top1, right1, bottom1); - CaptureCard card_copy[NUM_CARDS]; { @@ -398,6 +234,7 @@ void Mixer::thread_func() if (!card->new_data_ready) continue; + assert(card->new_frame != nullptr); bmusb_current_rendering_frame[card_index] = card->new_frame; check_error(); @@ -409,21 +246,14 @@ void Mixer::thread_func() glDeleteSync(card->new_data_ready_fence); check_error(); const PBOFrameAllocator::Userdata *userdata = (const PBOFrameAllocator::Userdata *)card->new_frame->userdata; - input[card_index]->set_texture_num(0, userdata->tex_y); - input[card_index]->set_texture_num(1, userdata->tex_cbcr); - - if (NUM_CARDS == 1) { - // Set to the other one, too. - input[1]->set_texture_num(0, userdata->tex_y); - input[1]->set_texture_num(1, userdata->tex_cbcr); - } - - if (card_index == 0) { - preview_input->set_texture_num(0, userdata->tex_y); - preview_input->set_texture_num(1, userdata->tex_cbcr); - } + theme->set_input_textures(card_index, userdata->tex_y, userdata->tex_cbcr); } + // Get the main chain from the theme, and set its state immediately. + pair> theme_main_chain = theme->get_chain(0, frame / 60.0f, WIDTH, HEIGHT); + EffectChain *chain = theme_main_chain.first; + theme_main_chain.second(); + GLuint y_tex, cbcr_tex; bool got_frame = h264_encoder->begin_frame(&y_tex, &cbcr_tex); assert(got_frame); @@ -438,11 +268,12 @@ void Mixer::thread_func() subsample_chroma(cbcr_full_tex, cbcr_tex); resource_pool->release_2d_texture(cbcr_full_tex); - // Render preview chain. - GLuint preview_rgba_tex = resource_pool->create_2d_texture(GL_RGB565, output_channel[OUTPUT_PREVIEW].width, output_channel[OUTPUT_PREVIEW].height); // Saves texture bandwidth, although dithering gets messed up. - fbo = resource_pool->create_fbo(preview_rgba_tex); - preview_chain->render_to_fbo(fbo, output_channel[OUTPUT_PREVIEW].width, output_channel[OUTPUT_PREVIEW].height); - resource_pool->release_fbo(fbo); + // Set the right state for rgba_tex. + glBindFramebuffer(GL_FRAMEBUFFER, 0); + glBindTexture(GL_TEXTURE_2D, rgba_tex); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); RefCountedGLsync fence(GL_SYNC_GPU_COMMANDS_COMPLETE, /*flags=*/0); check_error(); @@ -456,8 +287,29 @@ void Mixer::thread_func() } h264_encoder->end_frame(fence, input_frames); - output_channel[OUTPUT_LIVE].output_frame(rgba_tex, fence); - output_channel[OUTPUT_PREVIEW].output_frame(preview_rgba_tex, fence); + // The live frame just shows the RGBA texture we just rendered. + // It owns rgba_tex now. + DisplayFrame live_frame; + live_frame.chain = display_chain.get(); + live_frame.setup_chain = [this, rgba_tex]{ + display_input->set_texture_num(rgba_tex); + }; + live_frame.ready_fence = fence; + live_frame.input_frames = {}; + live_frame.temp_textures = { rgba_tex }; + output_channel[OUTPUT_LIVE].output_frame(live_frame); + + // Set up preview and any additional channels. + for (unsigned i = 1; i < theme->get_num_channels() + 2; ++i) { + DisplayFrame display_frame; + pair> chain = theme->get_chain(i, frame / 60.0f, WIDTH, HEIGHT); // FIXME: dimensions + display_frame.chain = chain.first; + display_frame.setup_chain = chain.second; + display_frame.ready_fence = fence; + display_frame.input_frames = { bmusb_current_rendering_frame[0], bmusb_current_rendering_frame[1] }; // FIXME: possible to do better? + display_frame.temp_textures = {}; + output_channel[i].output_frame(display_frame); + } clock_gettime(CLOCK_MONOTONIC, &now); double elapsed = now.tv_sec - start.tv_sec + @@ -479,6 +331,8 @@ void Mixer::thread_func() } check_error(); } + + resource_pool->clean_context(); } void Mixer::subsample_chroma(GLuint src_tex, GLuint dst_tex) @@ -537,9 +391,12 @@ void Mixer::subsample_chroma(GLuint src_tex, GLuint dst_tex) void Mixer::release_display_frame(DisplayFrame *frame) { - resource_pool->release_2d_texture(frame->texnum); - frame->texnum = 0; + for (GLuint texnum : frame->temp_textures) { + resource_pool->release_2d_texture(texnum); + } + frame->temp_textures.clear(); frame->ready_fence.reset(); + frame->input_frames.clear(); } void Mixer::start() @@ -553,12 +410,27 @@ void Mixer::quit() mixer_thread.join(); } -void Mixer::cut(Source source) +void Mixer::transition_clicked(int transition_num) +{ + theme->transition_clicked(transition_num, frame / 60.0); +} + +void Mixer::channel_clicked(int preview_num) +{ + theme->channel_clicked(preview_num); +} + +Mixer::OutputChannel::~OutputChannel() { - current_source = source; + if (has_current_frame) { + parent->release_display_frame(¤t_frame); + } + if (has_ready_frame) { + parent->release_display_frame(&ready_frame); + } } -void Mixer::OutputChannel::output_frame(GLuint tex, RefCountedGLsync fence) +void Mixer::OutputChannel::output_frame(DisplayFrame frame) { // Store this frame for display. Remove the ready frame if any // (it was seemingly never used). @@ -567,8 +439,7 @@ void Mixer::OutputChannel::output_frame(GLuint tex, RefCountedGLsync fence) if (has_ready_frame) { parent->release_display_frame(&ready_frame); } - ready_frame.texnum = tex; - ready_frame.ready_fence = fence; + ready_frame = frame; has_ready_frame = true; } @@ -593,6 +464,7 @@ bool Mixer::OutputChannel::get_display_frame(DisplayFrame *frame) assert(!has_current_frame); current_frame = ready_frame; ready_frame.ready_fence.reset(); // Drop the refcount. + ready_frame.input_frames.clear(); // Drop the refcounts. has_current_frame = true; has_ready_frame = false; } @@ -606,9 +478,3 @@ void Mixer::OutputChannel::set_frame_ready_callback(Mixer::new_frame_ready_callb new_frame_ready_callback = callback; has_new_frame_ready_callback = true; } - -void Mixer::OutputChannel::set_size(int width, int height) -{ - this->width = width; - this->height = height; -}