Chromium Code Reviews| Index: webrtc/video_frame.h |
| diff --git a/webrtc/video_frame.h b/webrtc/video_frame.h |
| index 857eaa05400d4f672f50b04a84851700febe1b90..4b055252042f0dd88cb41be6379d99ab9308caa7 100644 |
| --- a/webrtc/video_frame.h |
| +++ b/webrtc/video_frame.h |
| @@ -44,6 +44,12 @@ class VideoFrame { |
| int64_t render_time_ms, |
| VideoRotation rotation); |
| + // Support move and copy. |
| + VideoFrame(const VideoFrame&) = default; |
| + VideoFrame(VideoFrame&&) = default; |
| + VideoFrame& operator=(const VideoFrame&) = default; |
| + VideoFrame& operator=(VideoFrame&&) = default; |
| + |
| // CreateFrame: Sets the frame's members and buffers. If required size is |
| // bigger than allocated one, new buffers of adequate size will be allocated. |
| @@ -72,9 +78,8 @@ class VideoFrame { |
| // Creates a shallow copy of |videoFrame|, i.e, the this object will retain a |
| // reference to the video buffer also retained by |videoFrame|. |
| - // TODO(nisse): Deprecated. Should be deleted in the cricket::VideoFrame and |
| - // webrtc::VideoFrame merge. Instead, pass video_frame_buffer() and timestamps |
| - // to the constructor. |
| + // TODO(nisse): Deprecated. Use constructor or assignment instead. |
| + // Delete after applications are updated. |
| void ShallowCopy(const VideoFrame& videoFrame); |
|
tommi
2016/10/24 10:52:17
video_frame or frame
nisse-chromium (ooo August 14)
2016/10/24 11:01:20
Done.
|
| // Get frame width. |