Chromium Code Reviews

Side by Side Diff: webrtc/modules/audio_coding/test/RTPFile.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.
Jump to:
View unified diff |
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 104 matching lines...)
115 } 115 }
116 116
117 bool RTPBuffer::EndOfFile() const { 117 bool RTPBuffer::EndOfFile() const {
118 _queueRWLock->AcquireLockShared(); 118 _queueRWLock->AcquireLockShared();
119 bool eof = _rtpQueue.empty(); 119 bool eof = _rtpQueue.empty();
120 _queueRWLock->ReleaseLockShared(); 120 _queueRWLock->ReleaseLockShared();
121 return eof; 121 return eof;
122 } 122 }
123 123
124 void RTPFile::Open(const char *filename, const char *mode) { 124 void RTPFile::Open(const char *filename, const char *mode) {
125 if ((_rtpFile = fopen(filename, mode)) == NULL) { 125 if ((_rtpFile = fopen(filename, mode)) == nullptr) {
126 printf("Cannot write file %s.\n", filename); 126 printf("Cannot write file %s.\n", filename);
127 ADD_FAILURE() << "Unable to write file"; 127 ADD_FAILURE() << "Unable to write file";
128 exit(1); 128 exit(1);
129 } 129 }
130 } 130 }
131 131
132 void RTPFile::Close() { 132 void RTPFile::Close() {
133 if (_rtpFile != NULL) { 133 if (_rtpFile != nullptr) {
134 fclose(_rtpFile); 134 fclose(_rtpFile);
135 _rtpFile = NULL; 135 _rtpFile = nullptr;
136 } 136 }
137 } 137 }
138 138
139 void RTPFile::WriteHeader() { 139 void RTPFile::WriteHeader() {
140 // Write data in a format that NetEQ and RTP Play can parse 140 // Write data in a format that NetEQ and RTP Play can parse
141 fprintf(_rtpFile, "#!RTPencode%s\n", "1.0"); 141 fprintf(_rtpFile, "#!RTPencode%s\n", "1.0");
142 uint32_t dummy_variable = 0; 142 uint32_t dummy_variable = 0;
143 // should be converted to network endian format, but does not matter when 0 143 // should be converted to network endian format, but does not matter when 0
144 EXPECT_EQ(1u, fwrite(&dummy_variable, 4, 1, _rtpFile)); 144 EXPECT_EQ(1u, fwrite(&dummy_variable, 4, 1, _rtpFile));
145 EXPECT_EQ(1u, fwrite(&dummy_variable, 4, 1, _rtpFile)); 145 EXPECT_EQ(1u, fwrite(&dummy_variable, 4, 1, _rtpFile));
(...skipping 72 matching lines...)
218 } 218 }
219 if (payloadSize < static_cast<size_t>((lengthBytes - 20))) { 219 if (payloadSize < static_cast<size_t>((lengthBytes - 20))) {
220 return 0; 220 return 0;
221 } 221 }
222 lengthBytes -= 20; 222 lengthBytes -= 20;
223 EXPECT_EQ(lengthBytes, fread(payloadData, 1, lengthBytes, _rtpFile)); 223 EXPECT_EQ(lengthBytes, fread(payloadData, 1, lengthBytes, _rtpFile));
224 return lengthBytes; 224 return lengthBytes;
225 } 225 }
226 226
227 } // namespace webrtc 227 } // namespace webrtc
OLDNEW

Powered by Google App Engine