Index: webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.cc |
diff --git a/webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.cc b/webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.cc |
index 3d44fbcb25377e59d50a2eec9130bded64668fac..849dc8fb9a40037c001cd09e0885e06adda3aeed 100644 |
--- a/webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.cc |
+++ b/webrtc/modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.cc |
@@ -24,18 +24,16 @@ const int NETEQTEST_RTPpacket::_kRDHeaderLen = 8; |
const int NETEQTEST_RTPpacket::_kBasicHeaderLen = 12; |
NETEQTEST_RTPpacket::NETEQTEST_RTPpacket() |
-: |
-_datagram(NULL), |
-_payloadPtr(NULL), |
-_memSize(0), |
-_datagramLen(-1), |
-_payloadLen(0), |
-_rtpParsed(false), |
-_receiveTime(0), |
-_lost(false) |
-{ |
- memset(&_rtpInfo, 0, sizeof(_rtpInfo)); |
- _blockList.clear(); |
+ : _datagram(nullptr), |
+ _payloadPtr(nullptr), |
+ _memSize(0), |
+ _datagramLen(-1), |
+ _payloadLen(0), |
+ _rtpParsed(false), |
+ _receiveTime(0), |
+ _lost(false) { |
+ memset(&_rtpInfo, 0, sizeof(_rtpInfo)); |
+ _blockList.clear(); |
} |
NETEQTEST_RTPpacket::~NETEQTEST_RTPpacket() |
@@ -51,11 +49,11 @@ void NETEQTEST_RTPpacket::reset() |
if(_datagram) { |
delete [] _datagram; |
} |
- _datagram = NULL; |
+ _datagram = nullptr; |
_memSize = 0; |
_datagramLen = -1; |
_payloadLen = 0; |
- _payloadPtr = NULL; |
+ _payloadPtr = nullptr; |
_receiveTime = 0; |
memset(&_rtpInfo, 0, sizeof(_rtpInfo)); |
_rtpParsed = false; |
@@ -70,8 +68,8 @@ int NETEQTEST_RTPpacket::skipFileHeader(FILE *fp) |
const int kFirstLineLength = 40; |
char firstline[kFirstLineLength]; |
- if (fgets(firstline, kFirstLineLength, fp) == NULL) { |
- return -1; |
+ if (fgets(firstline, kFirstLineLength, fp) == nullptr) { |
+ return -1; |
} |
if (strncmp(firstline, "#!rtpplay", 9) == 0) { |
if (strncmp(firstline, "#!rtpplay1.0", 12) != 0) { |
@@ -301,7 +299,7 @@ const webrtc::WebRtcRTPHeader* NETEQTEST_RTPpacket::RTPinfo() const |
} |
else |
{ |
- return NULL; |
+ return nullptr; |
} |
} |
@@ -313,7 +311,7 @@ uint8_t * NETEQTEST_RTPpacket::datagram() const |
} |
else |
{ |
- return NULL; |
+ return nullptr; |
} |
} |
@@ -325,7 +323,7 @@ uint8_t * NETEQTEST_RTPpacket::payload() const |
} |
else |
{ |
- return NULL; |
+ return nullptr; |
} |
} |