Cleanup: Remove the last case of non-refcounted fences.

[nageru] / mixer.cpp

diff --git a/mixer.cpp b/mixer.cpp
index 50c93e8c018a9f3b077830b77788f8dffbee5b8c..f0b06941225fb78d2e8f1ac35ac89698a7077413 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -123,7 +123,7 @@ void QueueLengthPolicy::update_policy(int queue_length)
                return;
        }
        if (queue_length > 0) {
-               if (++frames_with_at_least_one >= 50) {
+               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);
@@ -473,7 +473,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();
@@ -532,7 +531,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
                check_error();
                glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo);
                check_error();
-               glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT);
+               glFlushMappedBufferRange(GL_PIXEL_UNPACK_BUFFER, 0, video_frame.size);
                check_error();
 
                glBindTexture(GL_TEXTURE_2D, userdata->tex_cbcr[field]);
@@ -547,9 +546,9 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
                check_error();
                glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
                check_error();
-               GLsync fence = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, /*flags=*/0);
+               RefCountedGLsync fence(GL_SYNC_GPU_COMMANDS_COMPLETE, /*flags=*/0);
                check_error();
-               assert(fence != nullptr);
+               assert(fence.get() != nullptr);
 
                if (field == 1) {
                        // Don't upload the second field as fast as we can; wait until
@@ -605,8 +604,9 @@ 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);
                schedule_audio_resampling_tasks(new_frames[master_card_index].dropped_frames, num_samples[master_card_index], new_frames[master_card_index].length);
@@ -646,9 +646,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();
                        }
                }
@@ -715,7 +715,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());