Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(238)

Side by Side Diff: webrtc/common_video/video_frame.cc

Issue 2574123002: Revert of Delete VideoFrame default constructor, and IsZeroSize method. (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/video_frame.h" 11 #include "webrtc/video_frame.h"
12 12
13 #include <string.h> 13 #include <string.h>
14 14
15 #include <algorithm> // swap 15 #include <algorithm> // swap
16 16
17 #include "webrtc/base/bind.h" 17 #include "webrtc/base/bind.h"
18 #include "webrtc/base/checks.h" 18 #include "webrtc/base/checks.h"
19 19
20 namespace webrtc { 20 namespace webrtc {
21 21
22 // FFmpeg's decoder, used by H264DecoderImpl, requires up to 8 bytes padding due 22 // FFmpeg's decoder, used by H264DecoderImpl, requires up to 8 bytes padding due
23 // to optimized bitstream readers. See avcodec_decode_video2. 23 // to optimized bitstream readers. See avcodec_decode_video2.
24 const size_t EncodedImage::kBufferPaddingBytesH264 = 8; 24 const size_t EncodedImage::kBufferPaddingBytesH264 = 8;
25 25
26 VideoFrame::VideoFrame()
27 : video_frame_buffer_(nullptr),
28 timestamp_rtp_(0),
29 ntp_time_ms_(0),
30 timestamp_us_(0),
31 rotation_(kVideoRotation_0) {}
32
26 VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer, 33 VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
27 webrtc::VideoRotation rotation, 34 webrtc::VideoRotation rotation,
28 int64_t timestamp_us) 35 int64_t timestamp_us)
29 : video_frame_buffer_(buffer), 36 : video_frame_buffer_(buffer),
30 timestamp_rtp_(0), 37 timestamp_rtp_(0),
31 ntp_time_ms_(0), 38 ntp_time_ms_(0),
32 timestamp_us_(timestamp_us), 39 timestamp_us_(timestamp_us),
33 rotation_(rotation) {} 40 rotation_(rotation) {}
34 41
35 VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer, 42 VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
36 uint32_t timestamp, 43 uint32_t timestamp,
37 int64_t render_time_ms, 44 int64_t render_time_ms,
38 VideoRotation rotation) 45 VideoRotation rotation)
39 : video_frame_buffer_(buffer), 46 : video_frame_buffer_(buffer),
40 timestamp_rtp_(timestamp), 47 timestamp_rtp_(timestamp),
41 ntp_time_ms_(0), 48 ntp_time_ms_(0),
42 timestamp_us_(render_time_ms * rtc::kNumMicrosecsPerMillisec), 49 timestamp_us_(render_time_ms * rtc::kNumMicrosecsPerMillisec),
43 rotation_(rotation) { 50 rotation_(rotation) {
44 RTC_DCHECK(buffer); 51 RTC_DCHECK(buffer);
45 } 52 }
46 53
47 int VideoFrame::width() const { 54 int VideoFrame::width() const {
48 return video_frame_buffer_ ? video_frame_buffer_->width() : 0; 55 return video_frame_buffer_ ? video_frame_buffer_->width() : 0;
49 } 56 }
50 57
51 int VideoFrame::height() const { 58 int VideoFrame::height() const {
52 return video_frame_buffer_ ? video_frame_buffer_->height() : 0; 59 return video_frame_buffer_ ? video_frame_buffer_->height() : 0;
53 } 60 }
54 61
62 bool VideoFrame::IsZeroSize() const {
63 return !video_frame_buffer_;
64 }
65
55 rtc::scoped_refptr<VideoFrameBuffer> VideoFrame::video_frame_buffer() const { 66 rtc::scoped_refptr<VideoFrameBuffer> VideoFrame::video_frame_buffer() const {
56 return video_frame_buffer_; 67 return video_frame_buffer_;
57 } 68 }
58 69
59 size_t EncodedImage::GetBufferPaddingBytes(VideoCodecType codec_type) { 70 size_t EncodedImage::GetBufferPaddingBytes(VideoCodecType codec_type) {
60 switch (codec_type) { 71 switch (codec_type) {
61 case kVideoCodecVP8: 72 case kVideoCodecVP8:
62 case kVideoCodecVP9: 73 case kVideoCodecVP9:
63 return 0; 74 return 0;
64 case kVideoCodecH264: 75 case kVideoCodecH264:
65 return kBufferPaddingBytesH264; 76 return kBufferPaddingBytesH264;
66 case kVideoCodecI420: 77 case kVideoCodecI420:
67 case kVideoCodecRED: 78 case kVideoCodecRED:
68 case kVideoCodecULPFEC: 79 case kVideoCodecULPFEC:
69 case kVideoCodecFlexfec: 80 case kVideoCodecFlexfec:
70 case kVideoCodecGeneric: 81 case kVideoCodecGeneric:
71 case kVideoCodecUnknown: 82 case kVideoCodecUnknown:
72 return 0; 83 return 0;
73 } 84 }
74 RTC_NOTREACHED(); 85 RTC_NOTREACHED();
75 return 0; 86 return 0;
76 } 87 }
77 88
78 } // namespace webrtc 89 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/common_video/libyuv/webrtc_libyuv.cc ('k') | webrtc/media/base/videobroadcaster_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698