zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete deprecated class WrappedI420Buffer

Browse Source 
Bug: None
Change-Id: Ife3ac3f65d7631732e8007ba1563e7eaf8606ff7
Reviewed-on: https://webrtc-review.googlesource.com/c/110249
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25615}
This commit is contained in:
Niels Möller
2018-11-08 17:07:27 +01:00
committed by Commit Bot
parent f4ce0e4a9f
commit 90e6745f77
4 changed files with 10 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
common_video/include/video_frame_buffer.h
View File

@ -20,43 +20,6 @@
namespace webrtc { namespace webrtc {
// Deprecated. Please use WrapI420Buffer(...) instead.
class WrappedI420Buffer : public I420BufferInterface {
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* 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;
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_;
};
rtc::scoped_refptr<I420BufferInterface> WrapI420Buffer( rtc::scoped_refptr<I420BufferInterface> WrapI420Buffer(
int width, int width,
int height, int height,

51
common_video/video_frame_buffer.cc
View File

@ -203,57 +203,6 @@ rtc::scoped_refptr<I420BufferInterface> I010BufferBase::ToI420() {
} // namespace } // namespace
WrappedI420Buffer::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)
: width_(width),
height_(height),
y_plane_(y_plane),
u_plane_(u_plane),
v_plane_(v_plane),
y_stride_(y_stride),
u_stride_(u_stride),
v_stride_(v_stride),
no_longer_used_cb_(no_longer_used) {}
WrappedI420Buffer::~WrappedI420Buffer() {
no_longer_used_cb_();
}
int WrappedI420Buffer::width() const {
return width_;
}
int WrappedI420Buffer::height() const {
return height_;
}
const uint8_t* WrappedI420Buffer::DataY() const {
return y_plane_;
}
const uint8_t* WrappedI420Buffer::DataU() const {
return u_plane_;
}
const uint8_t* WrappedI420Buffer::DataV() const {
return v_plane_;
}
int WrappedI420Buffer::StrideY() const {
return y_stride_;
}
int WrappedI420Buffer::StrideU() const {
return u_stride_;
}
int WrappedI420Buffer::StrideV() const {
return v_stride_;
}
rtc::scoped_refptr<I420BufferInterface> WrapI420Buffer( rtc::scoped_refptr<I420BufferInterface> WrapI420Buffer(
int width, int width,
int height, int height,

10
modules/video_coding/codecs/h264/h264_decoder_impl.cc
View File

@ -323,13 +323,11 @@ int32_t H264DecoderImpl::Decode(const EncodedImage& input_image,
// without copying the underlying buffer. // without copying the underlying buffer.
if (av_frame_->width != i420_buffer->width() || if (av_frame_->width != i420_buffer->width() ||
av_frame_->height != i420_buffer->height()) { av_frame_->height != i420_buffer->height()) {
rtc::scoped_refptr<VideoFrameBuffer> cropped_buf( rtc::scoped_refptr<VideoFrameBuffer> cropped_buf = WrapI420Buffer(
new rtc::RefCountedObject<WrappedI420Buffer>( av_frame_->width, av_frame_->height, i420_buffer->DataY(),
av_frame_->width, av_frame_->height, i420_buffer->StrideY(), i420_buffer->DataU(), i420_buffer->StrideU(),
i420_buffer->DataY(), i420_buffer->StrideY(),
i420_buffer->DataU(), i420_buffer->StrideU(),
i420_buffer->DataV(), i420_buffer->StrideV(), i420_buffer->DataV(), i420_buffer->StrideV(),
rtc::KeepRefUntilDone(i420_buffer))); rtc::KeepRefUntilDone(i420_buffer));
VideoFrame cropped_frame = VideoFrame cropped_frame =
VideoFrame::Builder() VideoFrame::Builder()
.set_video_frame_buffer(cropped_buf) .set_video_frame_buffer(cropped_buf)

10
test/frame_generator.cc
View File

@ -390,11 +390,11 @@ class ScrollingImageFrameGenerator : public FrameGenerator {
(pixels_scrolled_x / 2); (pixels_scrolled_x / 2);
current_frame_ = webrtc::VideoFrame( current_frame_ = webrtc::VideoFrame(
new rtc::RefCountedObject<webrtc::WrappedI420Buffer>( WrapI420Buffer(target_width_, target_height_,
target_width_, target_height_, &i420_buffer->DataY()[offset_y], &i420_buffer->DataY()[offset_y], i420_buffer->StrideY(),
i420_buffer->StrideY(), &i420_buffer->DataU()[offset_u], &i420_buffer->DataU()[offset_u], i420_buffer->StrideU(),
i420_buffer->StrideU(), &i420_buffer->DataV()[offset_v], &i420_buffer->DataV()[offset_v], i420_buffer->StrideV(),
i420_buffer->StrideV(), KeepRefUntilDone(i420_buffer)), KeepRefUntilDone(i420_buffer)),
kVideoRotation_0, 0); kVideoRotation_0, 0);
} }