| Index: webrtc/api/video/video_frame.cc
|
| diff --git a/webrtc/api/video/video_frame.cc b/webrtc/api/video/video_frame.cc
|
| index b2647461c73b67d1fba827390da9633146aca18a..bd91168d6eb45870785e6c92186c37eedc04408f 100644
|
| --- a/webrtc/api/video/video_frame.cc
|
| +++ b/webrtc/api/video/video_frame.cc
|
| @@ -17,22 +17,26 @@ namespace webrtc {
|
|
|
| VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
|
| webrtc::VideoRotation rotation,
|
| + webrtc::VideoContentTypeId content_type,
|
| int64_t timestamp_us)
|
| : video_frame_buffer_(buffer),
|
| timestamp_rtp_(0),
|
| ntp_time_ms_(0),
|
| timestamp_us_(timestamp_us),
|
| - rotation_(rotation) {}
|
| + rotation_(rotation),
|
| + content_type_(content_type) {}
|
|
|
| VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
|
| uint32_t timestamp,
|
| int64_t render_time_ms,
|
| - VideoRotation rotation)
|
| + VideoRotation rotation,
|
| + VideoContentTypeId content_type)
|
| : video_frame_buffer_(buffer),
|
| timestamp_rtp_(timestamp),
|
| ntp_time_ms_(0),
|
| timestamp_us_(render_time_ms * rtc::kNumMicrosecsPerMillisec),
|
| - rotation_(rotation) {
|
| + rotation_(rotation),
|
| + content_type_(content_type) {
|
| RTC_DCHECK(buffer);
|
| }
|
|
|
|
|