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

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

Issue 2087923004: Revert of Delete method cricket::VideoFrame::Copy. (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/media/base/videoframe_unittest.h ('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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& video_frame_buffer() 69 const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& video_frame_buffer()
70 const override; 70 const override;
71 71
72 /* System monotonic clock */ 72 /* System monotonic clock */
73 int64_t timestamp_us() const override { return timestamp_us_; } 73 int64_t timestamp_us() const override { return timestamp_us_; }
74 void set_timestamp_us(int64_t time_us) override { timestamp_us_ = time_us; }; 74 void set_timestamp_us(int64_t time_us) override { timestamp_us_ = time_us; };
75 75
76 webrtc::VideoRotation rotation() const override { return rotation_; } 76 webrtc::VideoRotation rotation() const override { return rotation_; }
77 77
78 VideoFrame* Copy() const override;
79
78 size_t ConvertToRgbBuffer(uint32_t to_fourcc, 80 size_t ConvertToRgbBuffer(uint32_t to_fourcc,
79 uint8_t* buffer, 81 uint8_t* buffer,
80 size_t size, 82 size_t size,
81 int stride_rgb) const override; 83 int stride_rgb) const override;
82 84
83 const VideoFrame* GetCopyWithRotationApplied() const override; 85 const VideoFrame* GetCopyWithRotationApplied() const override;
84 86
85 protected: 87 protected:
86 void set_rotation(webrtc::VideoRotation rotation) override { 88 void set_rotation(webrtc::VideoRotation rotation) override {
87 rotation_ = rotation; 89 rotation_ = rotation;
(...skipping 24 matching lines...) Expand all
112 webrtc::VideoRotation rotation_; 114 webrtc::VideoRotation rotation_;
113 115
114 // This is mutable as the calculation is expensive but once calculated, it 116 // This is mutable as the calculation is expensive but once calculated, it
115 // remains const. 117 // remains const.
116 mutable std::unique_ptr<VideoFrame> rotated_frame_; 118 mutable std::unique_ptr<VideoFrame> rotated_frame_;
117 }; 119 };
118 120
119 } // namespace cricket 121 } // namespace cricket
120 122
121 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_ 123 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_
OLDNEW
« no previous file with comments | « webrtc/media/base/videoframe_unittest.h ('k') | webrtc/media/engine/webrtcvideoframe.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698