Fix a crash on getting metrics after switching file.

diff --git a/quicksync_encoder.cpp b/quicksync_encoder.cpp
index 1821f5b200473c08359c36c913de684a5b5b0c72..8eef63dd0d1338e69677e4e0c85ece83ea9fc3c2 100644 (file)
--- a/quicksync_encoder.cpp
+++ b/quicksync_encoder.cpp
@@ -64,6 +64,15 @@ using namespace std::placeholders;
 class QOpenGLContext;
 class QSurface;
 
+namespace {
+
+// These need to survive several QuickSyncEncoderImpl instances,
+// so they are outside.
+bool mux_metrics_inited = false;
+LatencyHistogram mixer_latency_histogram, qs_latency_histogram;
+
+}  // namespace
+
 #define CHECK_VASTATUS(va_status, func)                                 \
     if (va_status != VA_STATUS_SUCCESS) {                               \
         fprintf(stderr, "%s:%d (%s) failed with %d\n", __func__, __LINE__, func, va_status); \
@@ -1561,8 +1570,11 @@ QuickSyncEncoderImpl::QuickSyncEncoderImpl(const std::string &filename, Resource
                memset(&slice_param, 0, sizeof(slice_param));
        }
 
-       mixer_latency_histogram.init("mixer");
-       qs_latency_histogram.init("quick_sync");
+       if (!mux_metrics_inited) {
+               mixer_latency_histogram.init("mixer");
+               qs_latency_histogram.init("quick_sync");
+               mux_metrics_inited = true;
+       }
 
        storage_thread = thread(&QuickSyncEncoderImpl::storage_task_thread, this);
 

diff --git a/quicksync_encoder_impl.h b/quicksync_encoder_impl.h
index f8243ff3384d650ddac583d34e8031ded3fac0b5..917420ca41af16a81ffdd3668bd6ea38f3fb78cc 100644 (file)
--- a/quicksync_encoder_impl.h
+++ b/quicksync_encoder_impl.h
@@ -222,7 +222,6 @@ private:
        int frame_height_mbaligned;
 
        DiskSpaceEstimator *disk_space_estimator;
-       LatencyHistogram mixer_latency_histogram, qs_latency_histogram;
 };
 
 #endif  // !defined(_QUICKSYNC_ENCODER_IMPL_H)