Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(181)

Side by Side Diff: webrtc/modules/video_coding/packet.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/modules/video_coding/packet.h" 11 #include "webrtc/modules/video_coding/packet.h"
12 12
13 #include <assert.h> 13 #include <assert.h>
14 14
15 #include "webrtc/modules/include/module_common_types.h" 15 #include "webrtc/modules/include/module_common_types.h"
16 16
17 namespace webrtc { 17 namespace webrtc {
18 18
19 VCMPacket::VCMPacket() 19 VCMPacket::VCMPacket()
20 : payloadType(0), 20 : payloadType(0),
21 timestamp(0), 21 timestamp(0),
22 ntp_time_ms_(0), 22 ntp_time_ms_(0),
23 seqNum(0), 23 seqNum(0),
24 dataPtr(NULL), 24 dataPtr(nullptr),
25 sizeBytes(0), 25 sizeBytes(0),
26 markerBit(false), 26 markerBit(false),
27 timesNacked(-1), 27 timesNacked(-1),
28 frameType(kEmptyFrame), 28 frameType(kEmptyFrame),
29 codec(kVideoCodecUnknown), 29 codec(kVideoCodecUnknown),
30 is_first_packet_in_frame(false), 30 is_first_packet_in_frame(false),
31 completeNALU(kNaluUnset), 31 completeNALU(kNaluUnset),
32 insertStartCode(false), 32 insertStartCode(false),
33 width(0), 33 width(0),
34 height(0), 34 height(0),
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 } else { 66 } else {
67 video_header.playout_delay = {-1, -1}; 67 video_header.playout_delay = {-1, -1};
68 } 68 }
69 } 69 }
70 70
71 void VCMPacket::Reset() { 71 void VCMPacket::Reset() {
72 payloadType = 0; 72 payloadType = 0;
73 timestamp = 0; 73 timestamp = 0;
74 ntp_time_ms_ = 0; 74 ntp_time_ms_ = 0;
75 seqNum = 0; 75 seqNum = 0;
76 dataPtr = NULL; 76 dataPtr = nullptr;
77 sizeBytes = 0; 77 sizeBytes = 0;
78 markerBit = false; 78 markerBit = false;
79 timesNacked = -1; 79 timesNacked = -1;
80 frameType = kEmptyFrame; 80 frameType = kEmptyFrame;
81 codec = kVideoCodecUnknown; 81 codec = kVideoCodecUnknown;
82 is_first_packet_in_frame = false; 82 is_first_packet_in_frame = false;
83 completeNALU = kNaluUnset; 83 completeNALU = kNaluUnset;
84 insertStartCode = false; 84 insertStartCode = false;
85 width = 0; 85 width = 0;
86 height = 0; 86 height = 0;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 codec = kVideoCodecH264; 133 codec = kVideoCodecH264;
134 return; 134 return;
135 case kRtpVideoGeneric: 135 case kRtpVideoGeneric:
136 case kRtpVideoNone: 136 case kRtpVideoNone:
137 codec = kVideoCodecUnknown; 137 codec = kVideoCodecUnknown;
138 return; 138 return;
139 } 139 }
140 } 140 }
141 141
142 } // namespace webrtc 142 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698