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

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

Issue 2275313003: Revert of Delete method cricket::VideoFrame::Copy. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 3 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& video_frame_buffer() 86 const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& video_frame_buffer()
87 const override; 87 const override;
88 88
89 uint32_t transport_frame_id() const override; 89 uint32_t transport_frame_id() const override;
90 90
91 int64_t timestamp_us() const override; 91 int64_t timestamp_us() const override;
92 void set_timestamp_us(int64_t time_us) override; 92 void set_timestamp_us(int64_t time_us) override;
93 93
94 webrtc::VideoRotation rotation() const override; 94 webrtc::VideoRotation rotation() const override;
95 95
96 VideoFrame* Copy() const override;
97
96 size_t ConvertToRgbBuffer(uint32_t to_fourcc, 98 size_t ConvertToRgbBuffer(uint32_t to_fourcc,
97 uint8_t* buffer, 99 uint8_t* buffer,
98 size_t size, 100 size_t size,
99 int stride_rgb) const override; 101 int stride_rgb) const override;
100 102
101 const VideoFrame* GetCopyWithRotationApplied() const override; 103 const VideoFrame* GetCopyWithRotationApplied() const override;
102 104
103 protected: 105 protected:
104 // Creates a frame from a raw sample with FourCC |format| and size |w| x |h|. 106 // Creates a frame from a raw sample with FourCC |format| and size |w| x |h|.
105 // |h| can be negative indicating a vertically flipped image. 107 // |h| can be negative indicating a vertically flipped image.
(...skipping 22 matching lines...) Expand all
128 webrtc::VideoRotation rotation_; 130 webrtc::VideoRotation rotation_;
129 131
130 // This is mutable as the calculation is expensive but once calculated, it 132 // This is mutable as the calculation is expensive but once calculated, it
131 // remains const. 133 // remains const.
132 mutable std::unique_ptr<VideoFrame> rotated_frame_; 134 mutable std::unique_ptr<VideoFrame> rotated_frame_;
133 }; 135 };
134 136
135 } // namespace cricket 137 } // namespace cricket
136 138
137 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_ 139 #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