Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1360)

Unified Diff: webrtc/modules/audio_processing/audio_processing_impl.cc

Issue 2335483003: Replace a DCHECK with static_assert (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/modules/audio_processing/include/audio_processing.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: 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 bd311ad6b1615c75762f85061a8da5b7f73b03d2..3f26356d4b5842289313dc24f4309565da48454f 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 @@ bool SampleRateSupportsMultiBand(int sample_rate_hz) {
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,
+ "");
peah-webrtc 2016/09/13 12:50:12 Don't we want a message for the assert?
kwiberg-webrtc 2016/09/13 13:11:17 No. If the assert fails, there'll be a compilation
const int uppermost_native_rate = band_splitting_required
? kMaxSplittingNativeProcessRate
: AudioProcessing::kSampleRate48kHz;
« no previous file with comments | « no previous file | webrtc/modules/audio_processing/include/audio_processing.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698