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

Side by Side Diff: webrtc/modules/audio_coding/test/EncodeDecodeTest.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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 28 matching lines...) Expand all
39 const FrameType /* frameType */, const uint8_t payloadType, 39 const FrameType /* frameType */, const uint8_t payloadType,
40 const uint32_t timeStamp, const uint8_t* payloadData, 40 const uint32_t timeStamp, const uint8_t* payloadData,
41 const size_t payloadSize, 41 const size_t payloadSize,
42 const RTPFragmentationHeader* /* fragmentation */) { 42 const RTPFragmentationHeader* /* fragmentation */) {
43 _rtpStream->Write(payloadType, timeStamp, _seqNo++, payloadData, payloadSize, 43 _rtpStream->Write(payloadType, timeStamp, _seqNo++, payloadData, payloadSize,
44 _frequency); 44 _frequency);
45 return 1; 45 return 1;
46 } 46 }
47 47
48 Sender::Sender() 48 Sender::Sender()
49 : _acm(NULL), 49 : _acm(nullptr), _pcmFile(), _audioFrame(), _packetization(nullptr) {}
50 _pcmFile(),
51 _audioFrame(),
52 _packetization(NULL) {
53 }
54 50
55 void Sender::Setup(AudioCodingModule *acm, RTPStream *rtpStream, 51 void Sender::Setup(AudioCodingModule *acm, RTPStream *rtpStream,
56 std::string in_file_name, int sample_rate, size_t channels) { 52 std::string in_file_name, int sample_rate, size_t channels) {
57 struct CodecInst sendCodec; 53 struct CodecInst sendCodec;
58 int noOfCodecs = acm->NumberOfCodecs(); 54 int noOfCodecs = acm->NumberOfCodecs();
59 int codecNo; 55 int codecNo;
60 56
61 // Open input file 57 // Open input file
62 const std::string file_name = webrtc::test::ResourcePath(in_file_name, "pcm"); 58 const std::string file_name = webrtc::test::ResourcePath(in_file_name, "pcm");
63 _pcmFile.Open(file_name, sample_rate, "rb"); 59 _pcmFile.Open(file_name, sample_rate, "rb");
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 if (acm->SendCodec()) { 349 if (acm->SendCodec()) {
354 _sender.Run(); 350 _sender.Run();
355 } 351 }
356 _sender.Teardown(); 352 _sender.Teardown();
357 rtpFile.Close(); 353 rtpFile.Close();
358 354
359 return fileName; 355 return fileName;
360 } 356 }
361 357
362 } // namespace webrtc 358 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698