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

Side by Side Diff: webrtc/voice_engine/test/auto_test/fixtures/before_streaming_fixture.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. Created 3 years, 10 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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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
11 #include "webrtc/test/testsupport/fileutils.h" 11 #include "webrtc/test/testsupport/fileutils.h"
12 #include "webrtc/voice_engine/test/auto_test/fixtures/before_streaming_fixture.h " 12 #include "webrtc/voice_engine/test/auto_test/fixtures/before_streaming_fixture.h "
13 13
14 BeforeStreamingFixture::BeforeStreamingFixture() 14 BeforeStreamingFixture::BeforeStreamingFixture()
15 : channel_(voe_base_->CreateChannel()), 15 : channel_(voe_base_->CreateChannel()), transport_(nullptr) {
16 transport_(NULL) {
17 EXPECT_GE(channel_, 0); 16 EXPECT_GE(channel_, 0);
18 17
19 fake_microphone_input_file_ = 18 fake_microphone_input_file_ =
20 webrtc::test::ResourcePath("voice_engine/audio_long16", "pcm"); 19 webrtc::test::ResourcePath("voice_engine/audio_long16", "pcm");
21 20
22 SetUpLocalPlayback(); 21 SetUpLocalPlayback();
23 RestartFakeMicrophone(); 22 RestartFakeMicrophone();
24 } 23 }
25 24
26 BeforeStreamingFixture::~BeforeStreamingFixture() { 25 BeforeStreamingFixture::~BeforeStreamingFixture() {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 codec.plfreq = 8000; 68 codec.plfreq = 8000;
70 codec.pltype = 0; 69 codec.pltype = 0;
71 codec.rate = 64000; 70 codec.rate = 64000;
72 #if defined(_MSC_VER) && defined(_WIN32) 71 #if defined(_MSC_VER) && defined(_WIN32)
73 _snprintf(codec.plname, RTP_PAYLOAD_NAME_SIZE - 1, "PCMU"); 72 _snprintf(codec.plname, RTP_PAYLOAD_NAME_SIZE - 1, "PCMU");
74 #else 73 #else
75 snprintf(codec.plname, RTP_PAYLOAD_NAME_SIZE, "PCMU"); 74 snprintf(codec.plname, RTP_PAYLOAD_NAME_SIZE, "PCMU");
76 #endif 75 #endif
77 voe_codec_->SetSendCodec(channel_, codec); 76 voe_codec_->SetSendCodec(channel_, codec);
78 } 77 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698