Reland of Delete webrtc::VideoFrame::CopyFrame.

webrtc/common_video/video_frame.cc

 /*
  *  Copyright (c) 2012 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 75 matching lines @@
   const int stride_y = width;
   const int stride_uv = (width + 1) / 2;
 
   const uint8_t* buffer_y = buffer;
   const uint8_t* buffer_u = buffer_y + stride_y * height;
   const uint8_t* buffer_v = buffer_u + stride_uv * ((height + 1) / 2);
   CreateFrame(buffer_y, buffer_u, buffer_v, width, height, stride_y,
               stride_uv, stride_uv, rotation);
 }
 
-void VideoFrame::CopyFrame(const VideoFrame& videoFrame) {
-  ShallowCopy(videoFrame);
-
-  // If backed by a plain memory buffer, create a new, non-shared, copy.
-  if (video_frame_buffer_ && !video_frame_buffer_->native_handle()) {
-    video_frame_buffer_ = I420Buffer::Copy(video_frame_buffer_);
-  }
-}
-
 void VideoFrame::ShallowCopy(const VideoFrame& videoFrame) {
   video_frame_buffer_ = videoFrame.video_frame_buffer();
   timestamp_rtp_ = videoFrame.timestamp_rtp_;
   ntp_time_ms_ = videoFrame.ntp_time_ms_;
   timestamp_us_ = videoFrame.timestamp_us_;
   rotation_ = videoFrame.rotation_;
 }
 
 int VideoFrame::width() const {
   return video_frame_buffer_ ? video_frame_buffer_->width() : 0;
@@ skipping 24 matching lines @@
     case kVideoCodecULPFEC:
     case kVideoCodecGeneric:
     case kVideoCodecUnknown:
       return 0;
   }
   RTC_NOTREACHED();
   return 0;
 }
 
 }  // namespace webrtc