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

Side by Side Diff: webrtc/api/video/video_frame.h

Issue 2633493002: Delete VideoFrame::set_render_time_ms. (Closed)
Patch Set: Keep timestamp override in ViEEncoder::OnFrame for now. Hopefully fixes tests. Created 3 years, 11 months 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
« no previous file with comments | « no previous file | webrtc/api/video/video_frame.cc » ('j') | webrtc/video/vie_encoder.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 // "pending rotation" or "pending" = a frame that has a VideoRotation > 0. 82 // "pending rotation" or "pending" = a frame that has a VideoRotation > 0.
83 // 83 //
84 // "not pending" = a frame that has a VideoRotation == 0. 84 // "not pending" = a frame that has a VideoRotation == 0.
85 // 85 //
86 // "apply rotation" = modify a frame from being "pending" to being "not 86 // "apply rotation" = modify a frame from being "pending" to being "not
87 // pending" rotation (a no-op for "unrotated"). 87 // pending" rotation (a no-op for "unrotated").
88 // 88 //
89 VideoRotation rotation() const { return rotation_; } 89 VideoRotation rotation() const { return rotation_; }
90 void set_rotation(VideoRotation rotation) { rotation_ = rotation; } 90 void set_rotation(VideoRotation rotation) { rotation_ = rotation; }
91 91
92 // Set render time in milliseconds.
93 void set_render_time_ms(int64_t render_time_ms);
94
95 // Get render time in milliseconds. 92 // Get render time in milliseconds.
96 int64_t render_time_ms() const; 93 int64_t render_time_ms() const;
97 94
98 // Return the underlying buffer. Never nullptr for a properly 95 // Return the underlying buffer. Never nullptr for a properly
99 // initialized VideoFrame. 96 // initialized VideoFrame.
100 rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer() const; 97 rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer() const;
101 98
102 // TODO(nisse): Deprecated. 99 // TODO(nisse): Deprecated.
103 // Return true if the frame is stored in a texture. 100 // Return true if the frame is stored in a texture.
104 bool is_texture() const { 101 bool is_texture() const {
105 return video_frame_buffer()->native_handle() != nullptr; 102 return video_frame_buffer()->native_handle() != nullptr;
106 } 103 }
107 104
108 private: 105 private:
109 // An opaque reference counted handle that stores the pixel data. 106 // An opaque reference counted handle that stores the pixel data.
110 rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_; 107 rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_;
111 uint32_t timestamp_rtp_; 108 uint32_t timestamp_rtp_;
112 int64_t ntp_time_ms_; 109 int64_t ntp_time_ms_;
113 int64_t timestamp_us_; 110 int64_t timestamp_us_;
114 VideoRotation rotation_; 111 VideoRotation rotation_;
115 }; 112 };
116 113
117 } // namespace webrtc 114 } // namespace webrtc
118 115
119 #endif // WEBRTC_API_VIDEO_VIDEO_FRAME_H_ 116 #endif // WEBRTC_API_VIDEO_VIDEO_FRAME_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/api/video/video_frame.cc » ('j') | webrtc/video/vie_encoder.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698