commit 03e6ec9db0ec894e12f96713269a0c7b63502f60
author Emircan Uysaler <emircan@webrtc.org> Fri Mar 09 23:03:26 2018
committer Commit Bot <commit-bot@chromium.org> Sat Mar 10 01:21:04 2018
tree 2c8e5faa339cb22ab7096f26349b2d09c6e5fa1e
parent 35576ac007c82e824943087e72dd33693fffb7ac

Reland "Add multiplex case to webrtc_perf_tests"

This is a reland of d90a7e842437f5760a34bbfa283b3c4182963889

Original change's description:
> Add multiplex case to webrtc_perf_tests
>
> This CL adds two new tests to perf, covering I420 and I420A input to multiplex
> codec. In order to have the correct input, it adds I420A case to
> SquareGenerator and corresponding PSNR and SSIM calculations.
>
> Bug: webrtc:7671
> Change-Id: I9735d725bbfba457e804e29907cee55406ae5c8d
> Reviewed-on: https://webrtc-review.googlesource.com/52180
> Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
> Reviewed-by: Niklas Enbom <niklas.enbom@webrtc.org>
> Reviewed-by: Erik Språng <sprang@webrtc.org>
> Commit-Queue: Emircan Uysaler <emircan@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#22330}

Bug: webrtc:7671
Change-Id: Ib6e37ce4bc0bae903dd72f49ffdc2ee583d75491
TBR: niklas.enbom@webrtc.org, phoglund@webrtc.org, sprang@webrtc.org
Reviewed-on: https://webrtc-review.googlesource.com/61120
Reviewed-by: Emircan Uysaler <emircan@webrtc.org>
Commit-Queue: Emircan Uysaler <emircan@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22376}

test/call_test.cc

diff --git a/test/call_test.cc b/test/call_test.cc
index 80bdd02..2311fc7 100644
--- a/test/call_test.cc
+++ b/test/call_test.cc
@@ -316,7 +316,7 @@
                                                      int width,
                                                      int height) {
   frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create(
-      width, height, framerate * speed, clock));
+      width, height, rtc::nullopt, rtc::nullopt, framerate * speed, clock));
   video_send_stream_->SetSource(
       frame_generator_capturer_.get(),
       VideoSendStream::DegradationPreference::kMaintainFramerate);
@@ -325,8 +325,8 @@
 void CallTest::CreateFrameGeneratorCapturer(int framerate,
                                             int width,
                                             int height) {
-  frame_generator_capturer_.reset(
-      test::FrameGeneratorCapturer::Create(width, height, framerate, clock_));
+  frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create(
+      width, height, rtc::nullopt, rtc::nullopt, framerate, clock_));
   video_send_stream_->SetSource(
       frame_generator_capturer_.get(),
       VideoSendStream::DegradationPreference::kMaintainFramerate);