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

Side by Side Diff: webrtc/media/engine/webrtcvideoframe.h

Issue 2076113002: Revert of Delete unused and almost unused frame-related methods. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 6 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 | « webrtc/common_video/video_frame_buffer.cc ('k') | webrtc/media/engine/webrtcvideoframe.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 // The timestamp of the captured frame is expected to use the same 57 // The timestamp of the captured frame is expected to use the same
58 // timescale and epoch as rtc::Time. 58 // timescale and epoch as rtc::Time.
59 // TODO(nisse): Consider adding a warning message, or even an RTC_DCHECK, if 59 // TODO(nisse): Consider adding a warning message, or even an RTC_DCHECK, if
60 // the time is too far off. 60 // the time is too far off.
61 bool Init(const CapturedFrame* frame, int dw, int dh, bool apply_rotation); 61 bool Init(const CapturedFrame* frame, int dw, int dh, bool apply_rotation);
62 62
63 void InitToEmptyBuffer(int w, int h); 63 void InitToEmptyBuffer(int w, int h);
64 void InitToEmptyBuffer(int w, int h, int64_t time_stamp_ns); 64 void InitToEmptyBuffer(int w, int h, int64_t time_stamp_ns);
65 65
66 // TODO(nisse): Deprecated, delete as soon as Chrome is updated.
67 bool InitToBlack(int w, int h, int64_t time_stamp_ns);
68
66 int width() const override; 69 int width() const override;
67 int height() const override; 70 int height() const override;
68 71
69 const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& video_frame_buffer() 72 const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& video_frame_buffer()
70 const override; 73 const override;
71 74
72 /* System monotonic clock */ 75 /* System monotonic clock */
73 int64_t timestamp_us() const override { return timestamp_us_; } 76 int64_t timestamp_us() const override { return timestamp_us_; }
74 void set_timestamp_us(int64_t time_us) override { timestamp_us_ = time_us; }; 77 void set_timestamp_us(int64_t time_us) override { timestamp_us_ = time_us; };
75 78
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 webrtc::VideoRotation rotation_; 117 webrtc::VideoRotation rotation_;
115 118
116 // This is mutable as the calculation is expensive but once calculated, it 119 // This is mutable as the calculation is expensive but once calculated, it
117 // remains const. 120 // remains const.
118 mutable std::unique_ptr<VideoFrame> rotated_frame_; 121 mutable std::unique_ptr<VideoFrame> rotated_frame_;
119 }; 122 };
120 123
121 } // namespace cricket 124 } // namespace cricket
122 125
123 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_ 126 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_
OLDNEW
« no previous file with comments | « webrtc/common_video/video_frame_buffer.cc ('k') | webrtc/media/engine/webrtcvideoframe.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698