X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=9efb8ef1d611995b17e248e5c54a6cb8a169e7e4;hb=11cbb401c412f7403d236b35dce6869dd44eaa91;hp=28cbed780bd09ec8a84bd8740c556228ed0ab60c;hpb=9333e45887effbdb12034de97f511a0f65307a69;p=nageru diff --git a/mixer.cpp b/mixer.cpp index 28cbed7..9efb8ef 100644 --- a/mixer.cpp +++ b/mixer.cpp @@ -7,27 +7,20 @@ #include "mixer.h" #include -#include -#include -#include #include -#include -#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include #include #include #include -#include -#include -#include +#include #include #include #include @@ -35,6 +28,7 @@ #include #include #include +#include #include #include "bmusb/bmusb.h" @@ -70,8 +64,10 @@ void convert_fixed24_to_fp32(float *dst, size_t out_channels, const uint8_t *src } // namespace -Mixer::Mixer(const QSurfaceFormat &format) - : mixer_surface(create_surface(format)), +Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) + : httpd("test.ts", WIDTH, HEIGHT), + num_cards(num_cards), + mixer_surface(create_surface(format)), h264_encoder_surface(create_surface(format)) { httpd.start(9095); @@ -79,12 +75,15 @@ Mixer::Mixer(const QSurfaceFormat &format) CHECK(init_movit(MOVIT_SHADER_DIR, MOVIT_DEBUG_OFF)); check_error(); + // Since we allow non-bouncing 4:2:2 YCbCrInputs, effective subpixel precision + // will be halved when sampling them, and we need to compensate here. + movit_texel_subpixel_precision /= 2.0; + 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; + theme.reset(new Theme("theme.lua", resource_pool.get(), num_cards)); + for (unsigned i = 0; i < NUM_OUTPUTS; ++i) { + output_channel[i].parent = this; + } ImageFormat inout_format; inout_format.color_space = COLORSPACE_sRGB; @@ -99,9 +98,9 @@ Mixer::Mixer(const QSurfaceFormat &format) display_chain->set_dither_bits(0); // Don't bother. display_chain->finalize(); - h264_encoder.reset(new H264Encoder(h264_encoder_surface, WIDTH, HEIGHT, "test.ts", &httpd)); + h264_encoder.reset(new H264Encoder(h264_encoder_surface, WIDTH, HEIGHT, &httpd)); - for (int card_index = 0; card_index < NUM_CARDS; ++card_index) { + for (unsigned 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(card_index); @@ -127,7 +126,7 @@ Mixer::Mixer(const QSurfaceFormat &format) BMUSBCapture::start_bm_thread(); - for (int card_index = 0; card_index < NUM_CARDS; ++card_index) { + for (unsigned card_index = 0; card_index < num_cards; ++card_index) { cards[card_index].usb->start_bm_capture(); } @@ -145,6 +144,9 @@ Mixer::Mixer(const QSurfaceFormat &format) " gl_FragColor = texture2D(cbcr_tex, tc0); \n" "} \n"; cbcr_program_num = resource_pool->compile_glsl_program(cbcr_vert_shader, cbcr_frag_shader); + + r128.init(2, 48000); + r128.integr_start(); } Mixer::~Mixer() @@ -152,7 +154,7 @@ 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) { + for (unsigned card_index = 0; card_index < num_cards; ++card_index) { { unique_lock lock(bmusb_mutex); cards[card_index].should_quit = true; // Unblock thread. @@ -174,9 +176,33 @@ int unwrap_timecode(uint16_t current_wrapped, int last) } } +float find_peak(const vector &samples) +{ + float m = fabs(samples[0]); + for (size_t i = 1; i < samples.size(); ++i) { + m = std::max(m, fabs(samples[i])); + } + return m; +} + +void deinterleave_samples(const vector &in, vector *out_l, vector *out_r) +{ + size_t num_samples = in.size() / 2; + out_l->resize(num_samples); + out_r->resize(num_samples); + + const float *inptr = in.data(); + float *lptr = &(*out_l)[0]; + float *rptr = &(*out_r)[0]; + for (size_t i = 0; i < num_samples; ++i) { + *lptr++ = *inptr++; + *rptr++ = *inptr++; + } +} + } // namespace -void Mixer::bm_frame(int card_index, uint16_t timecode, +void Mixer::bm_frame(unsigned card_index, uint16_t timecode, FrameAllocator::Frame video_frame, size_t video_offset, uint16_t video_format, FrameAllocator::Frame audio_frame, size_t audio_offset, uint16_t audio_format) { @@ -195,12 +221,6 @@ void Mixer::bm_frame(int card_index, uint16_t timecode, return; } - // Convert the audio to stereo fp32 and add it. - size_t num_samples = (audio_frame.len - audio_offset) / 8 / 3; - vector audio; - audio.resize(num_samples * 2); - convert_fixed24_to_fp32(&audio[0], 2, audio_frame.data + audio_offset, 8, num_samples); - int unwrapped_timecode = timecode; int dropped_frames = 0; if (card->last_timecode != -1) { @@ -209,6 +229,12 @@ void Mixer::bm_frame(int card_index, uint16_t timecode, } card->last_timecode = unwrapped_timecode; + // Convert the audio to stereo fp32 and add it. + size_t num_samples = (audio_frame.len >= audio_offset) ? (audio_frame.len - audio_offset) / 8 / 3 : 0; + vector audio; + audio.resize(num_samples * 2); + convert_fixed24_to_fp32(&audio[0], 2, audio_frame.data + audio_offset, 8, num_samples); + // Add the audio. { unique_lock lock(card->audio_mutex); @@ -316,7 +342,7 @@ void Mixer::thread_func() int dropped_frames = 0; while (!should_quit) { - CaptureCard card_copy[NUM_CARDS]; + CaptureCard card_copy[MAX_CARDS]; { unique_lock lock(bmusb_mutex); @@ -325,7 +351,7 @@ void Mixer::thread_func() // TODO: Make configurable, and with a timeout. cards[0].new_data_ready_changed.wait(lock, [this]{ return cards[0].new_data_ready; }); - for (int card_index = 0; card_index < NUM_CARDS; ++card_index) { + for (unsigned card_index = 0; card_index < num_cards; ++card_index) { CaptureCard *card = &cards[card_index]; card_copy[card_index].usb = card->usb; card_copy[card_index].new_data_ready = card->new_data_ready; @@ -342,7 +368,7 @@ void Mixer::thread_func() vector samples_out; // TODO: Allow using audio from the other card(s) as well. for (unsigned frame_num = 0; frame_num < card_copy[0].dropped_frames + 1; ++frame_num) { - for (unsigned card_index = 0; card_index < NUM_CARDS; ++card_index) { + for (unsigned card_index = 0; card_index < num_cards; ++card_index) { samples_out.resize((48000 / 60) * 2); { unique_lock lock(cards[card_index].audio_mutex); @@ -351,6 +377,11 @@ void Mixer::thread_func() } } if (card_index == 0) { + vector left, right; + peak = std::max(peak, find_peak(samples_out)); + deinterleave_samples(samples_out, &left, &right); + float *ptrs[] = { left.data(), right.data() }; + r128.process(left.size(), ptrs); h264_encoder->add_audio(pts_int, move(samples_out)); } } @@ -361,6 +392,26 @@ void Mixer::thread_func() } } + if (audio_level_callback != nullptr) { + double loudness_s = r128.loudness_S(); + double loudness_i = r128.integrated(); + double loudness_range_low = r128.range_min(); + double loudness_range_high = r128.range_max(); + + audio_level_callback(loudness_s, 20.0 * log10(peak), + loudness_i, loudness_range_low, loudness_range_high); + } + + for (unsigned card_index = 1; card_index < num_cards; ++card_index) { + if (card_copy[card_index].new_data_ready && card_copy[card_index].new_frame->len == 0) { + ++card_copy[card_index].dropped_frames; + } + if (card_copy[card_index].dropped_frames > 0) { + printf("Card %u dropped %d frames before this\n", + card_index, int(card_copy[card_index].dropped_frames)); + } + } + // If the first card is reporting a corrupted or otherwise dropped frame, // just increase the pts (skipping over this frame) and don't try to compute anything new. if (card_copy[0].new_frame->len == 0) { @@ -369,7 +420,7 @@ void Mixer::thread_func() continue; } - for (int card_index = 0; card_index < NUM_CARDS; ++card_index) { + for (unsigned card_index = 0; card_index < num_cards; ++card_index) { CaptureCard *card = &card_copy[card_index]; if (!card->new_data_ready || card->new_frame->len == 0) continue; @@ -403,6 +454,7 @@ void Mixer::thread_func() GLuint cbcr_full_tex = resource_pool->create_2d_texture(GL_RG8, WIDTH, HEIGHT); GLuint rgba_tex = resource_pool->create_2d_texture(GL_RGB565, WIDTH, HEIGHT); // Saves texture bandwidth, although dithering gets messed up. GLuint fbo = resource_pool->create_fbo(y_tex, cbcr_full_tex, rgba_tex); + check_error(); chain->render_to_fbo(fbo, WIDTH, HEIGHT); resource_pool->release_fbo(fbo); @@ -423,7 +475,7 @@ void Mixer::thread_func() // input frames needed, so that they are not released back // until the rendering is done. vector input_frames; - for (int card_index = 0; card_index < NUM_CARDS; ++card_index) { + for (unsigned card_index = 0; card_index < num_cards; ++card_index) { input_frames.push_back(bmusb_current_rendering_frame[card_index]); } const int64_t av_delay = TIMEBASE / 10; // Corresponds to the fixed delay in resampler.h. TODO: Make less hard-coded. @@ -450,7 +502,11 @@ void Mixer::thread_func() 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? + + // FIXME: possible to do better? + for (unsigned card_index = 0; card_index < num_cards; ++card_index) { + display_frame.input_frames.push_back(bmusb_current_rendering_frame[card_index]); + } display_frame.temp_textures = {}; output_channel[i].output_frame(display_frame); }