| Index: webrtc/video_frame.h
|
| diff --git a/webrtc/video_frame.h b/webrtc/video_frame.h
|
| index b5e13f039b0cd6c7f7f2920cab126124c39039a9..a04c580458dba508267c070eba663aca0a578b64 100644
|
| --- a/webrtc/video_frame.h
|
| +++ b/webrtc/video_frame.h
|
| @@ -68,17 +68,9 @@ class VideoFrame {
|
| // Release frame buffer and reset time stamps.
|
| void Reset();
|
|
|
| - // 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;
|
|
|
| @@ -127,7 +119,11 @@ class VideoFrame {
|
|
|
| // 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 (admittedly brittle)
|
| + // 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(
|
|
|