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

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

Issue 2541863002: Delete VideoFrame default constructor, and IsZeroSize method. (Closed)
Patch Set: Initialize pixel data in VideoBroadcasterTest.OnFrame test. 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
33 VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer, 26 VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
34 webrtc::VideoRotation rotation, 27 webrtc::VideoRotation rotation,
35 int64_t timestamp_us) 28 int64_t timestamp_us)
36 : video_frame_buffer_(buffer), 29 : video_frame_buffer_(buffer),
37 timestamp_rtp_(0), 30 timestamp_rtp_(0),
38 ntp_time_ms_(0), 31 ntp_time_ms_(0),
39 timestamp_us_(timestamp_us), 32 timestamp_us_(timestamp_us),
40 rotation_(rotation) {} 33 rotation_(rotation) {}
41 34
42 VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer, 35 VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
43 uint32_t timestamp, 36 uint32_t timestamp,
44 int64_t render_time_ms, 37 int64_t render_time_ms,
45 VideoRotation rotation) 38 VideoRotation rotation)
46 : video_frame_buffer_(buffer), 39 : video_frame_buffer_(buffer),
47 timestamp_rtp_(timestamp), 40 timestamp_rtp_(timestamp),
48 ntp_time_ms_(0), 41 ntp_time_ms_(0),
49 timestamp_us_(render_time_ms * rtc::kNumMicrosecsPerMillisec), 42 timestamp_us_(render_time_ms * rtc::kNumMicrosecsPerMillisec),
50 rotation_(rotation) { 43 rotation_(rotation) {
51 RTC_DCHECK(buffer); 44 RTC_DCHECK(buffer);
52 } 45 }
53 46
54 int VideoFrame::width() const { 47 int VideoFrame::width() const {
55 return video_frame_buffer_ ? video_frame_buffer_->width() : 0; 48 return video_frame_buffer_ ? video_frame_buffer_->width() : 0;
56 } 49 }
57 50
58 int VideoFrame::height() const { 51 int VideoFrame::height() const {
59 return video_frame_buffer_ ? video_frame_buffer_->height() : 0; 52 return video_frame_buffer_ ? video_frame_buffer_->height() : 0;
60 } 53 }
61 54
62 bool VideoFrame::IsZeroSize() const {
63 return !video_frame_buffer_;
64 }
65
66 rtc::scoped_refptr<VideoFrameBuffer> VideoFrame::video_frame_buffer() const { 55 rtc::scoped_refptr<VideoFrameBuffer> VideoFrame::video_frame_buffer() const {
67 return video_frame_buffer_; 56 return video_frame_buffer_;
68 } 57 }
69 58
70 size_t EncodedImage::GetBufferPaddingBytes(VideoCodecType codec_type) { 59 size_t EncodedImage::GetBufferPaddingBytes(VideoCodecType codec_type) {
71 switch (codec_type) { 60 switch (codec_type) {
72 case kVideoCodecVP8: 61 case kVideoCodecVP8:
73 case kVideoCodecVP9: 62 case kVideoCodecVP9:
74 return 0; 63 return 0;
75 case kVideoCodecH264: 64 case kVideoCodecH264:
76 return kBufferPaddingBytesH264; 65 return kBufferPaddingBytesH264;
77 case kVideoCodecI420: 66 case kVideoCodecI420:
78 case kVideoCodecRED: 67 case kVideoCodecRED:
79 case kVideoCodecULPFEC: 68 case kVideoCodecULPFEC:
80 case kVideoCodecFlexfec: 69 case kVideoCodecFlexfec:
81 case kVideoCodecGeneric: 70 case kVideoCodecGeneric:
82 case kVideoCodecUnknown: 71 case kVideoCodecUnknown:
83 return 0; 72 return 0;
84 } 73 }
85 RTC_NOTREACHED(); 74 RTC_NOTREACHED();
86 return 0; 75 return 0;
87 } 76 }
88 77
89 } // namespace webrtc 78 } // 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