admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix an issue in external VNR when width or height not divisible by 16.

Browse Source 
When frame width or height not divisible by 16, copy the margin to denoised
frame, otherwise, the margin block (smaller than 16x16) will not be
updated for non-keyframe.

Review URL: https://codereview.webrtc.org/1917703002

Cr-Commit-Position: refs/heads/master@{#12497}
This commit is contained in:
jackychen 2016-04-25 16:53:59 -07:00 committed by Commit bot
parent 1d4a4b9710
commit 6650d6d1f6
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
webrtc/modules/video_processing/video_denoiser.cc
View File

@ -207,6 +207,23 @@ void VideoDenoiser::CopySrcOnMOB(const uint8_t* y_src, uint8_t* y_dst) {
}
}
void VideoDenoiser::CopyLumaOnMargin(const uint8_t* y_src, uint8_t* y_dst) {
if ((mb_rows_ << 4) != height_) {
const uint8_t* margin_y_src = y_src + (mb_rows_ << 4) * stride_y_;
uint8_t* margin_y_dst = y_dst + (mb_rows_ << 4) * stride_y_;
memcpy(margin_y_dst, margin_y_src, (height_ - (mb_rows_ << 4)) * stride_y_);
}
if ((mb_cols_ << 4) != width_) {
const uint8_t* margin_y_src = y_src + (mb_cols_ << 4);
uint8_t* margin_y_dst = y_dst + (mb_cols_ << 4);
for (int i = 0; i < height_; ++i) {
for (int j = mb_cols_ << 4; j < width_; ++j) {
margin_y_dst[i * stride_y_ + j] = margin_y_src[i * stride_y_ + j];
}
}
}
}
void VideoDenoiser::DenoiseFrame(const VideoFrame& frame,
VideoFrame* denoised_frame,
VideoFrame* denoised_frame_prev,
@ -309,6 +326,11 @@ void VideoDenoiser::DenoiseFrame(const VideoFrame& frame,
CopySrcOnMOB(y_src, y_dst);
// When frame width/height not divisible by 16, copy the margin to
// denoised_frame.
if ((mb_rows_ << 4) != height_ || (mb_cols_ << 4) != width_)
CopyLumaOnMargin(y_src, y_dst);
// TODO(jackychen): Need SSE2/NEON opt.
// Copy u/v planes.
memcpy(u_dst, u_src, (height_ >> 1) * stride_u_);

3
webrtc/modules/video_processing/video_denoiser.h
View File

@ -52,6 +52,9 @@ class VideoDenoiser {
// Copy input blocks to dst buffer on moving object blocks (MOB).
void CopySrcOnMOB(const uint8_t* y_src, uint8_t* y_dst);
// Copy luma margin blocks when frame width/height not divisible by 16.
void CopyLumaOnMargin(const uint8_t* y_src, uint8_t* y_dst);
int width_;
int height_;
int mb_rows_;