Index: webrtc/modules/video_coding/jitter_buffer.cc |
diff --git a/webrtc/modules/video_coding/jitter_buffer.cc b/webrtc/modules/video_coding/jitter_buffer.cc |
index 345bdf7e1a44fba1b4e0aaf80418db1edd594e7e..6d05bd2962aa757beeaa6b5ba83253696991881b 100644 |
--- a/webrtc/modules/video_coding/jitter_buffer.cc |
+++ b/webrtc/modules/video_coding/jitter_buffer.cc |
@@ -60,7 +60,7 @@ void FrameList::InsertFrame(VCMFrameBuffer* frame) { |
VCMFrameBuffer* FrameList::PopFrame(uint32_t timestamp) { |
FrameList::iterator it = find(timestamp); |
if (it == end()) |
- return NULL; |
+ return nullptr; |
VCMFrameBuffer* frame = it->second; |
erase(it); |
return frame; |
@@ -531,7 +531,7 @@ bool VCMJitterBuffer::NextMaybeIncompleteTimestamp(uint32_t* timestamp) { |
VCMEncodedFrame* VCMJitterBuffer::ExtractAndSetDecode(uint32_t timestamp) { |
CriticalSectionScoped cs(crit_sect_); |
if (!running_) { |
- return NULL; |
+ return nullptr; |
} |
// Extract the frame with the desired timestamp. |
VCMFrameBuffer* frame = decodable_frames_.PopFrame(timestamp); |
@@ -541,7 +541,7 @@ VCMEncodedFrame* VCMJitterBuffer::ExtractAndSetDecode(uint32_t timestamp) { |
if (frame) |
continuous = last_decoded_state_.ContinuousFrame(frame); |
else |
- return NULL; |
+ return nullptr; |
} |
TRACE_EVENT_ASYNC_STEP0("webrtc", "Video", timestamp, "Extract"); |
// Frame pulled out from jitter buffer, update the jitter estimate. |
@@ -593,20 +593,20 @@ VCMFrameBufferEnum VCMJitterBuffer::GetFrame(const VCMPacket& packet, |
VCMFrameBuffer** frame, |
FrameList** frame_list) { |
*frame = incomplete_frames_.PopFrame(packet.timestamp); |
- if (*frame != NULL) { |
+ if (*frame != nullptr) { |
*frame_list = &incomplete_frames_; |
return kNoError; |
} |
*frame = decodable_frames_.PopFrame(packet.timestamp); |
- if (*frame != NULL) { |
+ if (*frame != nullptr) { |
*frame_list = &decodable_frames_; |
return kNoError; |
} |
- *frame_list = NULL; |
+ *frame_list = nullptr; |
// No match, return empty frame. |
*frame = GetEmptyFrame(); |
- if (*frame == NULL) { |
+ if (*frame == nullptr) { |
// No free frame! Try to reclaim some... |
LOG(LS_WARNING) << "Unable to get empty frame; Recycling."; |
bool found_key_frame = RecycleFramesUntilKeyFrame(); |
@@ -645,7 +645,7 @@ VCMFrameBufferEnum VCMJitterBuffer::InsertPacket(const VCMPacket& packet, |
if (packet.sizeBytes > 0) { |
num_discarded_packets_++; |
num_consecutive_old_packets_++; |
- if (stats_callback_ != NULL) |
+ if (stats_callback_ != nullptr) |
stats_callback_->OnDiscardedPacketsUpdated(num_discarded_packets_); |
} |
// Update last decoded sequence number if the packet arrived late and |
@@ -791,7 +791,7 @@ VCMFrameBufferEnum VCMJitterBuffer::InsertPacket(const VCMPacket& packet, |
case kOutOfBoundsPacket: |
case kDuplicatePacket: { |
// Put back the frame where it came from. |
- if (frame_list != NULL) { |
+ if (frame_list != nullptr) { |
frame_list->InsertFrame(frame); |
} else { |
RecycleFrameBuffer(frame); |
@@ -1033,7 +1033,7 @@ VCMFrameBuffer* VCMJitterBuffer::NextFrame() const { |
return decodable_frames_.Front(); |
if (!incomplete_frames_.empty()) |
return incomplete_frames_.Front(); |
- return NULL; |
+ return nullptr; |
} |
bool VCMJitterBuffer::UpdateNackList(uint16_t sequence_number) { |
@@ -1131,7 +1131,7 @@ void VCMJitterBuffer::RegisterStatsCallback( |
VCMFrameBuffer* VCMJitterBuffer::GetEmptyFrame() { |
if (free_frames_.empty()) { |
if (!TryToIncreaseJitterBufferSize()) { |
- return NULL; |
+ return nullptr; |
} |
} |
VCMFrameBuffer* frame = free_frames_.front(); |
@@ -1204,7 +1204,7 @@ void VCMJitterBuffer::CountFrame(const VCMFrameBuffer& frame) { |
++receive_statistics_.delta_frames; |
} |
- if (stats_callback_ != NULL) |
+ if (stats_callback_ != nullptr) |
stats_callback_->OnFrameCountsUpdated(receive_statistics_); |
} |
} |