]> git.sesse.net Git - nageru/blobdiff - mixer.cpp
Reduce the verbosity somewhat.
[nageru] / mixer.cpp
index 0d88f040329ab6fc4ff9dcf0bf7f6a893fdb3edd..5fd5d1f7b452f2cda88a56cc6cccc2df62fe00df 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -1,33 +1,22 @@
-#define WIDTH 1280
-#define HEIGHT 720
-#define EXTRAHEIGHT 30
-
 #undef Success
 
 #include "mixer.h"
 
 #include <assert.h>
-#include <effect.h>
-#include <effect_chain.h>
-#include <effect_util.h>
 #include <epoxy/egl.h>
-#include <features.h>
-#include <image_format.h>
 #include <init.h>
-#include <overlay_effect.h>
-#include <padding_effect.h>
-#include <resample_effect.h>
-#include <resource_pool.h>
-#include <saturation_effect.h>
+#include <movit/effect_chain.h>
+#include <movit/effect_util.h>
+#include <movit/flat_input.h>
+#include <movit/image_format.h>
+#include <movit/resource_pool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <time.h>
 #include <util.h>
-#include <white_balance_effect.h>
-#include <ycbcr.h>
-#include <ycbcr_input.h>
+#include <algorithm>
 #include <cmath>
 #include <condition_variable>
 #include <cstddef>
 #include <mutex>
 #include <string>
 #include <thread>
+#include <utility>
 #include <vector>
 
 #include "bmusb/bmusb.h"
 #include "context.h"
+#include "defs.h"
 #include "h264encode.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_gl_sync.h"
@@ -70,22 +61,29 @@ void convert_fixed24_to_fp32(float *dst, size_t out_channels, const uint8_t *src
 
 }  // namespace
 
-Mixer::Mixer(const QSurfaceFormat &format)
-       : httpd("test.ts", WIDTH, HEIGHT),
+Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
+       : httpd(LOCAL_DUMP_FILE_NAME, WIDTH, HEIGHT),
+         num_cards(num_cards),
          mixer_surface(create_surface(format)),
-         h264_encoder_surface(create_surface(format))
+         h264_encoder_surface(create_surface(format)),
+         level_compressor(OUTPUT_FREQUENCY),
+         limiter(OUTPUT_FREQUENCY),
+         compressor(OUTPUT_FREQUENCY)
 {
        httpd.start(9095);
 
        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;
@@ -102,18 +100,18 @@ Mixer::Mixer(const QSurfaceFormat &format)
 
        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);
                card->usb->set_frame_callback(bind(&Mixer::bm_frame, this, card_index, _1, _2, _3, _4, _5, _6, _7));
-               card->frame_allocator.reset(new PBOFrameAllocator(WIDTH * (HEIGHT+EXTRAHEIGHT) * 2 + 44, WIDTH, HEIGHT));
+               card->frame_allocator.reset(new PBOFrameAllocator(8 << 20, WIDTH, HEIGHT));  // 8 MB.
                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();
+                               card->context = create_context(card->surface);
                                if (!make_current(card->context, card->surface)) {
                                        printf("failed to create bmusb context\n");
                                        exit(1);
@@ -122,13 +120,13 @@ Mixer::Mixer(const QSurfaceFormat &format)
                        [this]{
                                resource_pool->clean_context();
                        });
-               card->resampler.reset(new Resampler(48000.0, 48000.0, 2));
+               card->resampling_queue.reset(new ResamplingQueue(OUTPUT_FREQUENCY, OUTPUT_FREQUENCY, 2));
                card->usb->configure_card();
        }
 
        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();
        }
 
@@ -147,7 +145,16 @@ Mixer::Mixer(const QSurfaceFormat &format)
                "} \n";
        cbcr_program_num = resource_pool->compile_glsl_program(cbcr_vert_shader, cbcr_frag_shader);
 
-       r128_state = ebur128_init(2, 48000, EBUR128_MODE_TRUE_PEAK | EBUR128_MODE_M | EBUR128_MODE_S | EBUR128_MODE_I | EBUR128_MODE_LRA);
+       r128.init(2, OUTPUT_FREQUENCY);
+       r128.integr_start();
+
+       locut.init(FILTER_HPF, 2);
+
+       // 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);
+
+       alsa.reset(new ALSAOutput(OUTPUT_FREQUENCY, /*num_channels=*/2));
 }
 
 Mixer::~Mixer()
@@ -155,7 +162,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<mutex> lock(bmusb_mutex);
                        cards[card_index].should_quit = true;  // Unblock thread.
@@ -164,7 +171,7 @@ Mixer::~Mixer()
                cards[card_index].usb->stop_dequeue_thread();
        }
 
-       ebur128_destroy(&r128_state);
+       h264_encoder.reset(nullptr);
 }
 
 namespace {
@@ -179,15 +186,47 @@ int unwrap_timecode(uint16_t current_wrapped, int last)
        }
 }
 
+float find_peak(const float *samples, size_t num_samples)
+{
+       float m = fabs(samples[0]);
+       for (size_t i = 1; i < num_samples; ++i) {
+               m = std::max(m, fabs(samples[i]));
+       }
+       return m;
+}
+
+void deinterleave_samples(const vector<float> &in, vector<float> *out_l, vector<float> *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)
 {
        CaptureCard *card = &cards[card_index];
 
-       if (audio_frame.len - audio_offset > 30000) {
+       int width, height, frame_rate_nom, frame_rate_den, extra_lines_top, extra_lines_bottom;
+       bool interlaced;
+
+       decode_video_format(video_format, &width, &height, &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;
+
+       size_t num_samples = (audio_frame.len >= audio_offset) ? (audio_frame.len - audio_offset) / 8 / 3 : 0;
+       if (num_samples > OUTPUT_FREQUENCY / 10) {
                printf("Card %d: Dropping frame with implausible audio length (len=%d, offset=%d) [timecode=0x%04x video_len=%d video_offset=%d video_format=%x)\n",
                        card_index, int(audio_frame.len), int(audio_offset),
                        timecode, int(video_frame.len), int(video_offset), video_format);
@@ -200,42 +239,54 @@ void Mixer::bm_frame(int card_index, uint16_t timecode,
                return;
        }
 
+       int64_t local_pts = card->next_local_pts;
+       int dropped_frames = 0;
+       if (card->last_timecode != -1) {
+               dropped_frames = unwrap_timecode(timecode, card->last_timecode) - card->last_timecode - 1;
+       }
+
        // Convert the audio to stereo fp32 and add it.
-       size_t num_samples = (audio_frame.len - audio_offset) / 8 / 3;
        vector<float> 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) {
-               unwrapped_timecode = unwrap_timecode(unwrapped_timecode, card->last_timecode);
-               dropped_frames = unwrapped_timecode - card->last_timecode - 1;
-       }
-       card->last_timecode = unwrapped_timecode;
-
        // Add the audio.
        {
                unique_lock<mutex> lock(card->audio_mutex);
 
-               int unwrapped_timecode = timecode;
-               if (dropped_frames > 60 * 2) {
-                       fprintf(stderr, "Card %d lost more than two seconds (or time code jumping around), resetting resampler\n",
-                               card_index);
-                       card->resampler.reset(new Resampler(48000.0, 48000.0, 2));
+               // Number of samples per frame if we need to insert silence.
+               // (Could be nonintegral, but resampling will save us then.)
+               int silence_samples = OUTPUT_FREQUENCY * frame_rate_den / frame_rate_nom;
+
+               if (dropped_frames > MAX_FPS * 2) {
+                       fprintf(stderr, "Card %d lost more than two seconds (or time code jumping around; from 0x%04x to 0x%04x), resetting resampler\n",
+                               card_index, card->last_timecode, timecode);
+                       card->resampling_queue.reset(new ResamplingQueue(OUTPUT_FREQUENCY, OUTPUT_FREQUENCY, 2));
+                       dropped_frames = 0;
                } else if (dropped_frames > 0) {
                        // Insert silence as needed.
                        fprintf(stderr, "Card %d dropped %d frame(s) (before timecode 0x%04x), inserting silence.\n",
                                card_index, dropped_frames, timecode);
                        vector<float> silence;
-                       silence.resize((48000 / 60) * 2);
+                       silence.resize(silence_samples * 2);
                        for (int i = 0; i < dropped_frames; ++i) {
-                               card->resampler->add_input_samples((unwrapped_timecode - dropped_frames + i) / 60.0, silence.data(), (48000 / 60));
+                               card->resampling_queue->add_input_samples(local_pts / double(TIMEBASE), silence.data(), silence_samples);
+                               // 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.
+                               local_pts += frame_length;
                        }
                }
-               card->resampler->add_input_samples(unwrapped_timecode / 60.0, audio.data(), num_samples);
+               if (num_samples == 0) {
+                       audio.resize(silence_samples * 2);
+                       num_samples = silence_samples;
+               }
+               card->resampling_queue->add_input_samples(local_pts / double(TIMEBASE), audio.data(), num_samples);
+               card->next_local_pts = local_pts + frame_length;
        }
 
+       card->last_timecode = timecode;
+
        // Done with the audio, so release it.
        if (audio_frame.owner) {
                audio_frame.owner->release_frame(audio_frame);
@@ -248,7 +299,9 @@ void Mixer::bm_frame(int card_index, uint16_t timecode,
                if (card->should_quit) return;
        }
 
-       if (video_frame.len - video_offset != WIDTH * (HEIGHT+EXTRAHEIGHT) * 2) {
+       if (video_frame.len - video_offset == 0 ||
+           video_frame.len - video_offset != size_t(width * (height + extra_lines_top + extra_lines_bottom) * 2) ||
+           width != WIDTH || height != HEIGHT) {  // TODO: Remove this once the rest of the infrastructure is in place.
                if (video_frame.len != 0) {
                        printf("Card %d: Dropping video frame with wrong length (%ld)\n",
                                card_index, video_frame.len - video_offset);
@@ -263,6 +316,7 @@ void Mixer::bm_frame(int card_index, uint16_t timecode,
                        unique_lock<mutex> lock(bmusb_mutex);
                        card->new_data_ready = true;
                        card->new_frame = RefCountedFrame(FrameAllocator::Frame());
+                       card->new_frame_length = frame_length;
                        card->new_data_ready_fence = nullptr;
                        card->dropped_frames = dropped_frames;
                        card->new_data_ready_changed.notify_all();
@@ -281,13 +335,17 @@ void Mixer::bm_frame(int card_index, uint16_t timecode,
        //check_error();
 
        // Upload the textures.
-       glBindTexture(GL_TEXTURE_2D, userdata->tex_y);
+       size_t cbcr_width = width / 2;
+       size_t cbcr_offset = video_offset / 2;
+       size_t y_offset = video_frame.size / 2 + video_offset / 2;
+
+       glBindTexture(GL_TEXTURE_2D, userdata->tex_cbcr);
        check_error();
-       glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, WIDTH, HEIGHT, GL_RED, GL_UNSIGNED_BYTE, BUFFER_OFFSET((WIDTH * (HEIGHT+EXTRAHEIGHT) * 2 + 44) / 2 + WIDTH * 25 + 22));
+       glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, cbcr_width, height, GL_RG, GL_UNSIGNED_BYTE, BUFFER_OFFSET(cbcr_offset + cbcr_width * extra_lines_top * sizeof(uint16_t)));
        check_error();
-       glBindTexture(GL_TEXTURE_2D, userdata->tex_cbcr);
+       glBindTexture(GL_TEXTURE_2D, userdata->tex_y);
        check_error();
-       glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, WIDTH/2, HEIGHT, GL_RG, GL_UNSIGNED_BYTE, BUFFER_OFFSET(WIDTH * 25 + 22));
+       glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, GL_RED, GL_UNSIGNED_BYTE, BUFFER_OFFSET(y_offset + width * extra_lines_top));
        check_error();
        glBindTexture(GL_TEXTURE_2D, 0);
        check_error();
@@ -299,6 +357,7 @@ void Mixer::bm_frame(int card_index, uint16_t timecode,
                unique_lock<mutex> lock(bmusb_mutex);
                card->new_data_ready = true;
                card->new_frame = RefCountedFrame(video_frame);
+               card->new_frame_length = frame_length;
                card->new_data_ready_fence = fence;
                card->dropped_frames = dropped_frames;
                card->new_data_ready_changed.notify_all();
@@ -308,7 +367,7 @@ void Mixer::bm_frame(int card_index, uint16_t timecode,
 void Mixer::thread_func()
 {
        eglBindAPI(EGL_OPENGL_API);
-       QOpenGLContext *context = create_context();
+       QOpenGLContext *context = create_context(mixer_surface);
        if (!make_current(context, mixer_surface)) {
                printf("oops\n");
                exit(1);
@@ -318,10 +377,11 @@ void Mixer::thread_func()
        clock_gettime(CLOCK_MONOTONIC, &start);
 
        int frame = 0;
-       int dropped_frames = 0;
+       int stats_dropped_frames = 0;
 
        while (!should_quit) {
-               CaptureCard card_copy[NUM_CARDS];
+               CaptureCard card_copy[MAX_CARDS];
+               int num_samples[MAX_CARDS];
 
                {
                        unique_lock<mutex> lock(bmusb_mutex);
@@ -330,69 +390,71 @@ 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;
                                card_copy[card_index].new_frame = card->new_frame;
+                               card_copy[card_index].new_frame_length = card->new_frame_length;
                                card_copy[card_index].new_data_ready_fence = card->new_data_ready_fence;
-                               card_copy[card_index].new_frame_audio = move(card->new_frame_audio);
                                card_copy[card_index].dropped_frames = card->dropped_frames;
                                card->new_data_ready = false;
                                card->new_data_ready_changed.notify_all();
+
+                               int num_samples_times_timebase = OUTPUT_FREQUENCY * card->new_frame_length + card->fractional_samples;
+                               num_samples[card_index] = num_samples_times_timebase / TIMEBASE;
+                               card->fractional_samples = num_samples_times_timebase % TIMEBASE;
+                               assert(num_samples[card_index] >= 0);
                        }
                }
 
                // Resample the audio as needed, including from previously dropped frames.
-               vector<float> 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) {
-                               samples_out.resize((48000 / 60) * 2);
-                               {
-                                       unique_lock<mutex> lock(cards[card_index].audio_mutex);
-                                       if (!cards[card_index].resampler->get_output_samples(pts(), &samples_out[0], 48000 / 60)) {
-                                               printf("Card %d reported previous underrun.\n", card_index);
-                                       }
-                               }
-                               if (card_index == 0) {
-                                       ebur128_add_frames_float(r128_state, samples_out.data(), samples_out.size() / 2);
-                                       h264_encoder->add_audio(pts_int, move(samples_out));
-                               }
+                       {
+                               // Signal to the audio thread to process this frame.
+                               unique_lock<mutex> lock(audio_mutex);
+                               audio_task_queue.push(AudioTask{pts_int, num_samples[0]});
+                               audio_task_queue_changed.notify_one();
                        }
                        if (frame_num != card_copy[0].dropped_frames) {
-                               // For dropped frames, increase the pts.
-                               ++dropped_frames;
-                               pts_int += TIMEBASE / 60;
+                               // 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 += card_copy[0].new_frame_length;
                        }
                }
 
                if (audio_level_callback != nullptr) {
-                       double loudness_s, loudness_i, peak_level_l, peak_level_r;
-                       double lra;
-                       ebur128_loudness_shortterm(r128_state, &loudness_s);
-                       ebur128_loudness_global(r128_state, &loudness_i);
-                       ebur128_loudness_range(r128_state, &lra);
-                       ebur128_true_peak(r128_state, 0, &peak_level_l);
-                       ebur128_true_peak(r128_state, 1, &peak_level_r);
-
-                       // FIXME: This is wrong. We need proper support from libebur128 for this.
-                       double loudness_range_low = loudness_i - 0.5 * lra;
-                       double loudness_range_high = loudness_i + 0.5 * lra;
-
-                       audio_level_callback(loudness_s, 20.0 * log10(max(peak_level_l, peak_level_r)),
-                                            loudness_i, loudness_range_low, loudness_range_high);
+                       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,
+                                            last_gain_staging_db);
+               }
+
+               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) {
-                       ++dropped_frames;
-                       pts_int += TIMEBASE / 60;
+                       ++stats_dropped_frames;
+                       pts_int += card_copy[0].new_frame_length;
                        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;
@@ -447,13 +509,13 @@ void Mixer::thread_func()
                // input frames needed, so that they are not released back
                // until the rendering is done.
                vector<RefCountedFrame> 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.
+               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, input_frames);
                ++frame;
-               pts_int += TIMEBASE / 60;
+               pts_int += card_copy[0].new_frame_length;
 
                // The live frame just shows the RGBA texture we just rendered.
                // It owns rgba_tex now.
@@ -474,7 +536,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);
                }
@@ -484,7 +550,7 @@ void Mixer::thread_func()
                        1e-9 * (now.tv_nsec - start.tv_nsec);
                if (frame % 100 == 0) {
                        printf("%d frames (%d dropped) in %.3f seconds = %.1f fps (%.1f ms/frame)\n",
-                               frame, dropped_frames, elapsed, frame / elapsed,
+                               frame, stats_dropped_frames, elapsed, frame / elapsed,
                                1e3 * elapsed / frame);
                //      chain->print_phase_timing();
                }
@@ -505,6 +571,126 @@ void Mixer::thread_func()
        resource_pool->clean_context();
 }
 
+void Mixer::audio_thread_func()
+{
+       while (!should_quit) {
+               AudioTask task;
+
+               {
+                       unique_lock<mutex> lock(audio_mutex);
+                       audio_task_queue_changed.wait(lock, [this]{ return !audio_task_queue.empty(); });
+                       task = audio_task_queue.front();
+                       audio_task_queue.pop();
+               }
+
+               process_audio_one_frame(task.pts_int, task.num_samples);
+       }
+}
+
+void Mixer::process_audio_one_frame(int64_t frame_pts_int, int num_samples)
+{
+       vector<float> samples_card;
+       vector<float> samples_out;
+       for (unsigned card_index = 0; card_index < num_cards; ++card_index) {
+               samples_card.resize(num_samples * 2);
+               {
+                       unique_lock<mutex> lock(cards[card_index].audio_mutex);
+                       if (!cards[card_index].resampling_queue->get_output_samples(double(frame_pts_int) / TIMEBASE, &samples_card[0], 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) {
+                       samples_out = move(samples_card);
+               }
+       }
+
+       // Cut away everything under 120 Hz (or whatever the cutoff is);
+       // 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);
+
+       // 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
+       // (or more precisely, near it, since we don't use infinite ratio),
+       // 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);
+       }
+
+#if 0
+       printf("level=%f (%+5.2f dBFS) attenuation=%f (%+5.2f dB) end_result=%+5.2f dB\n",
+               level_compressor.get_level(), 20.0 * log10(level_compressor.get_level()),
+               level_compressor.get_attenuation(), 20.0 * log10(level_compressor.get_attenuation()),
+               20.0 * log10(level_compressor.get_level() * level_compressor.get_attenuation() * makeup_gain));
+#endif
+
+//     float limiter_att, compressor_att;
+
+       // The real compressor.
+       if (compressor_enabled) {
+               float threshold = pow(10.0f, compressor_threshold_dbfs / 20.0f);
+               float ratio = 20.0f;
+               float attack_time = 0.005f;
+               float release_time = 0.040f;
+               float makeup_gain = 2.0f;  // +6 dB.
+               compressor.process(samples_out.data(), samples_out.size() / 2, threshold, ratio, attack_time, release_time, makeup_gain);
+//             compressor_att = compressor.get_attenuation();
+       }
+
+       // Finally a limiter at -4 dB (so, -10 dBFS) to take out the worst peaks only.
+       // Note that since ratio is not infinite, we could go slightly higher than this.
+       if (limiter_enabled) {
+               float threshold = pow(10.0f, limiter_threshold_dbfs / 20.0f);
+               float ratio = 30.0f;
+               float attack_time = 0.0f;  // Instant.
+               float release_time = 0.020f;
+               float makeup_gain = 1.0f;  // 0 dB.
+               limiter.process(samples_out.data(), samples_out.size() / 2, threshold, ratio, attack_time, release_time, makeup_gain);
+//             limiter_att = limiter.get_attenuation();
+       }
+
+//     printf("limiter=%+5.1f  compressor=%+5.1f\n", 20.0*log10(limiter_att), 20.0*log10(compressor_att));
+
+       // Upsample 4x to find interpolated peak.
+       peak_resampler.inp_data = samples_out.data();
+       peak_resampler.inp_count = samples_out.size() / 2;
+
+       vector<float> interpolated_samples_out;
+       interpolated_samples_out.resize(samples_out.size());
+       while (peak_resampler.inp_count > 0) {  // About four iterations.
+               peak_resampler.out_data = &interpolated_samples_out[0];
+               peak_resampler.out_count = interpolated_samples_out.size() / 2;
+               peak_resampler.process();
+               size_t out_stereo_samples = interpolated_samples_out.size() / 2 - peak_resampler.out_count;
+               peak = max<float>(peak, find_peak(interpolated_samples_out.data(), out_stereo_samples * 2));
+       }
+
+       // Find R128 levels.
+       vector<float> left, right;
+       deinterleave_samples(samples_out, &left, &right);
+       float *ptrs[] = { left.data(), right.data() };
+       r128.process(left.size(), ptrs);
+
+       // Send the samples to the sound card.
+       if (alsa) {
+               alsa->write(samples_out);
+       }
+
+       // And finally add them to the output.
+       h264_encoder->add_audio(frame_pts_int, move(samples_out));
+}
+
 void Mixer::subsample_chroma(GLuint src_tex, GLuint dst_tex)
 {
        GLuint vao;
@@ -572,12 +758,14 @@ void Mixer::release_display_frame(DisplayFrame *frame)
 void Mixer::start()
 {
        mixer_thread = thread(&Mixer::thread_func, this);
+       audio_thread = thread(&Mixer::audio_thread_func, this);
 }
 
 void Mixer::quit()
 {
        should_quit = true;
        mixer_thread.join();
+       audio_thread.join();
 }
 
 void Mixer::transition_clicked(int transition_num)
@@ -590,6 +778,14 @@ void Mixer::channel_clicked(int preview_num)
        theme->channel_clicked(preview_num);
 }
 
+void Mixer::reset_meters()
+{
+       peak_resampler.reset();
+       peak = 0.0f;
+       r128.reset();
+       r128.integr_start();
+}
+
 Mixer::OutputChannel::~OutputChannel()
 {
        if (has_current_frame) {