generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Zero-initialize all members of EncodedFrame.

Browse Source 
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
This commit is contained in:
pbos@webrtc.org 2015-03-10 12:55:17 +00:00
parent 74d4792af5
commit 4c8b93091d
1 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
webrtc/video_frame.h
View File

@ -174,41 +174,22 @@ enum VideoFrameType {
// TODO(pbos): Rename EncodedFrame and reformat this class' members. // TODO(pbos): Rename EncodedFrame and reformat this class' members.
class EncodedImage { class EncodedImage {
public: public:
EncodedImage() EncodedImage() : EncodedImage(nullptr, 0, 0) {}
: _encodedWidth(0),
_encodedHeight(0),
_timeStamp(0),
capture_time_ms_(0),
_frameType(kDeltaFrame),
_buffer(NULL),
_length(0),
_size(0),
_completeFrame(false) {}
EncodedImage(uint8_t* buffer, size_t length, size_t size) EncodedImage(uint8_t* buffer, size_t length, size_t size)
: _encodedWidth(0), : _buffer(buffer), _length(length), _size(size) {}
_encodedHeight(0),
_timeStamp(0),
ntp_time_ms_(0),
capture_time_ms_(0),
_frameType(kDeltaFrame),
_buffer(buffer),
_length(length),
_size(size),
_completeFrame(false) {}
uint32_t _encodedWidth; uint32_t _encodedWidth = 0;
uint32_t _encodedHeight; uint32_t _encodedHeight = 0;
uint32_t _timeStamp; uint32_t _timeStamp = 0;
// NTP time of the capture time in local timebase in milliseconds. // NTP time of the capture time in local timebase in milliseconds.
int64_t ntp_time_ms_; int64_t ntp_time_ms_ = 0;
int64_t capture_time_ms_; int64_t capture_time_ms_ = 0;
// TODO(pbos): Use webrtc::FrameType directly (and remove VideoFrameType). // TODO(pbos): Use webrtc::FrameType directly (and remove VideoFrameType).
VideoFrameType _frameType; VideoFrameType _frameType = kDeltaFrame;
uint8_t* _buffer; uint8_t* _buffer;
size_t _length; size_t _length;
size_t _size; size_t _size;
bool _completeFrame; bool _completeFrame = false;
}; };
} // namespace webrtc } // namespace webrtc