Added Vp9 simulcast tests.

webrtc/common_video/libyuv/webrtc_libyuv.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 270 matching lines @@
       src_frame.video_frame_buffer()->StrideY(),
       src_frame.video_frame_buffer()->DataU(),
       src_frame.video_frame_buffer()->StrideU(),
       src_frame.video_frame_buffer()->DataV(),
       src_frame.video_frame_buffer()->StrideV(),
       dst_frame, dst_sample_size,
       src_frame.width(), src_frame.height(),
       ConvertVideoType(dst_video_type));
 }
 
-// Compute PSNR for an I420 frame (all planes)
+// Compute PSNR for an I420 frame (all planes). Can upscale test frame.
 double I420PSNR(const VideoFrameBuffer& ref_buffer,
                 const VideoFrameBuffer& test_buffer) {
+  rtc::scoped_refptr<const VideoFrameBuffer> temp_buffer(&test_buffer);

[magjed_webrtc, 2017/02/14 12:47:49]

Taking the address of a const-ref argument is sketchy, you are not supposed to
know/care about the lifetime management of such an argument. I would recommend
removing |temp_buffer|, and do:
return I420PSNR(ref_buffer, *scaled_buffer);
inside the if-statement instead. An alternative is that you factor out the
common code in I420PSNR and I420SSIM in a way that doesn't require you taking
the address of the const-ref argument.

[ilnik, 2017/02/14 13:04:16]

That is a great idea!

+  RTC_DCHECK_GE(ref_buffer.width(), test_buffer.width());
+  RTC_DCHECK_GE(ref_buffer.height(), test_buffer.height());
+  RTC_DCHECK_GE(ref_buffer.width(), 0);

[magjed_webrtc, 2017/02/14 12:47:49]

This check is really paranoid. Width/height is never supposed to be negative and
we don't check it in other places. Just let it crash for these cases instead.

[ilnik, 2017/02/14 13:04:16]

Acknowledged.

+  RTC_DCHECK_GE(ref_buffer.height(), 0);
   if ((ref_buffer.width() != test_buffer.width()) ||
-      (ref_buffer.height() != test_buffer.height()))
-    return -1;
-  else if (ref_buffer.width() < 0 || ref_buffer.height() < 0)
-    return -1;
-
-  double psnr = libyuv::I420Psnr(ref_buffer.DataY(), ref_buffer.StrideY(),
-                                 ref_buffer.DataU(), ref_buffer.StrideU(),
-                                 ref_buffer.DataV(), ref_buffer.StrideV(),
-                                 test_buffer.DataY(), test_buffer.StrideY(),
-                                 test_buffer.DataU(), test_buffer.StrideU(),
-                                 test_buffer.DataV(), test_buffer.StrideV(),
-                                 test_buffer.width(), test_buffer.height());
+      (ref_buffer.height() != test_buffer.height())) {
+    rtc::scoped_refptr<I420Buffer> scaled_buffer =
+        I420Buffer::Create(ref_buffer.width(), ref_buffer.height());
+    scaled_buffer->ScaleFrom(test_buffer);
+    temp_buffer = static_cast<VideoFrameBuffer*>(scaled_buffer.get());
+  }
+  double psnr = libyuv::I420Psnr(
+      ref_buffer.DataY(), ref_buffer.StrideY(), ref_buffer.DataU(),
+      ref_buffer.StrideU(), ref_buffer.DataV(), ref_buffer.StrideV(),
+      temp_buffer->DataY(), temp_buffer->StrideY(), temp_buffer->DataU(),
+      temp_buffer->StrideU(), temp_buffer->DataV(), temp_buffer->StrideV(),
+      temp_buffer->width(), temp_buffer->height());
   // LibYuv sets the max psnr value to 128, we restrict it here.
   // In case of 0 mse in one frame, 128 can skew the results significantly.
   return (psnr > kPerfectPSNR) ? kPerfectPSNR : psnr;
 }
 
 // Compute PSNR for an I420 frame (all planes)
 double I420PSNR(const VideoFrame* ref_frame, const VideoFrame* test_frame) {
   if (!ref_frame || !test_frame)
     return -1;
   return I420PSNR(*ref_frame->video_frame_buffer(),
                   *test_frame->video_frame_buffer());
 }
 
-// Compute SSIM for an I420 frame (all planes)
+// Compute SSIM for an I420 frame (all planes). Can upscale test_buffer.
 double I420SSIM(const VideoFrameBuffer& ref_buffer,
                 const VideoFrameBuffer& test_buffer) {
+  rtc::scoped_refptr<const VideoFrameBuffer> temp_buffer(&test_buffer);
+  RTC_DCHECK_GE(ref_buffer.width(), test_buffer.width());
+  RTC_DCHECK_GE(ref_buffer.height(), test_buffer.height());
+  RTC_DCHECK_GE(ref_buffer.width(), 0);
+  RTC_DCHECK_GE(ref_buffer.height(), 0);
   if ((ref_buffer.width() != test_buffer.width()) ||
-      (ref_buffer.height() != test_buffer.height()))
-    return -1;
-  else if (ref_buffer.width() < 0 || ref_buffer.height() < 0)
-    return -1;
-
-  return libyuv::I420Ssim(ref_buffer.DataY(), ref_buffer.StrideY(),
-                          ref_buffer.DataU(), ref_buffer.StrideU(),
-                          ref_buffer.DataV(), ref_buffer.StrideV(),
-                          test_buffer.DataY(), test_buffer.StrideY(),
-                          test_buffer.DataU(), test_buffer.StrideU(),
-                          test_buffer.DataV(), test_buffer.StrideV(),
-                          test_buffer.width(), test_buffer.height());
+      (ref_buffer.height() != test_buffer.height())) {
+    rtc::scoped_refptr<I420Buffer> scaled_buffer =
+        I420Buffer::Create(ref_buffer.width(), ref_buffer.height());
+    scaled_buffer->ScaleFrom(test_buffer);
+    temp_buffer = static_cast<VideoFrameBuffer*>(scaled_buffer.get());
+  }
+  return libyuv::I420Ssim(
+      ref_buffer.DataY(), ref_buffer.StrideY(), ref_buffer.DataU(),
+      ref_buffer.StrideU(), ref_buffer.DataV(), ref_buffer.StrideV(),
+      temp_buffer->DataY(), temp_buffer->StrideY(), temp_buffer->DataU(),
+      temp_buffer->StrideU(), temp_buffer->DataV(), temp_buffer->StrideV(),
+      temp_buffer->width(), temp_buffer->height());
 }
 double I420SSIM(const VideoFrame* ref_frame, const VideoFrame* test_frame) {
   if (!ref_frame || !test_frame)
     return -1;
   return I420SSIM(*ref_frame->video_frame_buffer(),
                   *test_frame->video_frame_buffer());
 }
 
 void NV12Scale(std::vector<uint8_t>* tmp_buffer,
                const uint8_t* src_y, int src_stride_y,
@@ skipping 96 matching lines @@
                     src_v, src_uv_width,
                     src_width, src_height,
                     dst_y, dst_stride_y,
                     dst_u, dst_stride_u,
                     dst_v, dst_stride_v,
                     dst_width, dst_height,
                     libyuv::kFilterBox);
 }
 
 }  // namespace webrtc