Index: webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc |
diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc b/webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc |
index b29501e38c63a8b92191fd648c951a24da9b8791..c82b184b3863476b534877b20be252e9a6385d35 100644 |
--- a/webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc |
+++ b/webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc |
@@ -42,7 +42,9 @@ class OpusTest : public TestWithParam<::testing::tuple<int, int>> { |
// After preparation, |speech_data_.GetNextBlock()| returns a pointer to a |
// block of |block_length_ms| milliseconds. The data is looped every |
// |loop_length_ms| milliseconds. |
- void PrepareSpeechData(int channel, int block_length_ms, int loop_length_ms); |
+ void PrepareSpeechData(size_t channel, |
+ int block_length_ms, |
+ int loop_length_ms); |
int EncodeDecode(WebRtcOpusEncInst* encoder, |
rtc::ArrayView<const int16_t> input_audio, |
@@ -53,7 +55,7 @@ class OpusTest : public TestWithParam<::testing::tuple<int, int>> { |
void SetMaxPlaybackRate(WebRtcOpusEncInst* encoder, |
opus_int32 expect, int32_t set); |
- void CheckAudioBounded(const int16_t* audio, size_t samples, int channels, |
+ void CheckAudioBounded(const int16_t* audio, size_t samples, size_t channels, |
uint16_t bound) const; |
WebRtcOpusEncInst* opus_encoder_; |
@@ -62,7 +64,7 @@ class OpusTest : public TestWithParam<::testing::tuple<int, int>> { |
AudioLoop speech_data_; |
uint8_t bitstream_[kMaxBytes]; |
size_t encoded_bytes_; |
- int channels_; |
+ size_t channels_; |
int application_; |
}; |
@@ -70,11 +72,11 @@ OpusTest::OpusTest() |
: opus_encoder_(NULL), |
opus_decoder_(NULL), |
encoded_bytes_(0), |
- channels_(::testing::get<0>(GetParam())), |
+ channels_(static_cast<size_t>(::testing::get<0>(GetParam()))), |
application_(::testing::get<1>(GetParam())) { |
} |
-void OpusTest::PrepareSpeechData(int channel, int block_length_ms, |
+void OpusTest::PrepareSpeechData(size_t channel, int block_length_ms, |
int loop_length_ms) { |
const std::string file_name = |
webrtc::test::ResourcePath((channel == 1) ? |
@@ -99,9 +101,9 @@ void OpusTest::SetMaxPlaybackRate(WebRtcOpusEncInst* encoder, |
} |
void OpusTest::CheckAudioBounded(const int16_t* audio, size_t samples, |
- int channels, uint16_t bound) const { |
+ size_t channels, uint16_t bound) const { |
for (size_t i = 0; i < samples; ++i) { |
- for (int c = 0; c < channels; ++c) { |
+ for (size_t c = 0; c < channels; ++c) { |
ASSERT_GE(audio[i * channels + c], -bound); |
ASSERT_LE(audio[i * channels + c], bound); |
} |
@@ -115,7 +117,7 @@ int OpusTest::EncodeDecode(WebRtcOpusEncInst* encoder, |
int16_t* audio_type) { |
int encoded_bytes_int = WebRtcOpus_Encode( |
encoder, input_audio.data(), |
- rtc::CheckedDivExact(input_audio.size(), static_cast<size_t>(channels_)), |
+ rtc::CheckedDivExact(input_audio.size(), channels_), |
kMaxBytes, bitstream_); |
EXPECT_GE(encoded_bytes_int, 0); |
encoded_bytes_ = static_cast<size_t>(encoded_bytes_int); |
@@ -588,8 +590,7 @@ TEST_P(OpusTest, OpusDurationEstimation) { |
auto speech_block = speech_data_.GetNextBlock(); |
int encoded_bytes_int = WebRtcOpus_Encode( |
opus_encoder_, speech_block.data(), |
- rtc::CheckedDivExact(speech_block.size(), |
- 2 * static_cast<size_t>(channels_)), |
+ rtc::CheckedDivExact(speech_block.size(), 2 * channels_), |
kMaxBytes, bitstream_); |
EXPECT_GE(encoded_bytes_int, 0); |
EXPECT_EQ(kOpus10msFrameSamples, |
@@ -601,7 +602,7 @@ TEST_P(OpusTest, OpusDurationEstimation) { |
speech_block = speech_data_.GetNextBlock(); |
encoded_bytes_int = WebRtcOpus_Encode( |
opus_encoder_, speech_block.data(), |
- rtc::CheckedDivExact(speech_block.size(), static_cast<size_t>(channels_)), |
+ rtc::CheckedDivExact(speech_block.size(), channels_), |
kMaxBytes, bitstream_); |
EXPECT_GE(encoded_bytes_int, 0); |
EXPECT_EQ(kOpus20msFrameSamples, |
@@ -643,8 +644,7 @@ TEST_P(OpusTest, OpusDecodeRepacketized) { |
auto speech_block = speech_data_.GetNextBlock(); |
encoded_bytes_ = |
WebRtcOpus_Encode(opus_encoder_, speech_block.data(), |
- rtc::CheckedDivExact(speech_block.size(), |
- static_cast<size_t>(channels_)), |
+ rtc::CheckedDivExact(speech_block.size(), channels_), |
kMaxBytes, bitstream_); |
EXPECT_EQ(OPUS_OK, opus_repacketizer_cat(rp, bitstream_, encoded_bytes_)); |
} |