Delete ShallowCopy, in favor of copy construction and assignment.

webrtc/video_frame.h

 /*
  *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 26 matching lines @@
   VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
              webrtc::VideoRotation rotation,
              int64_t timestamp_us);
 
   // Preferred constructor.
   VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
              uint32_t timestamp,
              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.
 
   // TODO(nisse): Deprecated. Should be deleted in the cricket::VideoFrame and
   // webrtc::VideoFrame merge. Instead, create a VideoFrameBuffer and pass to
   // the constructor. E.g, use I420Buffer::Copy(WrappedI420Buffer(...)).
   void CreateFrame(const uint8_t* buffer_y,
                    const uint8_t* buffer_u,
                    const uint8_t* buffer_v,
                    int width,
                    int height,
                    int stride_y,
                    int stride_u,
                    int stride_v,
                    VideoRotation rotation);
 
   // CreateFrame: Sets the frame's members and buffers. If required size is
   // bigger than allocated one, new buffers of adequate size will be allocated.
   // |buffer| must be a packed I420 buffer.
 
   // TODO(nisse): Deprecated, see above method for advice.
   void CreateFrame(const uint8_t* buffer,
                   int width,
                   int height,
                   VideoRotation rotation);
 
   // 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.
   int width() const;
 
   // Get frame height.
   int height() const;
 
   // System monotonic clock, same timebase as rtc::TimeMicros().
   int64_t timestamp_us() const { return timestamp_us_; }
   void set_timestamp_us(int64_t timestamp_us) {
@@ skipping 121 matching lines @@
   int qp_ = -1;  // Quantizer value.
 
   // When an application indicates non-zero values here, it is taken as an
   // indication that all future frames will be constrained with those limits
   // until the application indicates a change again.
   PlayoutDelay playout_delay_ = {-1, -1};
 };
 
 }  // namespace webrtc
 #endif  // WEBRTC_VIDEO_FRAME_H_