webrtc/modules/audio_coding/neteq/neteq_unittest.cc - Issue 1316523002: Convert channel counts to size_t.

Unified Diff: webrtc/modules/audio_coding/neteq/neteq_unittest.cc

Issue 1316523002: Convert channel counts to size_t. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master

Patch Set: Rebase onto cleanup change Created 5 years 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

« webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc ('K') | « webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc ('k') | webrtc/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc » ('j') | webrtc/modules/audio_coding/neteq/tools/neteq_quality_test.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/neteq/neteq_unittest.cc

diff --git a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc

index b3d6d8c7a7aabe390762ef6988265d830671a3ea..e13af512c280ed9b19e57bf32a70773a6790c2a0 100644

--- a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc

+++ b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc

@@ -426,7 +426,7 @@ void NetEqDecodingTest::Process(size_t* out_len) {

// Get audio from NetEq.

NetEqOutputType type;

- int num_channels;

+ size_t num_channels;

ASSERT_EQ(0, neteq_->GetAudio(kMaxBlockSize, out_data_, out_len,

&num_channels, &type));

ASSERT_TRUE((*out_len == kBlockSize8kHz) ||

@@ -609,7 +609,7 @@ TEST_F(NetEqDecodingTestFaxMode, TestFrameWaitingTimeStatistics) {

// Pull out all data.

for (size_t i = 0; i < num_frames; ++i) {

size_t out_len;

- int num_channels;

+ size_t num_channels;

NetEqOutputType type;

ASSERT_EQ(0, neteq_->GetAudio(kMaxBlockSize, out_data_, &out_len,

&num_channels, &type));

@@ -654,7 +654,7 @@ TEST_F(NetEqDecodingTest, TestAverageInterArrivalTimeNegative) {

// Pull out data once.

size_t out_len;

- int num_channels;

+ size_t num_channels;

NetEqOutputType type;

ASSERT_EQ(0, neteq_->GetAudio(kMaxBlockSize, out_data_, &out_len,

&num_channels, &type));

@@ -685,7 +685,7 @@ TEST_F(NetEqDecodingTest, TestAverageInterArrivalTimePositive) {

// Pull out data once.

size_t out_len;

- int num_channels;

+ size_t num_channels;

NetEqOutputType type;

ASSERT_EQ(0, neteq_->GetAudio(kMaxBlockSize, out_data_, &out_len,

&num_channels, &type));

@@ -710,7 +710,7 @@ void NetEqDecodingTest::LongCngWithClockDrift(double drift_factor,

double next_input_time_ms = 0.0;

double t_ms;

size_t out_len;

- int num_channels;

+ size_t num_channels;

NetEqOutputType type;

// Insert speech for 5 seconds.

@@ -949,7 +949,7 @@ TEST_F(NetEqDecodingTest, DISABLED_ON_ANDROID(IF_ISAC(DecoderError))) {

for (size_t i = 0; i < kMaxBlockSize; ++i) {

out_data_[i] = 1;

}

- int num_channels;

+ size_t num_channels;

size_t samples_per_channel;

EXPECT_EQ(NetEq::kFail,

neteq_->GetAudio(kMaxBlockSize, out_data_,

@@ -982,7 +982,7 @@ TEST_F(NetEqDecodingTest, GetAudioBeforeInsertPacket) {

for (size_t i = 0; i < kMaxBlockSize; ++i) {

out_data_[i] = 1;

}

- int num_channels;

+ size_t num_channels;

size_t samples_per_channel;

EXPECT_EQ(0, neteq_->GetAudio(kMaxBlockSize, out_data_,

&samples_per_channel,

@@ -1038,7 +1038,7 @@ class NetEqBgnTest : public NetEqDecodingTest {

PopulateRtpInfo(0, 0, &rtp_info);

rtp_info.header.payloadType = payload_type;

- int number_channels = 0;

+ size_t number_channels = 0;

size_t samples_per_channel = 0;

uint32_t receive_timestamp = 0;

@@ -1060,7 +1060,7 @@ class NetEqBgnTest : public NetEqDecodingTest {

&samples_per_channel,

&number_channels,

&type));

- ASSERT_EQ(1, number_channels);

+ ASSERT_EQ(1u, number_channels);

ASSERT_EQ(expected_samples_per_channel, samples_per_channel);

ASSERT_EQ(kOutputNormal, type);

@@ -1082,7 +1082,7 @@ class NetEqBgnTest : public NetEqDecodingTest {

&samples_per_channel,

&number_channels,

&type));

- ASSERT_EQ(1, number_channels);

+ ASSERT_EQ(1u, number_channels);

ASSERT_EQ(expected_samples_per_channel, samples_per_channel);

// To be able to test the fading of background noise we need at lease to

@@ -1103,7 +1103,7 @@ class NetEqBgnTest : public NetEqDecodingTest {

&samples_per_channel,

&number_channels,

&type));

- ASSERT_EQ(1, number_channels);

+ ASSERT_EQ(1u, number_channels);

ASSERT_EQ(expected_samples_per_channel, samples_per_channel);

if (type == kOutputPLCtoCNG) {

plc_to_cng = true;

@@ -1270,7 +1270,7 @@ TEST_F(NetEqDecodingTest, SyncPacketDecode) {

// Insert some packets which decode to noise. We are not interested in

// actual decoded values.

NetEqOutputType output_type;

- int num_channels;

+ size_t num_channels;

size_t samples_per_channel;

uint32_t receive_timestamp = 0;

for (int n = 0; n < 100; ++n) {

@@ -1279,7 +1279,7 @@ TEST_F(NetEqDecodingTest, SyncPacketDecode) {

&samples_per_channel, &num_channels,

&output_type));

ASSERT_EQ(kBlockSize16kHz, samples_per_channel);

- ASSERT_EQ(1, num_channels);

+ ASSERT_EQ(1u, num_channels);

rtp_info.header.sequenceNumber++;

rtp_info.header.timestamp += kBlockSize16kHz;

@@ -1297,7 +1297,7 @@ TEST_F(NetEqDecodingTest, SyncPacketDecode) {

&samples_per_channel, &num_channels,

&output_type));

ASSERT_EQ(kBlockSize16kHz, samples_per_channel);

- ASSERT_EQ(1, num_channels);

+ ASSERT_EQ(1u, num_channels);

if (n > algorithmic_frame_delay) {

EXPECT_TRUE(IsAllZero(decoded, samples_per_channel * num_channels));

}

@@ -1346,7 +1346,7 @@ TEST_F(NetEqDecodingTest, SyncPacketBufferSizeAndOverridenByNetworkPackets) {

// Insert some packets which decode to noise. We are not interested in

// actual decoded values.

NetEqOutputType output_type;

- int num_channels;

+ size_t num_channels;

size_t samples_per_channel;

uint32_t receive_timestamp = 0;

int algorithmic_frame_delay = algorithmic_delay_ms_ / 10 + 1;

@@ -1356,7 +1356,7 @@ TEST_F(NetEqDecodingTest, SyncPacketBufferSizeAndOverridenByNetworkPackets) {

&samples_per_channel, &num_channels,

&output_type));

ASSERT_EQ(kBlockSize16kHz, samples_per_channel);

- ASSERT_EQ(1, num_channels);

+ ASSERT_EQ(1u, num_channels);

rtp_info.header.sequenceNumber++;

rtp_info.header.timestamp += kBlockSize16kHz;

receive_timestamp += kBlockSize16kHz;

@@ -1395,7 +1395,7 @@ TEST_F(NetEqDecodingTest, SyncPacketBufferSizeAndOverridenByNetworkPackets) {

&samples_per_channel, &num_channels,

&output_type));

ASSERT_EQ(kBlockSize16kHz, samples_per_channel);

- ASSERT_EQ(1, num_channels);

+ ASSERT_EQ(1u, num_channels);

EXPECT_TRUE(IsAllNonZero(decoded, samples_per_channel * num_channels));

}

@@ -1413,7 +1413,7 @@ void NetEqDecodingTest::WrapTest(uint16_t start_seq_no,

const size_t kPayloadBytes = kSamples * sizeof(int16_t);

double next_input_time_ms = 0.0;

int16_t decoded[kBlockSize16kHz];

- int num_channels;

+ size_t num_channels;

size_t samples_per_channel;

NetEqOutputType output_type;

uint32_t receive_timestamp = 0;

@@ -1466,7 +1466,7 @@ void NetEqDecodingTest::WrapTest(uint16_t start_seq_no,

&samples_per_channel, &num_channels,

&output_type));

ASSERT_EQ(kBlockSize16kHz, samples_per_channel);

- ASSERT_EQ(1, num_channels);

+ ASSERT_EQ(1u, num_channels);

// Expect delay (in samples) to be less than 2 packets.

EXPECT_LE(timestamp - PlayoutTimestamp(),

@@ -1517,7 +1517,7 @@ void NetEqDecodingTest::DuplicateCng() {

// Insert three speech packets. Three are needed to get the frame length

// correct.

size_t out_len;

- int num_channels;

+ size_t num_channels;

NetEqOutputType type;

uint8_t payload[kPayloadBytes] = {0};

WebRtcRTPHeader rtp_info;

@@ -1620,7 +1620,7 @@ TEST_F(NetEqDecodingTest, CngFirst) {

// Pull audio once and make sure CNG is played.

size_t out_len;

- int num_channels;

+ size_t num_channels;

NetEqOutputType type;

ASSERT_EQ(0, neteq_->GetAudio(kMaxBlockSize, out_data_, &out_len,

&num_channels, &type));