Clean the code for external denoiser.

webrtc/common_video/video_frame.cc

 /*
  *  Copyright (c) 2012 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 16 matching lines @@
   for (int y = 0; y < height; ++y) {
     if (memcmp(data1, data2, width) != 0)
       return false;
     data1 += stride;
     data2 += stride;
   }
   return true;
 }
 
 int ExpectedSize(int plane_stride, int image_height, PlaneType type) {
-  if (type == kYPlane) {
-    return (plane_stride * image_height);
-  } else {
-    int half_height = (image_height + 1) / 2;
-    return (plane_stride * half_height);
-  }
+  if (type == kYPlane)
+    return plane_stride * image_height;
+  return plane_stride * (image_height + 1) / 2;

[tommi, 2016/01/13 09:45:10]

hmm... is the failure caused by this change?

 }
 
 VideoFrame::VideoFrame() {
   // Intentionally using Reset instead of initializer list so that any missed
   // fields in Reset will be caught by memory checkers.
   Reset();
 }
 
 VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
                        uint32_t timestamp,
@@ skipping 166 matching lines @@
 
 VideoFrame VideoFrame::ConvertNativeToI420Frame() const {
   RTC_DCHECK(native_handle());
   VideoFrame frame;
   frame.ShallowCopy(*this);
   frame.set_video_frame_buffer(video_frame_buffer_->NativeToI420Buffer());
   return frame;
 }
 
 bool VideoFrame::EqualsFrame(const VideoFrame& frame) const {
-  if ((this->width() != frame.width()) || (this->height() != frame.height()) ||
-      (this->stride(kYPlane) != frame.stride(kYPlane)) ||
-      (this->stride(kUPlane) != frame.stride(kUPlane)) ||
-      (this->stride(kVPlane) != frame.stride(kVPlane)) ||
-      (this->timestamp() != frame.timestamp()) ||
-      (this->ntp_time_ms() != frame.ntp_time_ms()) ||
-      (this->render_time_ms() != frame.render_time_ms())) {
+  if (width() != frame.width() || height() != frame.height() ||
+      stride(kYPlane) != frame.stride(kYPlane) ||
+      stride(kUPlane) != frame.stride(kUPlane) ||
+      stride(kVPlane) != frame.stride(kVPlane) ||
+      timestamp() != frame.timestamp() ||
+      ntp_time_ms() != frame.ntp_time_ms() ||
+      render_time_ms() != frame.render_time_ms()) {
     return false;
   }
-  const int half_width = (this->width() + 1) / 2;
-  const int half_height = (this->height() + 1) / 2;
-  return EqualPlane(this->buffer(kYPlane), frame.buffer(kYPlane),
-                    this->stride(kYPlane), this->width(), this->height()) &&
-         EqualPlane(this->buffer(kUPlane), frame.buffer(kUPlane),
-                    this->stride(kUPlane), half_width, half_height) &&
-         EqualPlane(this->buffer(kVPlane), frame.buffer(kVPlane),
-                    this->stride(kVPlane), half_width, half_height);
+  const int half_width = (width() + 1) / 2;
+  const int half_height = (height() + 1) / 2;
+  return EqualPlane(buffer(kYPlane), frame.buffer(kYPlane),
+                    stride(kYPlane), width(), height()) &&
+         EqualPlane(buffer(kUPlane), frame.buffer(kUPlane),
+                    stride(kUPlane), half_width, half_height) &&
+         EqualPlane(buffer(kVPlane), frame.buffer(kVPlane),
+                    stride(kVPlane), half_width, half_height);
 }
 
 }  // namespace webrtc