Index: webrtc/modules/audio_processing/beamformer/covariance_matrix_generator.cc |
diff --git a/webrtc/modules/audio_processing/beamformer/covariance_matrix_generator.cc b/webrtc/modules/audio_processing/beamformer/covariance_matrix_generator.cc |
index d0728325fcd93e2426561d8139a43c082fd1ddea..78f4df5ca98d68437f6aba395a4289c01b52d9d1 100644 |
--- a/webrtc/modules/audio_processing/beamformer/covariance_matrix_generator.cc |
+++ b/webrtc/modules/audio_processing/beamformer/covariance_matrix_generator.cc |
@@ -27,7 +27,7 @@ float BesselJ0(float x) { |
// Calculates the Euclidean norm for a row vector. |
float Norm(const ComplexMatrix<float>& x) { |
- RTC_CHECK_EQ(1, x.num_rows()); |
+ RTC_CHECK_EQ(1u, x.num_rows()); |
const size_t length = x.num_columns(); |
const complex<float>* elems = x.elements()[0]; |
float result = 0.f; |
@@ -43,8 +43,8 @@ void CovarianceMatrixGenerator::UniformCovarianceMatrix( |
float wave_number, |
const std::vector<Point>& geometry, |
ComplexMatrix<float>* mat) { |
- RTC_CHECK_EQ(static_cast<int>(geometry.size()), mat->num_rows()); |
- RTC_CHECK_EQ(static_cast<int>(geometry.size()), mat->num_columns()); |
+ RTC_CHECK_EQ(geometry.size(), mat->num_rows()); |
+ RTC_CHECK_EQ(geometry.size(), mat->num_columns()); |
complex<float>* const* mat_els = mat->elements(); |
for (size_t i = 0; i < geometry.size(); ++i) { |
@@ -68,8 +68,8 @@ void CovarianceMatrixGenerator::AngledCovarianceMatrix( |
int sample_rate, |
const std::vector<Point>& geometry, |
ComplexMatrix<float>* mat) { |
- RTC_CHECK_EQ(static_cast<int>(geometry.size()), mat->num_rows()); |
- RTC_CHECK_EQ(static_cast<int>(geometry.size()), mat->num_columns()); |
+ RTC_CHECK_EQ(geometry.size(), mat->num_rows()); |
+ RTC_CHECK_EQ(geometry.size(), mat->num_columns()); |
ComplexMatrix<float> interf_cov_vector(1, geometry.size()); |
ComplexMatrix<float> interf_cov_vector_transposed(geometry.size(), 1); |
@@ -94,8 +94,8 @@ void CovarianceMatrixGenerator::PhaseAlignmentMasks( |
const std::vector<Point>& geometry, |
float angle, |
ComplexMatrix<float>* mat) { |
- RTC_CHECK_EQ(1, mat->num_rows()); |
- RTC_CHECK_EQ(static_cast<int>(geometry.size()), mat->num_columns()); |
+ RTC_CHECK_EQ(1u, mat->num_rows()); |
+ RTC_CHECK_EQ(geometry.size(), mat->num_columns()); |
float freq_in_hertz = |
(static_cast<float>(frequency_bin) / fft_size) * sample_rate; |