Make number of cards flexible at runtime.

[nageru] / nageru / benchmark_audio_mixer.cpp

diff --git a/nageru/benchmark_audio_mixer.cpp b/nageru/benchmark_audio_mixer.cpp
index 7ec3450dc60d942d617cbfeff0210f58a9b4ddc5..3f1ed7c1552b7251e975778d0658054a3e966a48 100644 (file)
--- a/nageru/benchmark_audio_mixer.cpp
+++ b/nageru/benchmark_audio_mixer.cpp
@@ -73,7 +73,7 @@ vector<float> process_frame(unsigned frame_num, AudioMixer *mixer)
                unsigned num_samples = NUM_SAMPLES + (lcgrand() % 9) - 5;
                bool ok = mixer->add_audio(DeviceSpec{InputSourceType::CAPTURE_CARD, card_index},
                        card_index == 3 ? samples24 : samples16, num_samples, audio_format,
-                       NUM_SAMPLES * TIMEBASE / OUTPUT_FREQUENCY, ts);
+                       ts);
                assert(ok);
        }
 
@@ -101,7 +101,7 @@ void init_mapping(AudioMixer *mixer)
 
 void do_test(const char *filename)
 {
-       AudioMixer mixer(NUM_BENCHMARK_CARDS, 0);
+       AudioMixer mixer;
        mixer.set_audio_level_callback(callback);
        init_mapping(&mixer);
 
@@ -140,7 +140,7 @@ void do_test(const char *filename)
 
 void do_benchmark()
 {
-       AudioMixer mixer(NUM_BENCHMARK_CARDS, 0);
+       AudioMixer mixer;
        mixer.set_audio_level_callback(callback);
        init_mapping(&mixer);
 
@@ -162,7 +162,7 @@ void do_benchmark()
 
        double elapsed = duration<double>(end - start).count();
        double simulated = double(out_samples) / (OUTPUT_FREQUENCY * 2);
-       printf("%ld samples produced in %.1f ms (%.1f%% CPU, %.1fx realtime).\n",
+       printf("%zu samples produced in %.1f ms (%.1f%% CPU, %.1fx realtime).\n",
                out_samples, elapsed * 1e3, 100.0 * elapsed / simulated, simulated / elapsed);
 }