commit d59d3bb117544f2d4efe9f27d199f440a1da6cb8
author kwiberg <kwiberg@webrtc.org> Tue Sep 13 07:49:33 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Sep 13 14:49:41 2016 +0000
tree 0d522ca5cc8b9b0bab9e4a3ab08727369e60b5c1
parent ba56b6c7d23fc4a818e7609ffa07b4693712f43e

Replace a DCHECK with static_assert

This requires marking a bunch of compile-time constants "constexpr"
instead of just "const".

Review-Url: https://codereview.webrtc.org/2335483003
Cr-Commit-Position: refs/heads/master@{#14199}

webrtc/modules/audio_processing/audio_processing_impl.cc

diff --git a/webrtc/modules/audio_processing/audio_processing_impl.cc b/webrtc/modules/audio_processing/audio_processing_impl.cc
index 72f154a..5478456 100644
--- a/webrtc/modules/audio_processing/audio_processing_impl.cc
+++ b/webrtc/modules/audio_processing/audio_processing_impl.cc
@@ -70,15 +70,7 @@
 
 namespace webrtc {
 
-const int AudioProcessing::kNativeSampleRatesHz[] = {
-    AudioProcessing::kSampleRate8kHz,
-    AudioProcessing::kSampleRate16kHz,
-    AudioProcessing::kSampleRate32kHz,
-    AudioProcessing::kSampleRate48kHz};
-const size_t AudioProcessing::kNumNativeSampleRates =
-    arraysize(AudioProcessing::kNativeSampleRatesHz);
-const int AudioProcessing::kMaxNativeSampleRateHz = AudioProcessing::
-    kNativeSampleRatesHz[AudioProcessing::kNumNativeSampleRates - 1];
+constexpr int AudioProcessing::kNativeSampleRatesHz[];
 
 namespace {
 
@@ -103,12 +95,15 @@
 
 int FindNativeProcessRateToUse(int minimum_rate, bool band_splitting_required) {
 #ifdef WEBRTC_ARCH_ARM_FAMILY
-  const int kMaxSplittingNativeProcessRate = AudioProcessing::kSampleRate32kHz;
+  constexpr int kMaxSplittingNativeProcessRate =
+      AudioProcessing::kSampleRate32kHz;
 #else
-  const int kMaxSplittingNativeProcessRate = AudioProcessing::kSampleRate48kHz;
+  constexpr int kMaxSplittingNativeProcessRate =
+      AudioProcessing::kSampleRate48kHz;
 #endif
-  RTC_DCHECK_LE(kMaxSplittingNativeProcessRate,
-                AudioProcessing::kMaxNativeSampleRateHz);
+  static_assert(
+      kMaxSplittingNativeProcessRate <= AudioProcessing::kMaxNativeSampleRateHz,
+      "");
   const int uppermost_native_rate = band_splitting_required
                                         ? kMaxSplittingNativeProcessRate
                                         : AudioProcessing::kSampleRate48kHz;