Update webrtc/media and webrtc/modules to new VideoFrameBuffer interface
TBR=stefan
Bug: webrtc:7632
Change-Id: Ifdaf4a591061595a53f677441baad85820336b34
Reviewed-on: https://chromium-review.googlesource.com/530844
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#18591}diff --git a/webrtc/modules/video_processing/test/denoiser_test.cc b/webrtc/modules/video_processing/test/denoiser_test.cc
index b5e0352..b27e5fc 100644
--- a/webrtc/modules/video_processing/test/denoiser_test.cc
+++ b/webrtc/modules/video_processing/test/denoiser_test.cc
@@ -141,14 +141,14 @@
VideoDenoiser denoiser_sse_neon(true);
for (;;) {
- rtc::scoped_refptr<VideoFrameBuffer> video_frame_buffer(
+ rtc::scoped_refptr<I420BufferInterface> video_frame_buffer(
test::ReadI420Buffer(kWidth, kHeight, source_file));
if (!video_frame_buffer)
break;
- rtc::scoped_refptr<VideoFrameBuffer> denoised_frame_c(
+ rtc::scoped_refptr<I420BufferInterface> denoised_frame_c(
denoiser_c.DenoiseFrame(video_frame_buffer, false));
- rtc::scoped_refptr<VideoFrameBuffer> denoised_frame_sse_neon(
+ rtc::scoped_refptr<I420BufferInterface> denoised_frame_sse_neon(
denoiser_sse_neon.DenoiseFrame(video_frame_buffer, false));
// Denoising results should be the same for C and SSE/NEON denoiser.
diff --git a/webrtc/modules/video_processing/video_denoiser.cc b/webrtc/modules/video_processing/video_denoiser.cc
index 8c645f2..a926bf4 100644
--- a/webrtc/modules/video_processing/video_denoiser.cc
+++ b/webrtc/modules/video_processing/video_denoiser.cc
@@ -72,7 +72,8 @@
filter_(DenoiserFilter::Create(runtime_cpu_detection, &cpu_type_)),
ne_(new NoiseEstimation()) {}
-void VideoDenoiser::DenoiserReset(rtc::scoped_refptr<VideoFrameBuffer> frame) {
+void VideoDenoiser::DenoiserReset(
+ rtc::scoped_refptr<I420BufferInterface> frame) {
width_ = frame->width();
height_ = frame->height();
mb_cols_ = width_ >> 4;
@@ -211,8 +212,8 @@
}
}
-rtc::scoped_refptr<VideoFrameBuffer> VideoDenoiser::DenoiseFrame(
- rtc::scoped_refptr<VideoFrameBuffer> frame,
+rtc::scoped_refptr<I420BufferInterface> VideoDenoiser::DenoiseFrame(
+ rtc::scoped_refptr<I420BufferInterface> frame,
bool noise_estimation_enabled) {
// If previous width and height are different from current frame's, need to
// reallocate the buffers and no denoising for the current frame.
diff --git a/webrtc/modules/video_processing/video_denoiser.h b/webrtc/modules/video_processing/video_denoiser.h
index e67bd59..e8cd22d 100644
--- a/webrtc/modules/video_processing/video_denoiser.h
+++ b/webrtc/modules/video_processing/video_denoiser.h
@@ -24,12 +24,12 @@
public:
explicit VideoDenoiser(bool runtime_cpu_detection);
- rtc::scoped_refptr<VideoFrameBuffer> DenoiseFrame(
- rtc::scoped_refptr<VideoFrameBuffer> frame,
+ rtc::scoped_refptr<I420BufferInterface> DenoiseFrame(
+ rtc::scoped_refptr<I420BufferInterface> frame,
bool noise_estimation_enabled);
private:
- void DenoiserReset(rtc::scoped_refptr<VideoFrameBuffer> frame);
+ void DenoiserReset(rtc::scoped_refptr<I420BufferInterface> frame);
// Check the mb position, return 1: close to the frame center (between 1/8
// and 7/8 of width/height), 3: close to the border (out of 1/16 and 15/16
@@ -76,7 +76,7 @@
// Save the return values by MbDenoise for each block.
std::unique_ptr<DenoiserDecision[]> mb_filter_decision_;
I420BufferPool buffer_pool_;
- rtc::scoped_refptr<VideoFrameBuffer> prev_buffer_;
+ rtc::scoped_refptr<I420BufferInterface> prev_buffer_;
};
} // namespace webrtc