| 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..0a2a905008d76f4b031b6aac4df802464196cbc0 100644
|
| --- a/webrtc/common_video/include/frame_callback.h
|
| +++ b/webrtc/common_video/include/frame_callback.h
|
| @@ -26,27 +26,23 @@ struct EncodedFrame {
|
| : data_(nullptr),
|
| length_(0),
|
| frame_type_(kEmptyFrame),
|
| - encoded_width_(0),
|
| - encoded_height_(0),
|
| + stream_id_(0),
|
| timestamp_(0) {}
|
| EncodedFrame(const uint8_t* data,
|
| size_t length,
|
| FrameType frame_type,
|
| - uint32_t encoded_width,
|
| - uint32_t encoded_height,
|
| + size_t stream_id,
|
| uint32_t timestamp)
|
| : data_(data),
|
| length_(length),
|
| frame_type_(frame_type),
|
| - encoded_width_(encoded_width),
|
| - encoded_height_(encoded_height),
|
| + stream_id_(stream_id),
|
| timestamp_(timestamp) {}
|
|
|
| const uint8_t* data_;
|
| const size_t length_;
|
| const FrameType frame_type_;
|
| - const uint32_t encoded_width_;
|
| - const uint32_t encoded_height_;
|
| + const size_t stream_id_;
|
| const uint32_t timestamp_;
|
| };
|
|
|
|
|