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

Side by Side Diff: webrtc/audio/audio_receive_stream_unittest.cc

Issue 2719733002: Replace NULL with nullptr or null in webrtc/audio/ and common_audio/. (Closed)
Patch Set: Fixing test. Created 3 years, 9 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
« no previous file with comments | « webrtc/audio/audio_receive_stream.cc ('k') | webrtc/audio/audio_send_stream_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 AudioReceiveStream::Config config; 218 AudioReceiveStream::Config config;
219 config.rtp.remote_ssrc = kRemoteSsrc; 219 config.rtp.remote_ssrc = kRemoteSsrc;
220 config.rtp.local_ssrc = kLocalSsrc; 220 config.rtp.local_ssrc = kLocalSsrc;
221 config.voe_channel_id = kChannelId; 221 config.voe_channel_id = kChannelId;
222 config.rtp.extensions.push_back( 222 config.rtp.extensions.push_back(
223 RtpExtension(RtpExtension::kAudioLevelUri, kAudioLevelId)); 223 RtpExtension(RtpExtension::kAudioLevelUri, kAudioLevelId));
224 EXPECT_EQ( 224 EXPECT_EQ(
225 "{rtp: {remote_ssrc: 1234, local_ssrc: 5678, transport_cc: off, nack: " 225 "{rtp: {remote_ssrc: 1234, local_ssrc: 5678, transport_cc: off, nack: "
226 "{rtp_history_ms: 0}, extensions: [{uri: " 226 "{rtp_history_ms: 0}, extensions: [{uri: "
227 "urn:ietf:params:rtp-hdrext:ssrc-audio-level, id: 3}]}, " 227 "urn:ietf:params:rtp-hdrext:ssrc-audio-level, id: 3}]}, "
228 "rtcp_send_transport: nullptr, voe_channel_id: 2}", 228 "rtcp_send_transport: null, voe_channel_id: 2}",
229 config.ToString()); 229 config.ToString());
230 } 230 }
231 231
232 TEST(AudioReceiveStreamTest, ConstructDestruct) { 232 TEST(AudioReceiveStreamTest, ConstructDestruct) {
233 ConfigHelper helper; 233 ConfigHelper helper;
234 internal::AudioReceiveStream recv_stream( 234 internal::AudioReceiveStream recv_stream(
235 helper.packet_router(), 235 helper.packet_router(),
236 helper.config(), helper.audio_state(), helper.event_log()); 236 helper.config(), helper.audio_state(), helper.event_log());
237 } 237 }
238 238
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 346
347 EXPECT_CALL(helper.voice_engine(), StartPlayout(_)).WillOnce(Return(0)); 347 EXPECT_CALL(helper.voice_engine(), StartPlayout(_)).WillOnce(Return(0));
348 EXPECT_CALL(helper.voice_engine(), StopPlayout(_)); 348 EXPECT_CALL(helper.voice_engine(), StopPlayout(_));
349 EXPECT_CALL(*helper.audio_mixer(), AddSource(&recv_stream)) 349 EXPECT_CALL(*helper.audio_mixer(), AddSource(&recv_stream))
350 .WillOnce(Return(true)); 350 .WillOnce(Return(true));
351 351
352 recv_stream.Start(); 352 recv_stream.Start();
353 } 353 }
354 } // namespace test 354 } // namespace test
355 } // namespace webrtc 355 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/audio/audio_receive_stream.cc ('k') | webrtc/audio/audio_send_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698