Delete deprecated versions of Copy, ScaleFrom and CropAndScaleFrom.

webrtc/common_video/include/video_frame_buffer.h

 /*
  *  Copyright (c) 2015 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 16 matching lines @@
 // not contain any frame metadata such as rotation, timestamp, pixel_width, etc.
 class VideoFrameBuffer : public rtc::RefCountInterface {
  public:
   // The resolution of the frame in pixels. For formats where some planes are
   // subsampled, this is the highest-resolution plane.
   virtual int width() const = 0;
   virtual int height() const = 0;
 
   // Returns pointer to the pixel data for a given plane. The memory is owned by
   // the VideoFrameBuffer object and must not be freed by the caller.
   virtual const uint8_t* DataY() const = 0;

[magjed_webrtc, 2016/11/29 13:43:07]

This is unrelated to this CL, but before we move I420Buffer to api/, maybe we
should consider moving the Data*() and Stride*() functions from VideoFrameBuffer
to I420Buffer, and change the return type of NativeToI420Buffer() to:
virtual rtc::scoped_refptr<I420Buffer> NativeToI420Buffer() = 0;

What do you think?

[nisse-webrtc, 2016/11/29 14:04:05]

Makes some sense (provided we also find a better name for that method), but I'm
not sure it's a good idea. In one way it is convenient to be able to render a
VideoFrameBuffer directly.

And I really want to keep the distinction between mutable and immutable video
buffers, and to do that, if I420Buffer::NativeToI420Buffer should return itself
rather than make a new copy, the return value would need to be
rtc::scoped_refptr<const I420Buffer>.

   virtual const uint8_t* DataU() const = 0;
   virtual const uint8_t* DataV() const = 0;
 
   // Returns the number of bytes between successive rows for a given plane.
   virtual int StrideY() const = 0;
   virtual int StrideU() const = 0;
   virtual int StrideV() const = 0;
 
   // Return the handle of the underlying video frame. This is used when the
   // frame is backed by a texture.
@@ skipping 70 matching lines @@
                         int crop_width,
                         int crop_height);
 
   // The common case of a center crop, when needed to adjust the
   // aspect ratio without distorting the image.
   void CropAndScaleFrom(const VideoFrameBuffer& src);
 
   // Scale all of |src| to the size of |this| buffer, with no cropping.
   void ScaleFrom(const VideoFrameBuffer& src);
 
-  // Deprecated methods, using smart pointer references.
-  // TODO(nisse): Delete once downstream applications are updated.
-  static rtc::scoped_refptr<I420Buffer> Copy(
-      const rtc::scoped_refptr<VideoFrameBuffer>& buffer) {
-    return Copy(*buffer);
-  }
-  void CropAndScaleFrom(const rtc::scoped_refptr<VideoFrameBuffer>& src,
-                        int offset_x,
-                        int offset_y,
-                        int crop_width,
-                        int crop_height) {
-    CropAndScaleFrom(*src, offset_x, offset_y, crop_width, crop_height);
-  }
-  void CropAndScaleFrom(const rtc::scoped_refptr<VideoFrameBuffer>& src) {
-    CropAndScaleFrom(*src);
-  }
-  void ScaleFrom(const rtc::scoped_refptr<VideoFrameBuffer>& src) {
-    ScaleFrom(*src);
-  }
-
  protected:
   I420Buffer(int width, int height);
   I420Buffer(int width, int height, int stride_y, int stride_u, int stride_v);
 
   ~I420Buffer() override;
 
  private:
   const int width_;
   const int height_;
   const int stride_y_;
@@ skipping 63 matching lines @@
   const uint8_t* const v_plane_;
   const int y_stride_;
   const int u_stride_;
   const int v_stride_;
   rtc::Callback0<void> no_longer_used_cb_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_BUFFER_H_