Delete IsMutable and IsExclusive methods.

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 15 matching lines @@
   kYPlane = 0,
   kUPlane = 1,
   kVPlane = 2,
   kNumOfPlanes = 3,
 };
 
 // Interface of a simple frame buffer containing pixel data. This interface does
 // not contain any frame metadata such as rotation, timestamp, pixel_width, etc.
 class VideoFrameBuffer : public rtc::RefCountInterface {
  public:
-  // Returns true if the caller is exclusive owner, and allowed to
-  // call MutableData.
-
-  // TODO(nisse): Delete default implementation when subclasses in
-  // Chrome are updated.
-  virtual bool IsMutable() { return false; }
-
-  // Underlying refcount access, used to implement IsMutable.
-  // TODO(nisse): Demote to protected, as soon as Chrome is changed to
-  // use IsMutable.
-  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;
 
   // TODO(nisse): For the transition, we use default implementations
   // of the stride and data methods where the new methods calls the
   // old method, and the old method calls the new methods. Subclasses
   // must override either the new methods or the old method, to break
   // infinite recursion. And similarly for the strides. When
   // applications, in particular Chrome, are updated, delete the old
   // method and delete the default implementation of the new methods.
 
   // 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;
   virtual const uint8_t* DataU() const;
   virtual const uint8_t* DataV() const;
   // Deprecated method.
   // TODO(nisse): Delete after all users are updated.
   virtual const uint8_t* data(PlaneType type) const;
 
-  // Non-const data access is allowed only if HasOneRef() is true.
+  // TODO(nisse): Move MutableData methods to the I420Buffer subclass.
+  // Non-const data access.
   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);
 
   // Returns the number of bytes between successive rows for a given plane.
   virtual int StrideY() const;
   virtual int StrideU() const;
   virtual int StrideV() const;
@@ skipping 17 matching lines @@
  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* DataY() const override;
   const uint8_t* DataU() const override;
   const uint8_t* DataV() const override;
-  // Non-const data access is only allowed if IsMutable() is true, to protect
-  // against unexpected overwrites.
-  bool IsMutable() 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;
 
@@ skipping 24 matching lines @@
   int width() const override;
   int height() 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;
-  bool IsMutable() 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;
 
-  bool IsMutable() 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;
 
   rtc::scoped_refptr<VideoFrameBuffer> NativeToI420Buffer() override;
@@ skipping 16 matching lines @@
 // 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_