X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=3dc8a4c3e5c3630965106755c38f6e4a1373c865;hb=e45ebd282e3c6c369475ef0987945eca62ef8f58;hp=5325437e0fddaa56d3044ad206b144340f696eee;hpb=9a25a535177c2752f3e712f32b5ce6ebe9d9d9c4;p=nageru diff --git a/mixer.cpp b/mixer.cpp index 5325437..3dc8a4c 100644 --- a/mixer.cpp +++ b/mixer.cpp @@ -114,16 +114,20 @@ string generate_local_dump_filename(int frame) void QueueLengthPolicy::update_policy(int queue_length) { if (queue_length < 0) { // Starvation. - if (safe_queue_length < 5) { + if (been_at_safe_point_since_last_starvation && safe_queue_length < 5) { ++safe_queue_length; fprintf(stderr, "Card %u: Starvation, increasing safe limit to %u frames\n", card_index, safe_queue_length); } frames_with_at_least_one = 0; + been_at_safe_point_since_last_starvation = false; return; } if (queue_length > 0) { - if (++frames_with_at_least_one >= 50) { + if (queue_length >= int(safe_queue_length)) { + been_at_safe_point_since_last_starvation = true; + } + if (++frames_with_at_least_one >= 50 && safe_queue_length > 0) { --safe_queue_length; fprintf(stderr, "Card %u: Spare frames for more than 50 frames, reducing safe limit to %u frames\n", card_index, safe_queue_length); @@ -144,7 +148,6 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) limiter(OUTPUT_FREQUENCY), compressor(OUTPUT_FREQUENCY) { - httpd.open_output_file(generate_local_dump_filename(/*frame=*/0).c_str()); httpd.start(9095); CHECK(init_movit(MOVIT_SHADER_DIR, MOVIT_DEBUG_OFF)); @@ -155,7 +158,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) movit_texel_subpixel_precision /= 2.0; resource_pool.reset(new ResourcePool); - theme.reset(new Theme("theme.lua", resource_pool.get(), num_cards)); + theme.reset(new Theme(global_flags.theme_filename.c_str(), resource_pool.get(), num_cards)); for (unsigned i = 0; i < NUM_OUTPUTS; ++i) { output_channel[i].parent = this; } @@ -174,6 +177,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) display_chain->finalize(); h264_encoder.reset(new H264Encoder(h264_encoder_surface, global_flags.va_display, WIDTH, HEIGHT, &httpd)); + h264_encoder->open_output_file(generate_local_dump_filename(/*frame=*/0).c_str()); // First try initializing the PCI devices, then USB, until we have the desired number of cards. unsigned num_pci_devices = 0, num_usb_devices = 0; @@ -257,6 +261,14 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) locut.init(FILTER_HPF, 2); + // If --flat-audio is given, turn off everything that messes with the sound, + // except the final makeup gain. + if (global_flags.flat_audio) { + set_locut_enabled(false); + set_limiter_enabled(false); + set_compressor_enabled(false); + } + // hlen=16 is pretty low quality, but we use quite a bit of CPU otherwise, // and there's a limit to how important the peak meter is. peak_resampler.setup(OUTPUT_FREQUENCY, OUTPUT_FREQUENCY * 4, /*num_channels=*/2, /*hlen=*/16, /*frel=*/1.0); @@ -473,7 +485,6 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, new_frame.frame = RefCountedFrame(FrameAllocator::Frame()); new_frame.length = frame_length; new_frame.interlaced = false; - new_frame.ready_fence = nullptr; new_frame.dropped_frames = dropped_frames; card->new_frames.push(move(new_frame)); card->new_frames_changed.notify_all(); @@ -530,26 +541,36 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, GLuint pbo = userdata->pbo; check_error(); - glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo); - check_error(); - glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT); + glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pbo); check_error(); + 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); + + if (global_flags.flush_pbos) { + glFlushMappedBufferRange(GL_PIXEL_UNPACK_BUFFER, field_y_start, video_format.width * video_format.height); + check_error(); + glFlushMappedBufferRange(GL_PIXEL_UNPACK_BUFFER, field_cbcr_start, cbcr_width * video_format.height * sizeof(uint16_t)); + check_error(); + } + glBindTexture(GL_TEXTURE_2D, userdata->tex_cbcr[field]); check_error(); - glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, cbcr_width, video_format.height, GL_RG, GL_UNSIGNED_BYTE, BUFFER_OFFSET(cbcr_offset + cbcr_width * field_start_line * sizeof(uint16_t))); + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, cbcr_width, video_format.height, GL_RG, GL_UNSIGNED_BYTE, BUFFER_OFFSET(field_cbcr_start)); check_error(); glBindTexture(GL_TEXTURE_2D, userdata->tex_y[field]); check_error(); - glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, video_format.width, video_format.height, GL_RED, GL_UNSIGNED_BYTE, BUFFER_OFFSET(y_offset + video_format.width * field_start_line)); + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, video_format.width, video_format.height, GL_RED, GL_UNSIGNED_BYTE, BUFFER_OFFSET(field_y_start)); check_error(); glBindTexture(GL_TEXTURE_2D, 0); check_error(); - glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0); + glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); + check_error(); + RefCountedGLsync fence(GL_SYNC_GPU_COMMANDS_COMPLETE, /*flags=*/0); check_error(); - GLsync fence = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, /*flags=*/0); + assert(fence.get() != nullptr); + glFlush(); // Make sure the main thread doesn't have to wait until we push out enough frames to make a new command buffer. check_error(); - assert(fence != nullptr); if (field == 1) { // Don't upload the second field as fast as we can; wait until @@ -605,29 +626,13 @@ void Mixer::thread_func() bool has_new_frame[MAX_CARDS] = { false }; int num_samples[MAX_CARDS] = { 0 }; - // TODO: Make configurable, and with a timeout. - unsigned master_card_index = 0; + // TODO: Add a timeout. + unsigned master_card_index = theme->map_signal(master_clock_channel); + assert(master_card_index < num_cards); get_one_frame_from_each_card(master_card_index, new_frames, has_new_frame, num_samples); - - // Resample the audio as needed, including from previously dropped frames. - assert(num_cards > 0); - for (unsigned frame_num = 0; frame_num < new_frames[master_card_index].dropped_frames + 1; ++frame_num) { - { - // Signal to the audio thread to process this frame. - unique_lock lock(audio_mutex); - audio_task_queue.push(AudioTask{pts_int, num_samples[master_card_index]}); - audio_task_queue_changed.notify_one(); - } - if (frame_num != new_frames[master_card_index].dropped_frames) { - // For dropped frames, increase the pts. Note that if the format changed - // in the meantime, we have no way of detecting that; we just have to - // assume the frame length is always the same. - ++stats_dropped_frames; - pts_int += new_frames[master_card_index].length; - } - } - + schedule_audio_resampling_tasks(new_frames[master_card_index].dropped_frames, num_samples[master_card_index], new_frames[master_card_index].length); + stats_dropped_frames += new_frames[master_card_index].dropped_frames; send_audio_level_callback(); for (unsigned card_index = 0; card_index < num_cards; ++card_index) { @@ -663,9 +668,9 @@ void Mixer::thread_func() // The new texture might still be uploaded, // tell the GPU to wait until it's there. if (new_frame->ready_fence) { - glWaitSync(new_frame->ready_fence, /*flags=*/0, GL_TIMEOUT_IGNORED); + glWaitSync(new_frame->ready_fence.get(), /*flags=*/0, GL_TIMEOUT_IGNORED); check_error(); - glDeleteSync(new_frame->ready_fence); + new_frame->ready_fence.reset(); check_error(); } } @@ -687,10 +692,10 @@ void Mixer::thread_func() if (should_cut.exchange(false)) { // Test and clear. string filename = generate_local_dump_filename(frame); printf("Starting new recording: %s\n", filename.c_str()); + h264_encoder->close_output_file(); h264_encoder->shutdown(); - httpd.close_output_file(); - httpd.open_output_file(filename.c_str()); h264_encoder.reset(new H264Encoder(h264_encoder_surface, global_flags.va_display, WIDTH, HEIGHT, &httpd)); + h264_encoder->open_output_file(filename.c_str()); } #if 0 @@ -732,7 +737,12 @@ void Mixer::get_one_frame_from_each_card(unsigned master_card_index, CaptureCard card->fractional_samples = num_samples_times_timebase % TIMEBASE; assert(num_samples[card_index] >= 0); - if (card_index != master_card_index) { + if (card_index == master_card_index) { + // We don't use the queue length policy for the master card, + // but we will if it stops being the master. Thus, clear out + // the policy in case we switch in the future. + card->queue_length_policy.reset(card_index); + } else { // If we have excess frames compared to the policy for this card, // drop frames from the head. card->queue_length_policy.update_policy(card->new_frames.size()); @@ -743,6 +753,26 @@ void Mixer::get_one_frame_from_each_card(unsigned master_card_index, CaptureCard } } +void Mixer::schedule_audio_resampling_tasks(unsigned dropped_frames, int num_samples_per_frame, int length_per_frame) +{ + // Resample the audio as needed, including from previously dropped frames. + assert(num_cards > 0); + for (unsigned frame_num = 0; frame_num < dropped_frames + 1; ++frame_num) { + { + // Signal to the audio thread to process this frame. + unique_lock lock(audio_mutex); + audio_task_queue.push(AudioTask{pts_int, num_samples_per_frame}); + audio_task_queue_changed.notify_one(); + } + if (frame_num != dropped_frames) { + // For dropped frames, increase the pts. Note that if the format changed + // in the meantime, we have no way of detecting that; we just have to + // assume the frame length is always the same. + pts_int += length_per_frame; + } + } +} + void Mixer::render_one_frame() { // Get the main chain from the theme, and set its state immediately. @@ -773,11 +803,8 @@ void Mixer::render_one_frame() 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(); - const int64_t av_delay = TIMEBASE / 10; // Corresponds to the fixed delay in resampling_queue.h. TODO: Make less hard-coded. - h264_encoder->end_frame(fence, pts_int + av_delay, theme_main_chain.input_frames); + RefCountedGLsync fence = h264_encoder->end_frame(pts_int + av_delay, theme_main_chain.input_frames); // The live frame just shows the RGBA texture we just rendered. // It owns rgba_tex now.