| Index: webrtc/common_video/video_frame.cc
|
| diff --git a/webrtc/common_video/video_frame.cc b/webrtc/common_video/video_frame.cc
|
| index d9c5c2f783cf6dcf7c0014112541017e5b04fb54..55eb5351c37e26ea3b6c7a16c41bc344379ca925 100644
|
| --- a/webrtc/common_video/video_frame.cc
|
| +++ b/webrtc/common_video/video_frame.cc
|
| @@ -23,39 +23,6 @@ namespace webrtc {
|
| // to optimized bitstream readers. See avcodec_decode_video2.
|
| const size_t EncodedImage::kBufferPaddingBytesH264 = 8;
|
|
|
| -VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
|
| - webrtc::VideoRotation rotation,
|
| - int64_t timestamp_us)
|
| - : video_frame_buffer_(buffer),
|
| - timestamp_rtp_(0),
|
| - ntp_time_ms_(0),
|
| - timestamp_us_(timestamp_us),
|
| - rotation_(rotation) {}
|
| -
|
| -VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
|
| - uint32_t timestamp,
|
| - int64_t render_time_ms,
|
| - VideoRotation rotation)
|
| - : video_frame_buffer_(buffer),
|
| - timestamp_rtp_(timestamp),
|
| - ntp_time_ms_(0),
|
| - timestamp_us_(render_time_ms * rtc::kNumMicrosecsPerMillisec),
|
| - rotation_(rotation) {
|
| - RTC_DCHECK(buffer);
|
| -}
|
| -
|
| -int VideoFrame::width() const {
|
| - return video_frame_buffer_ ? video_frame_buffer_->width() : 0;
|
| -}
|
| -
|
| -int VideoFrame::height() const {
|
| - return video_frame_buffer_ ? video_frame_buffer_->height() : 0;
|
| -}
|
| -
|
| -rtc::scoped_refptr<VideoFrameBuffer> VideoFrame::video_frame_buffer() const {
|
| - return video_frame_buffer_;
|
| -}
|
| -
|
| size_t EncodedImage::GetBufferPaddingBytes(VideoCodecType codec_type) {
|
| switch (codec_type) {
|
| case kVideoCodecVP8:
|
|
|