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

Side by Side Diff: webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.cc

Issue 1230503003: Update a ton of audio code to use size_t more correctly and in general reduce (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Resync Created 5 years, 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 25 matching lines...) Expand all
36 void NetEqExternalDecoderTest::InsertPacket(WebRtcRTPHeader rtp_header, 36 void NetEqExternalDecoderTest::InsertPacket(WebRtcRTPHeader rtp_header,
37 const uint8_t* payload, 37 const uint8_t* payload,
38 size_t payload_size_bytes, 38 size_t payload_size_bytes,
39 uint32_t receive_timestamp) { 39 uint32_t receive_timestamp) {
40 ASSERT_EQ( 40 ASSERT_EQ(
41 NetEq::kOK, 41 NetEq::kOK,
42 neteq_->InsertPacket( 42 neteq_->InsertPacket(
43 rtp_header, payload, payload_size_bytes, receive_timestamp)); 43 rtp_header, payload, payload_size_bytes, receive_timestamp));
44 } 44 }
45 45
46 int NetEqExternalDecoderTest::GetOutputAudio(size_t max_length, 46 size_t NetEqExternalDecoderTest::GetOutputAudio(size_t max_length,
47 int16_t* output, 47 int16_t* output,
48 NetEqOutputType* output_type) { 48 NetEqOutputType* output_type) {
49 // Get audio from regular instance. 49 // Get audio from regular instance.
50 int samples_per_channel; 50 size_t samples_per_channel;
51 int num_channels; 51 int num_channels;
52 EXPECT_EQ(NetEq::kOK, 52 EXPECT_EQ(NetEq::kOK,
53 neteq_->GetAudio(max_length, 53 neteq_->GetAudio(max_length,
54 output, 54 output,
55 &samples_per_channel, 55 &samples_per_channel,
56 &num_channels, 56 &num_channels,
57 output_type)); 57 output_type));
58 EXPECT_EQ(channels_, num_channels); 58 EXPECT_EQ(channels_, num_channels);
59 EXPECT_EQ(kOutputLengthMs * sample_rate_hz_ / 1000, samples_per_channel); 59 EXPECT_EQ(static_cast<size_t>(kOutputLengthMs * sample_rate_hz_ / 1000),
60 samples_per_channel);
60 return samples_per_channel; 61 return samples_per_channel;
61 } 62 }
62 63
63 } // namespace test 64 } // namespace test
64 } // namespace webrtc 65 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698