X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fbenchmark_audio_mixer.cpp;h=935295b3bee3ac8996e3122ac0387345f8654738;hb=HEAD;hp=f140a512c299f848187fdab4e594266aab9f3e1b;hpb=af8007aa958271ba16b15e7d11a891570488f6c9;p=nageru

diff --git a/nageru/benchmark_audio_mixer.cpp b/nageru/benchmark_audio_mixer.cpp
index f140a51..9eefc73 100644
--- a/nageru/benchmark_audio_mixer.cpp
+++ b/nageru/benchmark_audio_mixer.cpp
@@ -13,11 +13,10 @@
 #include <vector>
 
 #include "audio_mixer.h"
-#include "db.h"
-#include "defs.h"
+#include "decibel.h"
 #include "input_mapping.h"
 #include "resampling_queue.h"
-#include "shared/timebase.h"
+#include "shared/shared_defs.h"
 
 #define NUM_BENCHMARK_CARDS 4
 #define NUM_WARMUP_FRAMES 100
@@ -52,9 +51,9 @@ void reset_lcgrand()
 
 void callback(float level_lufs, float peak_db,
               std::vector<AudioMixer::BusLevel> bus_levels,
-	      float global_level_lufs, float range_low_lufs, float range_high_lufs,
-	      float final_makeup_gain_db,
-	      float correlation)
+              float global_level_lufs, float range_low_lufs, float range_high_lufs,
+              float final_makeup_gain_db,
+              float correlation)
 {
 	// Empty.
 }
@@ -73,7 +72,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 +100,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 +139,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 +161,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);
 }