Fix a bug where we would give wrong pts to the QuickSync encoder.

diff --git a/quicksync_encoder.cpp b/quicksync_encoder.cpp
index 65373808884a1d50d4a4bd48633bd597a8187708..284b67ac63101d4934d79b50effbcc5d73315a75 100644 (file)
--- a/quicksync_encoder.cpp
+++ b/quicksync_encoder.cpp
@@ -1759,6 +1759,8 @@ void QuickSyncEncoderImpl::encode_thread_func()
                        if (!reorder_buffer.count(quicksync_display_frame_num)) {
                                break;
                        }
+                       frame = move(reorder_buffer[quicksync_display_frame_num]);
+                       reorder_buffer.erase(quicksync_display_frame_num);
 
                        if (frame_type == FRAME_IDR) {
                                numShortTerm = 0;
@@ -1776,8 +1778,7 @@ void QuickSyncEncoderImpl::encode_thread_func()
                        }
                        last_dts = dts;
 
-                       encode_frame(reorder_buffer[quicksync_display_frame_num], quicksync_encoding_frame_num, quicksync_display_frame_num, gop_start_display_frame_num, frame_type, frame.pts, dts, frame.duration);
-                       reorder_buffer.erase(quicksync_display_frame_num);
+                       encode_frame(frame, quicksync_encoding_frame_num, quicksync_display_frame_num, gop_start_display_frame_num, frame_type, frame.pts, dts, frame.duration);
                        ++quicksync_encoding_frame_num;
                }
        }