Index: webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator.cc |
diff --git a/webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator.cc b/webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator.cc |
index 9721a7e9ac5b5b0058d3a7159aed678e8af4958a..4a8c9b8ec8df01639ea36917f4aa91ff618c51f5 100644 |
--- a/webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator.cc |
+++ b/webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator.cc |
@@ -11,7 +11,7 @@ |
#include "webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator.h" |
#include <assert.h> |
-#include <stdlib.h> // NULL |
+#include <stdlib.h> // nullptr |
#include <algorithm> |
#include <limits> |
@@ -31,14 +31,14 @@ PartitionTreeNode::PartitionTreeNode(PartitionTreeNode* parent, |
packet_start_(false) { |
// If |this_size_| > INT_MAX, Cost() and CreateChildren() won't work properly. |
assert(this_size_ <= static_cast<size_t>(std::numeric_limits<int>::max())); |
- children_[kLeftChild] = NULL; |
- children_[kRightChild] = NULL; |
+ children_[kLeftChild] = nullptr; |
+ children_[kRightChild] = nullptr; |
} |
PartitionTreeNode* PartitionTreeNode::CreateRootNode(const size_t* size_vector, |
size_t num_partitions) { |
PartitionTreeNode* root_node = new PartitionTreeNode( |
- NULL, &size_vector[1], num_partitions - 1, size_vector[0]); |
+ nullptr, &size_vector[1], num_partitions - 1, size_vector[0]); |
root_node->set_packet_start(true); |
return root_node; |
} |
@@ -92,7 +92,7 @@ bool PartitionTreeNode::CreateChildren(size_t max_size) { |
} |
size_t PartitionTreeNode::NumPackets() { |
- if (parent_ == NULL) { |
+ if (parent_ == nullptr) { |
// Root node is a "right" child by definition. |
return 1; |
} |
@@ -110,13 +110,13 @@ PartitionTreeNode* PartitionTreeNode::GetOptimalNode(size_t max_size, |
CreateChildren(max_size); |
PartitionTreeNode* left = children_[kLeftChild]; |
PartitionTreeNode* right = children_[kRightChild]; |
- if ((left == NULL) && (right == NULL)) { |
+ if ((left == nullptr) && (right == nullptr)) { |
// This is a solution node; return it. |
return this; |
- } else if (left == NULL) { |
+ } else if (left == nullptr) { |
// One child empty, return the other. |
return right->GetOptimalNode(max_size, penalty); |
- } else if (right == NULL) { |
+ } else if (right == nullptr) { |
// One child empty, return the other. |
return left->GetOptimalNode(max_size, penalty); |
} else { |
@@ -145,7 +145,7 @@ Vp8PartitionAggregator::Vp8PartitionAggregator( |
const RTPFragmentationHeader& fragmentation, |
size_t first_partition_idx, |
size_t last_partition_idx) |
- : root_(NULL), |
+ : root_(nullptr), |
num_partitions_(last_partition_idx - first_partition_idx + 1), |
size_vector_(new size_t[num_partitions_]), |
largest_partition_size_(0) { |
@@ -184,7 +184,7 @@ Vp8PartitionAggregator::FindOptimalConfiguration(size_t max_size, |
size_t packet_index = opt->NumPackets(); |
for (size_t i = num_partitions_; i > 0; --i) { |
assert(packet_index > 0); |
- assert(temp_node != NULL); |
+ assert(temp_node != nullptr); |
config_vector[i - 1] = packet_index - 1; |
if (temp_node->packet_start()) |
--packet_index; |