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

webrtc/modules/video_processing/video_denoiser.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 189 matching lines @@
           IsTrailingBlock(moving_edge_, mb_row, mb_col) ||
           (x_density_[mb_col] * y_density_[mb_row] &&
            moving_object_[mb_row * mb_cols_ + mb_col])) {
         // Copy y source.
         filter_->CopyMem16x16(mb_src, stride_y_, mb_dst, stride_y_);
       }
     }
   }
 }
 
+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,
                                  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.
   if (width_ != frame.width() || height_ != frame.height()) {
     DenoiserReset(frame, denoised_frame, denoised_frame_prev);
     return;
   }
@@ skipping 82 matching lines @@
           }
         }
       }
     }  // End of for loop
   }    // End of for loop
 
   ReduceFalseDetection(moving_edge_, &moving_object_, noise_level);
 
   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_);
   memcpy(v_dst, v_src, (height_ >> 1) * stride_v_);
 
   // Set time parameters to the output frame.
   denoised_frame->set_timestamp(frame.timestamp());
   denoised_frame->set_render_time_ms(frame.render_time_ms());
 
 #if DISPLAY || DISPLAYNEON
   // Show rectangular region
   ShowRect(filter_, moving_edge_, moving_object_, x_density_, y_density_, u_src,
            v_src, u_dst, v_dst, mb_rows_, mb_cols_, stride_u_, stride_v_);
 #endif
 }
 
 }  // namespace webrtc