]> git.sesse.net Git - nageru/blobdiff - mixer.cpp
Rework entire pts handling.
[nageru] / mixer.cpp
index c126c0b28bf9600095073607e0d930e48930137b..4a758c0defc7c567caad281c5dc0097e200ea297 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
 #include <thread>
 #include <vector>
 
-#include "bmusb.h"
+#include "bmusb/bmusb.h"
 #include "context.h"
 #include "h264encode.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_gl_sync.h"
+#include "timebase.h"
 
 class QOpenGLContext;
 
@@ -101,7 +102,7 @@ Mixer::Mixer(const QSurfaceFormat &format)
                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->usb->set_frame_callback(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);
@@ -118,7 +119,7 @@ Mixer::Mixer(const QSurfaceFormat &format)
                        [this]{
                                resource_pool->clean_context();
                        });
-               card->resampler = new Resampler(48000.0, 48000.0, 2);
+               card->resampler.reset(new Resampler(48000.0, 48000.0, 2));
                card->usb->configure_card();
        }
 
@@ -150,33 +151,118 @@ Mixer::~Mixer()
        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();
+               {
+                       unique_lock<mutex> lock(bmusb_mutex);
+                       cards[card_index].should_quit = true;  // Unblock thread.
+                       cards[card_index].new_data_ready_changed.notify_all();
+               }
                cards[card_index].usb->stop_dequeue_thread();
        }
 }
 
+namespace {
+
+int unwrap_timecode(uint16_t current_wrapped, int last)
+{
+       uint16_t last_wrapped = last & 0xffff;
+       if (current_wrapped > last_wrapped) {
+               return (last & ~0xffff) | current_wrapped;
+       } else {
+               return 0x10000 + ((last & ~0xffff) | current_wrapped);
+       }
+}
+
+}  // namespace
+
 void Mixer::bm_frame(int 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 (video_frame.len - video_offset != 1280 * 750 * 2) {
-               printf("dropping frame with wrong length (%ld)\n", video_frame.len - video_offset);
-               FILE *fp = fopen("frame.raw", "wb");
-               fwrite(video_frame.data, video_frame.len, 1, fp);
-               fclose(fp);
-               //exit(1);
-               card->usb->get_video_frame_allocator()->release_frame(video_frame);
-               card->usb->get_audio_frame_allocator()->release_frame(audio_frame);
+       if (audio_frame.len - audio_offset > 30000) {
+               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);
+               if (video_frame.owner) {
+                       video_frame.owner->release_frame(video_frame);
+               }
+               if (audio_frame.owner) {
+                       audio_frame.owner->release_frame(audio_frame);
+               }
                return;
        }
+
+       // 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));
+               } 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);
+                       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->resampler->add_input_samples(unwrapped_timecode / 60.0, audio.data(), num_samples);
+       }
+
+       // Done with the audio, so release it.
+       if (audio_frame.owner) {
+               audio_frame.owner->release_frame(audio_frame);
+       }
+
        {
                // Wait until the previous frame was consumed.
-               std::unique_lock<std::mutex> lock(bmusb_mutex);
-               card->new_data_ready_changed.wait(lock, [card]{ return !card->new_data_ready; });
+               unique_lock<mutex> lock(bmusb_mutex);
+               card->new_data_ready_changed.wait(lock, [card]{ return !card->new_data_ready || card->should_quit; });
+               if (card->should_quit) return;
        }
+
+       if (video_frame.len - video_offset != 1280 * 750 * 2) {
+               if (video_frame.len != 0) {
+                       printf("Card %d: Dropping video frame with wrong length (%ld)\n",
+                               card_index, video_frame.len - video_offset);
+               }
+               if (video_frame.owner) {
+                       video_frame.owner->release_frame(video_frame);
+               }
+
+               // Still send on the information that we _had_ a frame, even though it's corrupted,
+               // so that pts can go up accordingly.
+               {
+                       unique_lock<mutex> lock(bmusb_mutex);
+                       card->new_data_ready = true;
+                       card->new_frame = RefCountedFrame(FrameAllocator::Frame());
+                       card->new_data_ready_fence = nullptr;
+                       card->dropped_frames = dropped_frames;
+                       card->new_data_ready_changed.notify_all();
+               }
+               return;
+       }
+
        const PBOFrameAllocator::Userdata *userdata = (const PBOFrameAllocator::Userdata *)video_frame.userdata;
        GLuint pbo = userdata->pbo;
        check_error();
@@ -201,40 +287,15 @@ void Mixer::bm_frame(int card_index, uint16_t timecode,
        GLsync fence = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, /*flags=*/0);              
        check_error();
        assert(fence != nullptr);
+
        {
-               std::unique_lock<std::mutex> lock(bmusb_mutex);
+               unique_lock<mutex> lock(bmusb_mutex);
                card->new_data_ready = true;
                card->new_frame = RefCountedFrame(video_frame);
                card->new_data_ready_fence = fence;
+               card->dropped_frames = dropped_frames;
                card->new_data_ready_changed.notify_all();
        }
-
-       // As a test of the resampler, send the data from card 0 through it and onto disk.
-       // TODO: Send the audio on, and encode it through ffmpeg.
-       if (card_index == 0) {
-               size_t num_samples = (audio_frame.len - audio_offset) / 8 / 3;
-               double pts = timecode / 60.0;  // FIXME: Unwrap. And rebase.
-               unique_ptr<float[]> samplesf(new float[num_samples * 2]);
-               convert_fixed24_to_fp32(samplesf.get(), 2, audio_frame.data + audio_offset, 8, num_samples);
-               card->resampler->add_input_samples(pts, samplesf.get(), num_samples);
-
-               float samples_out[(48000 / 60) * 2];
-               card->resampler->get_output_samples(pts, samples_out, 48000 / 60);
-
-               static FILE *audiofp = nullptr;
-               if (audiofp == nullptr) {
-                       audiofp = fopen("audio.raw", "wb");
-               }
-               fwrite(samples_out, sizeof(samples_out), 1, audiofp);
-               //fwrite(samplesf.get(), num_samples * sizeof(float) * 2, 1, audiofp);
-
-               if (audio_frame.len - audio_offset != 19200) {
-                       printf("%d: %d samples (%d bytes)\n", card_index, int(num_samples), int(audio_frame.len - audio_offset));
-               }
-       }
-
-       // 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::thread_func()
@@ -249,13 +310,14 @@ void Mixer::thread_func()
        struct timespec start, now;
        clock_gettime(CLOCK_MONOTONIC, &start);
 
-       while (!should_quit) {
-               ++frame;
+       int frame = 0;
+       int dropped_frames = 0;
 
+       while (!should_quit) {
                CaptureCard card_copy[NUM_CARDS];
 
                {
-                       std::unique_lock<std::mutex> lock(bmusb_mutex);
+                       unique_lock<mutex> lock(bmusb_mutex);
 
                        // The first card is the master timer, so wait for it to have a new frame.
                        // TODO: Make configurable, and with a timeout.
@@ -267,14 +329,47 @@ void Mixer::thread_func()
                                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_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();
                        }
                }
 
+               // 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) {
+                                       h264_encoder->add_audio(pts_int, move(samples_out));
+                               }
+                       }
+                       if (frame_num != card_copy[0].dropped_frames) {
+                               // For dropped frames, increase the pts.
+                               ++dropped_frames;
+                               pts_int += TIMEBASE / 60;
+                       }
+               }
+
+               // 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;
+                       continue;
+               }
+
                for (int card_index = 0; card_index < NUM_CARDS; ++card_index) {
                        CaptureCard *card = &card_copy[card_index];
-                       if (!card->new_data_ready)
+                       if (!card->new_data_ready || card->new_frame->len == 0)
                                continue;
 
                        assert(card->new_frame != nullptr);
@@ -283,17 +378,18 @@ void Mixer::thread_func()
 
                        // The new texture might still be uploaded,
                        // tell the GPU to wait until it's there.
-                       if (card->new_data_ready_fence)
+                       if (card->new_data_ready_fence) {
                                glWaitSync(card->new_data_ready_fence, /*flags=*/0, GL_TIMEOUT_IGNORED);
-                       check_error();
-                       glDeleteSync(card->new_data_ready_fence);
-                       check_error();
+                               check_error();
+                               glDeleteSync(card->new_data_ready_fence);
+                               check_error();
+                       }
                        const PBOFrameAllocator::Userdata *userdata = (const PBOFrameAllocator::Userdata *)card->new_frame->userdata;
                        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<EffectChain *, function<void()>> theme_main_chain = theme->get_chain(0, frame / 60.0f, WIDTH, HEIGHT);
+               pair<EffectChain *, function<void()>> theme_main_chain = theme->get_chain(0, pts(), WIDTH, HEIGHT);
                EffectChain *chain = theme_main_chain.first;
                theme_main_chain.second();
 
@@ -328,7 +424,9 @@ void Mixer::thread_func()
                for (int card_index = 0; card_index < NUM_CARDS; ++card_index) {
                        input_frames.push_back(bmusb_current_rendering_frame[card_index]);
                }
-               h264_encoder->end_frame(fence, input_frames);
+               h264_encoder->end_frame(fence, pts_int, input_frames);
+               ++frame;
+               pts_int += TIMEBASE / 60;
 
                // The live frame just shows the RGBA texture we just rendered.
                // It owns rgba_tex now.
@@ -345,7 +443,7 @@ void Mixer::thread_func()
                // Set up preview and any additional channels.
                for (int i = 1; i < theme->get_num_channels() + 2; ++i) {
                        DisplayFrame display_frame;
-                       pair<EffectChain *, function<void()>> chain = theme->get_chain(i, frame / 60.0f, WIDTH, HEIGHT);  // FIXME: dimensions
+                       pair<EffectChain *, function<void()>> chain = theme->get_chain(i, pts(), WIDTH, HEIGHT);  // FIXME: dimensions
                        display_frame.chain = chain.first;
                        display_frame.setup_chain = chain.second;
                        display_frame.ready_fence = fence;
@@ -358,12 +456,13 @@ void Mixer::thread_func()
                double elapsed = now.tv_sec - start.tv_sec +
                        1e-9 * (now.tv_nsec - start.tv_nsec);
                if (frame % 100 == 0) {
-                       printf("%d frames in %.3f seconds = %.1f fps (%.1f ms/frame)\n",
-                               frame, elapsed, frame / elapsed,
+                       printf("%d frames (%d dropped) in %.3f seconds = %.1f fps (%.1f ms/frame)\n",
+                               frame, dropped_frames, elapsed, frame / elapsed,
                                1e3 * elapsed / frame);
                //      chain->print_phase_timing();
                }
 
+#if 0
                // Reset every 100 frames, so that local variations in frame times
                // (especially for the first few frames, when the shaders are
                // compiled etc.) don't make it hard to measure for the entire
@@ -372,6 +471,7 @@ void Mixer::thread_func()
                        frame = 0;
                        start = now;
                }
+#endif
                check_error();
        }
 
@@ -444,7 +544,7 @@ void Mixer::release_display_frame(DisplayFrame *frame)
 
 void Mixer::start()
 {
-       mixer_thread = std::thread(&Mixer::thread_func, this);
+       mixer_thread = thread(&Mixer::thread_func, this);
 }
 
 void Mixer::quit()
@@ -455,7 +555,7 @@ void Mixer::quit()
 
 void Mixer::transition_clicked(int transition_num)
 {
-       theme->transition_clicked(transition_num, frame / 60.0);
+       theme->transition_clicked(transition_num, pts());
 }
 
 void Mixer::channel_clicked(int preview_num)
@@ -478,7 +578,7 @@ void Mixer::OutputChannel::output_frame(DisplayFrame frame)
        // Store this frame for display. Remove the ready frame if any
        // (it was seemingly never used).
        {
-               std::unique_lock<std::mutex> lock(frame_mutex);
+               unique_lock<mutex> lock(frame_mutex);
                if (has_ready_frame) {
                        parent->release_display_frame(&ready_frame);
                }
@@ -493,7 +593,7 @@ void Mixer::OutputChannel::output_frame(DisplayFrame frame)
 
 bool Mixer::OutputChannel::get_display_frame(DisplayFrame *frame)
 {
-       std::unique_lock<std::mutex> lock(frame_mutex);
+       unique_lock<mutex> lock(frame_mutex);
        if (!has_current_frame && !has_ready_frame) {
                return false;
        }