Index: webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc |
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc |
index a038d47179d441b877974ad32115724df7871bae..ea4583915203bb634930f5166a651d5774c24b96 100644 |
--- a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc |
+++ b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc |
@@ -25,7 +25,7 @@ int ParseVP8PictureID(RTPVideoHeaderVP8* vp8, |
const uint8_t** data, |
size_t* data_length, |
size_t* parsed_bytes) { |
- assert(vp8 != NULL); |
+ assert(vp8 != nullptr); |
if (*data_length == 0) |
return -1; |
@@ -48,7 +48,7 @@ int ParseVP8Tl0PicIdx(RTPVideoHeaderVP8* vp8, |
const uint8_t** data, |
size_t* data_length, |
size_t* parsed_bytes) { |
- assert(vp8 != NULL); |
+ assert(vp8 != nullptr); |
if (*data_length == 0) |
return -1; |
@@ -65,7 +65,7 @@ int ParseVP8TIDAndKeyIdx(RTPVideoHeaderVP8* vp8, |
size_t* parsed_bytes, |
bool has_tid, |
bool has_key_idx) { |
- assert(vp8 != NULL); |
+ assert(vp8 != nullptr); |
if (*data_length == 0) |
return -1; |
@@ -85,7 +85,7 @@ int ParseVP8TIDAndKeyIdx(RTPVideoHeaderVP8* vp8, |
int ParseVP8Extension(RTPVideoHeaderVP8* vp8, |
const uint8_t* data, |
size_t data_length) { |
- assert(vp8 != NULL); |
+ assert(vp8 != nullptr); |
assert(data_length > 0); |
size_t parsed_bytes = 0; |
// Optional X field is present. |
@@ -124,7 +124,7 @@ int ParseVP8Extension(RTPVideoHeaderVP8* vp8, |
int ParseVP8FrameSize(RtpDepacketizer::ParsedPayload* parsed_payload, |
const uint8_t* data, |
size_t data_length) { |
- assert(parsed_payload != NULL); |
+ assert(parsed_payload != nullptr); |
if (parsed_payload->frame_type != kVideoFrameKey) { |
// Included in payload header for I-frames. |
return 0; |
@@ -151,7 +151,7 @@ const bool RtpPacketizerVp8::separate_first_modes_[kNumModes] = {true, false, |
RtpPacketizerVp8::RtpPacketizerVp8(const RTPVideoHeaderVP8& hdr_info, |
size_t max_payload_len, |
VP8PacketizerMode mode) |
- : payload_data_(NULL), |
+ : payload_data_(nullptr), |
payload_size_(0), |
vp8_fixed_payload_descriptor_bytes_(1), |
aggr_mode_(aggr_modes_[mode]), |
@@ -160,12 +160,11 @@ RtpPacketizerVp8::RtpPacketizerVp8(const RTPVideoHeaderVP8& hdr_info, |
hdr_info_(hdr_info), |
num_partitions_(0), |
max_payload_len_(max_payload_len), |
- packets_calculated_(false) { |
-} |
+ packets_calculated_(false) {} |
RtpPacketizerVp8::RtpPacketizerVp8(const RTPVideoHeaderVP8& hdr_info, |
size_t max_payload_len) |
- : payload_data_(NULL), |
+ : payload_data_(nullptr), |
payload_size_(0), |
part_info_(), |
vp8_fixed_payload_descriptor_bytes_(1), |
@@ -175,8 +174,7 @@ RtpPacketizerVp8::RtpPacketizerVp8(const RTPVideoHeaderVP8& hdr_info, |
hdr_info_(hdr_info), |
num_partitions_(0), |
max_payload_len_(max_payload_len), |
- packets_calculated_(false) { |
-} |
+ packets_calculated_(false) {} |
RtpPacketizerVp8::~RtpPacketizerVp8() { |
} |
@@ -669,7 +667,7 @@ bool RtpPacketizerVp8::TL0PicIdxFieldPresent() const { |
bool RtpDepacketizerVp8::Parse(ParsedPayload* parsed_payload, |
const uint8_t* payload_data, |
size_t payload_data_length) { |
- assert(parsed_payload != NULL); |
+ assert(parsed_payload != nullptr); |
if (payload_data_length == 0) { |
LOG(LS_ERROR) << "Empty payload."; |
return false; |