Fix a thread race in QuickSyncEncoder. Found by GCC TSan.

[nageru] / quicksync_encoder.cpp

diff --git a/quicksync_encoder.cpp b/quicksync_encoder.cpp
index 67e9668faaecbac253e6d37877664651ba47a927..8761d56ac88903f39b481030171817acb81b382a 100644 (file)
--- a/quicksync_encoder.cpp
+++ b/quicksync_encoder.cpp
@@ -1875,8 +1875,11 @@ void QuickSyncEncoderImpl::encode_thread_func()
 
                        if (frame_type == FRAME_IDR) {
                                // Release any reference frames from the previous GOP.
-                               for (const ReferenceFrame &frame : reference_frames) {
-                                       release_gl_surface(frame.display_number);
+                               {
+                                       unique_lock<mutex> lock(storage_task_queue_mutex);
+                                       for (const ReferenceFrame &frame : reference_frames) {
+                                               release_gl_surface(frame.display_number);
+                                       }
                                }
                                reference_frames.clear();
                                current_ref_frame_num = 0;