Correct the scale of the memory metrics.

[nageru] / mixer.cpp

diff --git a/mixer.cpp b/mixer.cpp
index 89cfd5f06f1930298696d547b1d168b8276b001f..860df6c42bdaf3f04abaaffac34016c591fb6bdd 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -239,9 +239,9 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
          mixer_surface(create_surface(format)),
          h264_encoder_surface(create_surface(format)),
          decklink_output_surface(create_surface(format)),
-         ycbcr_interpretation(global_flags.ycbcr_interpretation),
          audio_mixer(num_cards)
 {
+       memcpy(ycbcr_interpretation, global_flags.ycbcr_interpretation, sizeof(ycbcr_interpretation));
        CHECK(init_movit(MOVIT_SHADER_DIR, MOVIT_DEBUG_OFF));
        check_error();
 
@@ -979,7 +979,7 @@ void Mixer::thread_func()
 
                        printf("\n");
 
-                       metrics_memory_used_bytes = used.ru_maxrss;
+                       metrics_memory_used_bytes = used.ru_maxrss * 1024;
                }