From 4c8b93091d9225587d7b78a939225a3d3f7fed66 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Tue, 10 Mar 2015 12:55:17 +0000 Subject: [PATCH] Zero-initialize all members of EncodedFrame. ntp_time_ms_ was missing in the default constructor, these things are very easy to miss, so adding C++11-style initialization instead. This also reduces init-list duplication. BUG= R=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/44609004 Cr-Commit-Position: refs/heads/master@{#8669} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8669 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/video_frame.h | 37 +++++++++---------------------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/webrtc/video_frame.h b/webrtc/video_frame.h index 385907278..98743e9b3 100644 --- a/webrtc/video_frame.h +++ b/webrtc/video_frame.h @@ -174,41 +174,22 @@ enum VideoFrameType { // TODO(pbos): Rename EncodedFrame and reformat this class' members. class EncodedImage { public: - EncodedImage() - : _encodedWidth(0), - _encodedHeight(0), - _timeStamp(0), - capture_time_ms_(0), - _frameType(kDeltaFrame), - _buffer(NULL), - _length(0), - _size(0), - _completeFrame(false) {} - + EncodedImage() : EncodedImage(nullptr, 0, 0) {} EncodedImage(uint8_t* buffer, size_t length, size_t size) - : _encodedWidth(0), - _encodedHeight(0), - _timeStamp(0), - ntp_time_ms_(0), - capture_time_ms_(0), - _frameType(kDeltaFrame), - _buffer(buffer), - _length(length), - _size(size), - _completeFrame(false) {} + : _buffer(buffer), _length(length), _size(size) {} - uint32_t _encodedWidth; - uint32_t _encodedHeight; - uint32_t _timeStamp; + uint32_t _encodedWidth = 0; + uint32_t _encodedHeight = 0; + uint32_t _timeStamp = 0; // NTP time of the capture time in local timebase in milliseconds. - int64_t ntp_time_ms_; - int64_t capture_time_ms_; + int64_t ntp_time_ms_ = 0; + int64_t capture_time_ms_ = 0; // TODO(pbos): Use webrtc::FrameType directly (and remove VideoFrameType). - VideoFrameType _frameType; + VideoFrameType _frameType = kDeltaFrame; uint8_t* _buffer; size_t _length; size_t _size; - bool _completeFrame; + bool _completeFrame = false; }; } // namespace webrtc