Delete deprecated VideoFrameBuffer methods.
(Reland of part of https://codereview.webrtc.org/2065733003/).
BUG=webrtc:5682
Review-Url: https://codereview.webrtc.org/2088753002
Cr-Commit-Position: refs/heads/master@{#13235}
diff --git a/webrtc/common_video/include/video_frame_buffer.h b/webrtc/common_video/include/video_frame_buffer.h
index cf314fe..94b3d5d 100644
--- a/webrtc/common_video/include/video_frame_buffer.h
+++ b/webrtc/common_video/include/video_frame_buffer.h
@@ -38,37 +38,22 @@
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;
+ virtual const uint8_t* DataY() const = 0;
+ virtual const uint8_t* DataU() const = 0;
+ virtual const uint8_t* DataV() const = 0;
// 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;
- // Deprecated method. TODO(nisse): Delete after all users are updated.
- virtual int stride(PlaneType type) const;
+ 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.
diff --git a/webrtc/common_video/video_frame_buffer.cc b/webrtc/common_video/video_frame_buffer.cc
index 2875c66..23643c4 100644
--- a/webrtc/common_video/video_frame_buffer.cc
+++ b/webrtc/common_video/video_frame_buffer.cc
@@ -30,54 +30,6 @@
} // namespace
-const uint8_t* VideoFrameBuffer::data(PlaneType type) const {
- switch (type) {
- case kYPlane:
- return DataY();
- case kUPlane:
- return DataU();
- case kVPlane:
- return DataV();
- default:
- RTC_NOTREACHED();
- return nullptr;
- }
-}
-
-const uint8_t* VideoFrameBuffer::DataY() const {
- return data(kYPlane);
-}
-const uint8_t* VideoFrameBuffer::DataU() const {
- return data(kUPlane);
-}
-const uint8_t* VideoFrameBuffer::DataV() const {
- return data(kVPlane);
-}
-
-int VideoFrameBuffer::stride(PlaneType type) const {
- switch (type) {
- case kYPlane:
- return StrideY();
- case kUPlane:
- return StrideU();
- case kVPlane:
- return StrideV();
- default:
- RTC_NOTREACHED();
- return 0;
- }
-}
-
-int VideoFrameBuffer::StrideY() const {
- return stride(kYPlane);
-}
-int VideoFrameBuffer::StrideU() const {
- return stride(kUPlane);
-}
-int VideoFrameBuffer::StrideV() const {
- return stride(kVPlane);
-}
-
uint8_t* VideoFrameBuffer::MutableDataY() {
RTC_NOTREACHED();
return nullptr;
@@ -91,20 +43,6 @@
return nullptr;
}
-uint8_t* VideoFrameBuffer::MutableData(PlaneType type) {
- switch (type) {
- case kYPlane:
- return MutableDataY();
- case kUPlane:
- return MutableDataU();
- case kVPlane:
- return MutableDataV();
- default:
- RTC_NOTREACHED();
- return nullptr;
- }
-}
-
VideoFrameBuffer::~VideoFrameBuffer() {}
I420Buffer::I420Buffer(int width, int height)
