| Index: webrtc/common_video/include/frame_callback.h
|
| diff --git a/webrtc/common_video/include/frame_callback.h b/webrtc/common_video/include/frame_callback.h
|
| index 45624f1554aab8e4d606f19ed72f2cb997f16224..cc39eaa1a5bd780bbf442887bfe4f2e00b19b951 100644
|
| --- a/webrtc/common_video/include/frame_callback.h
|
| +++ b/webrtc/common_video/include/frame_callback.h
|
| @@ -22,32 +22,13 @@ class VideoFrame;
|
|
|
| struct EncodedFrame {
|
| public:
|
| - EncodedFrame()
|
| - : data_(nullptr),
|
| - length_(0),
|
| - frame_type_(kEmptyFrame),
|
| - encoded_width_(0),
|
| - encoded_height_(0),
|
| - timestamp_(0) {}
|
| - EncodedFrame(const uint8_t* data,
|
| - size_t length,
|
| - FrameType frame_type,
|
| - uint32_t encoded_width,
|
| - uint32_t encoded_height,
|
| - uint32_t timestamp)
|
| - : data_(data),
|
| - length_(length),
|
| - frame_type_(frame_type),
|
| - encoded_width_(encoded_width),
|
| - encoded_height_(encoded_height),
|
| - timestamp_(timestamp) {}
|
| + EncodedFrame() : data_(NULL), length_(0), frame_type_(kEmptyFrame) {}
|
| + EncodedFrame(const uint8_t* data, size_t length, FrameType frame_type)
|
| + : data_(data), length_(length), frame_type_(frame_type) {}
|
|
|
| const uint8_t* data_;
|
| const size_t length_;
|
| const FrameType frame_type_;
|
| - const uint32_t encoded_width_;
|
| - const uint32_t encoded_height_;
|
| - const uint32_t timestamp_;
|
| };
|
|
|
| class EncodedFrameObserver {
|
|
|