Reland of Delete webrtc::VideoFrame methods buffer and stride.

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 47 matching lines @@
                   VideoRotation rotation);
 
   // Deep copy frame: If required size is bigger than allocated one, new
   // buffers of adequate size will be allocated.
   void CopyFrame(const VideoFrame& videoFrame);
 
   // Creates a shallow copy of |videoFrame|, i.e, the this object will retain a
   // reference to the video buffer also retained by |videoFrame|.
   void ShallowCopy(const VideoFrame& videoFrame);
 
-  // Get pointer to buffer per plane.
-  uint8_t* buffer(PlaneType type);
-  // Overloading with const.
-  const uint8_t* buffer(PlaneType type) const;
-
   // Get allocated size per plane.
   int allocated_size(PlaneType type) const;
 
-  // Get allocated stride per plane.
-  int stride(PlaneType type) const;
-
   // Get frame width.
   int width() const;
 
   // Get frame height.
   int height() const;
 
   // Set frame timestamp (90kHz).
   void set_timestamp(uint32_t timestamp) { timestamp_ = timestamp; }
 
   // Get frame timestamp (90kHz).
@@ skipping 28 matching lines @@
   }
 
   // Get render time in miliseconds.
   int64_t render_time_ms() const { return render_time_ms_; }
 
   // Return true if underlying plane buffers are of zero size, false if not.
   bool IsZeroSize() const;
 
   // Return the underlying buffer. Never nullptr for a properly
   // initialized VideoFrame.
-  rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer() const;
+  // Creating a new reference breaks the HasOneRef and IsMutable
+  // logic. So return a const ref to our reference.
+  const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& video_frame_buffer()
+      const;
 
   // Set the underlying buffer.
   void set_video_frame_buffer(
       const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer);
 
   // Convert native-handle frame to memory-backed I420 frame. Should not be
   // called on a non-native-handle frame.
   VideoFrame ConvertNativeToI420Frame() const;
 
  private:
@@ skipping 43 matching lines @@
   size_t _length;
   size_t _size;
   VideoRotation rotation_ = kVideoRotation_0;
   bool _completeFrame = false;
   AdaptReason adapt_reason_;
   int qp_ = -1;  // Quantizer value.
 };
 
 }  // namespace webrtc
 #endif  // WEBRTC_VIDEO_FRAME_H_