Added new VideoFrameBuffer methods Data[YUV]() etc.

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 25 matching lines @@
   // Returns true if this buffer has a single exclusive owner.
   virtual bool HasOneRef() const = 0;
 
   // 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* data(PlaneType type) const = 0;
+  virtual const uint8_t* DataY() const = 0;
+  virtual const uint8_t* DataU() const = 0;
+  virtual const uint8_t* DataV() const = 0;
+  // Deprecated method. Use virtual final, to ensure we get warnings

[pbos-webrtc, 2016/04/14 13:06:39]

Should this use RTC_DEPRECATED instead? (webrtc/base/deprecation.h)

[nisse-webrtc, 2016/04/14 14:08:47]

That will break Chrome, if it uses them. So I think we should just make sure
they aren't used, and then delete them.

+  // if any subclass tries to override it. cpplint thinks virtual is
+  // redundant, but it isn't, since this is the base class. Hence the
+  // use of NOLINT.
+  // TODO(nisse): Delete after all users are updated.
+  virtual const uint8_t* data(PlaneType type) const final; // NOLINT
 
-  // Non-const data access is disallowed by default. You need to make sure you
-  // have exclusive access and a writable buffer before calling this function.
-  virtual uint8_t* MutableData(PlaneType type);
+  // Non-const data access is allowed only if HasOneRef() is true.
+  virtual uint8_t* MutableDataY();
+  virtual uint8_t* MutableDataU();
+  virtual uint8_t* MutableDataV();
+  // Deprecated method. TODO(nisse): Delete after all users are updated.
+  virtual uint8_t* MutableData(PlaneType type) final; // NOLINT
 
   // Returns the number of bytes between successive rows for a given plane.
-  virtual int stride(PlaneType type) const = 0;
+  virtual int StrideY() const = 0;
+  virtual int StrideU() const = 0;
+  virtual int StrideV() const = 0;
+  // Deprecated method. TODO(nisse): Delete after all users are updated.
+  virtual int stride(PlaneType type) const final; // NOLINT
 
   // Return the handle of the underlying video frame. This is used when the
   // frame is backed by a texture.
   virtual void* native_handle() const = 0;
 
   // Returns a new memory-backed frame buffer converted from this buffer's
   // native handle.
   virtual rtc::scoped_refptr<VideoFrameBuffer> NativeToI420Buffer() = 0;
 
  protected:
   virtual ~VideoFrameBuffer();
 };
 
 // Plain I420 buffer in standard memory.
 class I420Buffer : public VideoFrameBuffer {
  public:
   I420Buffer(int width, int height);
   I420Buffer(int width, int height, int stride_y, int stride_u, int stride_v);
   void InitializeData();
 
   int width() const override;
   int height() const override;
-  const uint8_t* data(PlaneType type) const override;
+  const uint8_t* DataY() const override;
+  const uint8_t* DataU() const override;
+  const uint8_t* DataV() const override;
   // Non-const data access is only allowed if HasOneRef() is true to protect
   // against unexpected overwrites.
-  uint8_t* MutableData(PlaneType type) override;
-  int stride(PlaneType type) const override;
+  uint8_t* MutableDataY() override;
+  uint8_t* MutableDataU() override;
+  uint8_t* MutableDataV() override;
+  int StrideY() const override;
+  int StrideU() const override;
+  int StrideV() const override;
+
   void* native_handle() const override;
   rtc::scoped_refptr<VideoFrameBuffer> NativeToI420Buffer() override;
 
   // Create a new buffer and copy the pixel data.
   static rtc::scoped_refptr<I420Buffer> Copy(
       const rtc::scoped_refptr<VideoFrameBuffer>& buffer);
 
  protected:
   ~I420Buffer() override;
 
  private:
   const int width_;
   const int height_;
   const int stride_y_;
   const int stride_u_;
   const int stride_v_;
   const std::unique_ptr<uint8_t, AlignedFreeDeleter> data_;
 };
 
 // Base class for native-handle buffer is a wrapper around a |native_handle|.
 // This is used for convenience as most native-handle implementations can share
 // many VideoFrame implementations, but need to implement a few others (such
 // as their own destructors or conversion methods back to software I420).
 class NativeHandleBuffer : public VideoFrameBuffer {
  public:
   NativeHandleBuffer(void* native_handle, int width, int height);
 
   int width() const override;
   int height() const override;
-  const uint8_t* data(PlaneType type) const override;
-  int stride(PlaneType type) const override;
+  const uint8_t* DataY() const override;
+  const uint8_t* DataU() const override;
+  const uint8_t* DataV() const override;
+  int StrideY() const override;
+  int StrideU() const override;
+  int StrideV() const override;
+
   void* native_handle() const override;
 
  protected:
   void* native_handle_;
   const int width_;
   const int height_;
 };
 
 class WrappedI420Buffer : public webrtc::VideoFrameBuffer {
  public:
   WrappedI420Buffer(int width,
                     int height,
                     const uint8_t* y_plane,
                     int y_stride,
                     const uint8_t* u_plane,
                     int u_stride,
                     const uint8_t* v_plane,
                     int v_stride,
                     const rtc::Callback0<void>& no_longer_used);
   int width() const override;
   int height() const override;
 
-  const uint8_t* data(PlaneType type) const override;
+  const uint8_t* DataY() const override;
+  const uint8_t* DataU() const override;
+  const uint8_t* DataV() const override;
+  int StrideY() const override;
+  int StrideU() const override;
+  int StrideV() const override;
 
-  int stride(PlaneType type) const override;
   void* native_handle() const override;
 
   rtc::scoped_refptr<VideoFrameBuffer> NativeToI420Buffer() override;
 
  private:
   friend class rtc::RefCountedObject<WrappedI420Buffer>;
   ~WrappedI420Buffer() override;
 
   const int width_;
   const int height_;
   const uint8_t* const y_plane_;
   const uint8_t* const u_plane_;
   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_;
 };
 
 // Helper function to crop |buffer| without making a deep copy. May only be used
 // for non-native frames.
 rtc::scoped_refptr<VideoFrameBuffer> ShallowCenterCrop(
     const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
     int cropped_width,
     int cropped_height);
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_BUFFER_H_