Always enable resampler stats

The define causes trouble with Firefox's build system and it's not obvious how to fix it properly. This is harmless enough and will probably be DCEed.
mozilla · Mar 3, 2025 · 15dc83f · 15dc83f
1 parent 34ff385
commit 15dc83f
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,7 +42,6 @@ else()
 endif()
 
 if(BUILD_TESTS)
-  add_definitions(-DGTEST_ENABLED=1)
   find_package(GTest QUIET)
   if(TARGET GTest::Main)
     add_library(gtest_main ALIAS GTest::Main)

diff --git a/src/cubeb_resampler.cpp b/src/cubeb_resampler.cpp
@@ -372,10 +372,8 @@ cubeb_resampler_latency(cubeb_resampler * resampler)
   return resampler->latency();
 }
 
-#ifdef GTEST_ENABLED
 cubeb_resampler_stats
 cubeb_resampler_stats_get(cubeb_resampler * resampler)
 {
   return resampler->stats();
 }
-#endif
diff --git a/src/cubeb_resampler.h b/src/cubeb_resampler.h
@@ -88,7 +88,6 @@ cubeb_resampler_latency(cubeb_resampler * resampler);
  * Test-only introspection API to ensure that there is no buffering
  * buildup when resampling.
  */
-#ifdef GTEST_ENABLED
 typedef struct {
   size_t input_input_buffer_size;
   size_t input_output_buffer_size;
@@ -98,7 +97,6 @@ typedef struct {
 
 cubeb_resampler_stats
 cubeb_resampler_stats_get(cubeb_resampler * resampler);
-#endif
 
 #if defined(__cplusplus)
 }

diff --git a/src/cubeb_resampler_internal.h b/src/cubeb_resampler_internal.h
@@ -56,9 +56,7 @@ struct cubeb_resampler {
   virtual long fill(void * input_buffer, long * input_frames_count,
                     void * output_buffer, long frames_needed) = 0;
   virtual long latency() = 0;
-#ifdef GTEST_ENABLED
   virtual cubeb_resampler_stats stats() = 0;
-#endif
   virtual ~cubeb_resampler() {}
 };
 
@@ -89,7 +87,6 @@ class passthrough_resampler : public cubeb_resampler, public processor {
 
   virtual long latency() { return 0; }
 
-#ifdef GTEST_ENABLED
   virtual cubeb_resampler_stats stats()
   {
     cubeb_resampler_stats stats;
@@ -99,7 +96,6 @@ class passthrough_resampler : public cubeb_resampler, public processor {
     stats.output_output_buffer_size = 0;
     return stats;
   }
-#endif
 
   void drop_audio_if_needed()
   {
@@ -137,7 +133,6 @@ class cubeb_resampler_speex : public cubeb_resampler {
   virtual long fill(void * input_buffer, long * input_frames_count,
                     void * output_buffer, long output_frames_needed);
 
-#ifdef GTEST_ENABLED
   virtual cubeb_resampler_stats stats()
   {
     cubeb_resampler_stats stats = {};
@@ -151,7 +146,6 @@ class cubeb_resampler_speex : public cubeb_resampler {
     }
     return stats;
   }
-#endif
 
   virtual long latency()
   {
@@ -361,10 +355,8 @@ template <typename T> class cubeb_resampler_speex_one_way : public processor {
     }
   }
 
-#ifdef GTEST_ENABLED
   size_t input_buffer_size() const { return resampling_in_buffer.length(); }
   size_t output_buffer_size() const { return resampling_out_buffer.length(); }
-#endif
 
 private:
   /** Wrapper for the speex resampling functions to have a typed
@@ -514,10 +506,8 @@ template <typename T> class delay_line : public processor {
     }
   }
 
-#ifdef GTEST_ENABLED
   size_t input_buffer_size() const { return delay_input_buffer.length(); }
   size_t output_buffer_size() const { return delay_output_buffer.length(); }
-#endif
 
 private:
   /** The length, in frames, of this delay line */