Index: webrtc/video_frame.h |
diff --git a/webrtc/video_frame.h b/webrtc/video_frame.h |
index 857eaa05400d4f672f50b04a84851700febe1b90..c19fa4378f44518e24c175c946858a5fd96e959b 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,10 +78,9 @@ 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. |
- void ShallowCopy(const VideoFrame& videoFrame); |
+ // TODO(nisse): Deprecated. Use constructor or assignment instead. |
+ // Delete after applications are updated. |
magjed_webrtc
2016/10/25 07:32:11
Is anyone else really using this function?
nisse-webrtc
2016/10/25 08:01:34
Hmm, I can't find any. Maybe we can try to delete
magjed_webrtc
2016/10/25 10:05:00
Yeah, try to delete it right away. I don't think i
|
+ void ShallowCopy(const VideoFrame& frame); |
// Get frame width. |
int width() const; |