X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=c92d9787099a6cee6ab4ef160271c80fe1aa4df2;hb=2871d0f1ee0a12380337243a2646a134dd82133e;hp=6e1e45d953762ba55523248ea9a38345fe669c23;hpb=0fff2c95c89541e5b23611962a00886c64c00daa;p=nageru diff --git a/mixer.cpp b/mixer.cpp index 6e1e45d..c92d978 100644 --- a/mixer.cpp +++ b/mixer.cpp @@ -4,11 +4,11 @@ #include #include -#include #include #include #include #include +#include #include #include #include @@ -98,6 +98,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) num_cards(num_cards), mixer_surface(create_surface(format)), h264_encoder_surface(create_surface(format)), + correlation(OUTPUT_FREQUENCY), level_compressor(OUTPUT_FREQUENCY), limiter(OUTPUT_FREQUENCY), compressor(OUTPUT_FREQUENCY) @@ -166,7 +167,26 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) // Set up stuff for NV12 conversion. // Cb/Cr shader. - string cbcr_vert_shader = read_file("vs-cbcr.130.vert"); + string cbcr_vert_shader = + "#version 130 \n" + " \n" + "in vec2 position; \n" + "in vec2 texcoord; \n" + "out vec2 tc0; \n" + "uniform vec2 foo_chroma_offset_0; \n" + " \n" + "void main() \n" + "{ \n" + " // The result of glOrtho(0.0, 1.0, 0.0, 1.0, 0.0, 1.0) is: \n" + " // \n" + " // 2.000 0.000 0.000 -1.000 \n" + " // 0.000 2.000 0.000 -1.000 \n" + " // 0.000 0.000 -2.000 -1.000 \n" + " // 0.000 0.000 0.000 1.000 \n" + " gl_Position = vec4(2.0 * position.x - 1.0, 2.0 * position.y - 1.0, -1.0, 1.0); \n" + " vec2 flipped_tc = texcoord; \n" + " tc0 = flipped_tc + foo_chroma_offset_0; \n" + "} \n"; string cbcr_frag_shader = "#version 130 \n" "in vec2 tc0; \n" @@ -184,7 +204,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) // 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); + peak_resampler.setup(OUTPUT_FREQUENCY, OUTPUT_FREQUENCY * 4, /*num_channels=*/2, /*hlen=*/16, /*frel=*/1.0); alsa.reset(new ALSAOutput(OUTPUT_FREQUENCY, /*num_channels=*/2)); } @@ -255,7 +275,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, decode_video_format(video_format, &width, &height, &second_field_start, &extra_lines_top, &extra_lines_bottom, &frame_rate_nom, &frame_rate_den, &interlaced); // Ignore return value for now. - int64_t frame_length = TIMEBASE * frame_rate_den / frame_rate_nom; + int64_t frame_length = int64_t(TIMEBASE * frame_rate_den) / frame_rate_nom; size_t num_samples = (audio_frame.len >= audio_offset) ? (audio_frame.len - audio_offset) / 8 / 3 : 0; if (num_samples > OUTPUT_FREQUENCY / 10) { @@ -509,6 +529,7 @@ void Mixer::thread_func() } // Resample the audio as needed, including from previously dropped frames. + assert(num_cards > 0); for (unsigned frame_num = 0; frame_num < card_copy[0].dropped_frames + 1; ++frame_num) { { // Signal to the audio thread to process this frame. @@ -526,7 +547,7 @@ void Mixer::thread_func() } if (audio_level_callback != nullptr) { - unique_lock lock(r128_mutex); + unique_lock lock(compressor_mutex); double loudness_s = r128.loudness_S(); double loudness_i = r128.integrated(); double loudness_range_low = r128.range_min(); @@ -534,7 +555,8 @@ void Mixer::thread_func() audio_level_callback(loudness_s, 20.0 * log10(peak), loudness_i, loudness_range_low, loudness_range_high, - last_gain_staging_db); + gain_staging_db, 20.0 * log10(final_makeup_gain), + correlation.get_correlation()); } for (unsigned card_index = 1; card_index < num_cards; ++card_index) { @@ -689,6 +711,11 @@ void Mixer::process_audio_one_frame(int64_t frame_pts_int, int num_samples) { vector samples_card; vector samples_out; + + // TODO: Allow mixing audio from several sources. + unsigned selected_audio_card = theme->map_signal(audio_source_channel); + assert(selected_audio_card < num_cards); + for (unsigned card_index = 0; card_index < num_cards; ++card_index) { samples_card.resize(num_samples * 2); { @@ -697,8 +724,7 @@ void Mixer::process_audio_one_frame(int64_t frame_pts_int, int num_samples) printf("Card %d reported previous underrun.\n", card_index); } } - // TODO: Allow using audio from the other card(s) as well. - if (card_index == 0) { + if (card_index == selected_audio_card) { samples_out = move(samples_card); } } @@ -707,7 +733,9 @@ void Mixer::process_audio_one_frame(int64_t frame_pts_int, int num_samples) // we don't need it for voice, and it will reduce headroom // and confuse the compressor. (In particular, any hums at 50 or 60 Hz // should be dampened.) - locut.render(samples_out.data(), samples_out.size() / 2, locut_cutoff_hz * 2.0 * M_PI / OUTPUT_FREQUENCY, 0.5f); + if (locut_enabled) { + locut.render(samples_out.data(), samples_out.size() / 2, locut_cutoff_hz * 2.0 * M_PI / OUTPUT_FREQUENCY, 0.5f); + } // Apply a level compressor to get the general level right. // Basically, if it's over about -40 dBFS, we squeeze it down to that level @@ -715,15 +743,23 @@ void Mixer::process_audio_one_frame(int64_t frame_pts_int, int num_samples) // then apply a makeup gain to get it to -14 dBFS. -14 dBFS is, of course, // entirely arbitrary, but from practical tests with speech, it seems to // put ut around -23 LUFS, so it's a reasonable starting point for later use. - float ref_level_dbfs = -14.0f; { - float threshold = 0.01f; // -40 dBFS. - float ratio = 20.0f; - float attack_time = 0.5f; - float release_time = 20.0f; - float makeup_gain = pow(10.0f, (ref_level_dbfs - (-40.0f)) / 20.0f); // +26 dB. - level_compressor.process(samples_out.data(), samples_out.size() / 2, threshold, ratio, attack_time, release_time, makeup_gain); - last_gain_staging_db = 20.0 * log10(level_compressor.get_attenuation() * makeup_gain); + unique_lock lock(compressor_mutex); + if (level_compressor_enabled) { + float threshold = 0.01f; // -40 dBFS. + float ratio = 20.0f; + float attack_time = 0.5f; + float release_time = 20.0f; + float makeup_gain = pow(10.0f, (ref_level_dbfs - (-40.0f)) / 20.0f); // +26 dB. + level_compressor.process(samples_out.data(), samples_out.size() / 2, threshold, ratio, attack_time, release_time, makeup_gain); + gain_staging_db = 20.0 * log10(level_compressor.get_attenuation() * makeup_gain); + } else { + // Just apply the gain we already had. + float g = pow(10.0f, gain_staging_db / 20.0f); + for (size_t i = 0; i < samples_out.size(); ++i) { + samples_out[i] *= g; + } + } } #if 0 @@ -772,15 +808,57 @@ void Mixer::process_audio_one_frame(int64_t frame_pts_int, int num_samples) peak_resampler.process(); size_t out_stereo_samples = interpolated_samples_out.size() / 2 - peak_resampler.out_count; peak = max(peak, find_peak(interpolated_samples_out.data(), out_stereo_samples * 2)); + peak_resampler.out_data = nullptr; + } + + // At this point, we are most likely close to +0 LU, but all of our + // measurements have been on raw sample values, not R128 values. + // So we have a final makeup gain to get us to +0 LU; the gain + // adjustments required should be relatively small, and also, the + // offset shouldn't change much (only if the type of audio changes + // significantly). Thus, we shoot for updating this value basically + // “whenever we process buffers”, since the R128 calculation isn't exactly + // something we get out per-sample. + // + // Note that there's a feedback loop here, so we choose a very slow filter + // (half-time of 100 seconds). + double target_loudness_factor, alpha; + { + unique_lock lock(compressor_mutex); + double loudness_lu = r128.loudness_M() - ref_level_lufs; + double current_makeup_lu = 20.0f * log10(final_makeup_gain); + target_loudness_factor = pow(10.0f, -loudness_lu / 20.0f); + + // If we're outside +/- 5 LU uncorrected, we don't count it as + // a normal signal (probably silence) and don't change the + // correction factor; just apply what we already have. + if (fabs(loudness_lu - current_makeup_lu) >= 5.0 || !final_makeup_gain_auto) { + alpha = 0.0; + } else { + // Formula adapted from + // https://en.wikipedia.org/wiki/Low-pass_filter#Simple_infinite_impulse_response_filter. + const double half_time_s = 100.0; + const double fc_mul_2pi_delta_t = 1.0 / (half_time_s * OUTPUT_FREQUENCY); + alpha = fc_mul_2pi_delta_t / (fc_mul_2pi_delta_t + 1.0); + } + + double m = final_makeup_gain; + for (size_t i = 0; i < samples_out.size(); i += 2) { + samples_out[i + 0] *= m; + samples_out[i + 1] *= m; + m += (target_loudness_factor - m) * alpha; + } + final_makeup_gain = m; } - // Find R128 levels. + // Find R128 levels and L/R correlation. vector left, right; deinterleave_samples(samples_out, &left, &right); float *ptrs[] = { left.data(), right.data() }; { - unique_lock lock(r128_mutex); + unique_lock lock(compressor_mutex); r128.process(left.size(), ptrs); + correlation.process_samples(samples_out); } // Send the samples to the sound card. @@ -885,6 +963,7 @@ void Mixer::reset_meters() peak = 0.0f; r128.reset(); r128.integr_start(); + correlation.reset(); } Mixer::OutputChannel::~OutputChannel()