Index: webrtc/modules/video_coding/decoding_state.cc |
diff --git a/webrtc/modules/video_coding/decoding_state.cc b/webrtc/modules/video_coding/decoding_state.cc |
index 0c45ae3b397583f3cf13472a90ebedb721b2844b..4ff1a2c873c6ff279868a25c81b98b103dd3ed82 100644 |
--- a/webrtc/modules/video_coding/decoding_state.cc |
+++ b/webrtc/modules/video_coding/decoding_state.cc |
@@ -55,21 +55,21 @@ uint16_t VCMDecodingState::sequence_num() const { |
} |
bool VCMDecodingState::IsOldFrame(const VCMFrameBuffer* frame) const { |
- assert(frame != NULL); |
+ assert(frame != nullptr); |
if (in_initial_state_) |
return false; |
return !IsNewerTimestamp(frame->TimeStamp(), time_stamp_); |
} |
bool VCMDecodingState::IsOldPacket(const VCMPacket* packet) const { |
- assert(packet != NULL); |
+ assert(packet != nullptr); |
if (in_initial_state_) |
return false; |
return !IsNewerTimestamp(packet->timestamp, time_stamp_); |
} |
void VCMDecodingState::SetState(const VCMFrameBuffer* frame) { |
- assert(frame != NULL && frame->GetHighSeqNum() >= 0); |
+ assert(frame != nullptr && frame->GetHighSeqNum() >= 0); |
if (!UsingFlexibleMode(frame)) |
UpdateSyncState(frame); |
sequence_num_ = static_cast<uint16_t>(frame->GetHighSeqNum()); |
@@ -150,7 +150,7 @@ bool VCMDecodingState::UpdateEmptyFrame(const VCMFrameBuffer* frame) { |
} |
void VCMDecodingState::UpdateOldPacket(const VCMPacket* packet) { |
- assert(packet != NULL); |
+ assert(packet != nullptr); |
if (packet->timestamp == time_stamp_) { |
// Late packet belonging to the last decoded frame - make sure we update the |
// last decoded sequence number. |
@@ -203,7 +203,7 @@ bool VCMDecodingState::ContinuousFrame(const VCMFrameBuffer* frame) const { |
// - Sequence numbers. |
// Return true when in initial state. |
// Note that when a method is not applicable it will return false. |
- assert(frame != NULL); |
+ assert(frame != nullptr); |
// A key frame is always considered continuous as it doesn't refer to any |
// frames and therefore won't introduce any errors even if prior frames are |
// missing. |