commit 4f2783b9fe778ec8852432eade83c31bc8a31239
author Patrik Höglund <phoglund@webrtc.org> Fri Oct 25 10:23:34 2019 +0200
committer Commit Bot <commit-bot@chromium.org> Fri Oct 25 09:09:30 2019 +0000
tree dc931232252afdd13ff6028a6cdcf8f8d0744765
parent b394a565ab89dd788808d51fd3dce1b592ff952f

Speculative Revert: "Use FakeRenderer when fuzzing"

This reverts commit ce9da1636aba347f452f33a00a75b929eee77570.
The vp8_replay_fuzzer runs out of memory unders MSAN for the input
in bug 1015797.

Tbr: kcwu@chromium.org
Bug: chromium:1015797, chromium:952606, chromium:1009077, chromium:1009073
Change-Id: Iab03437595b33e56816efe83b74fab6faf2340da
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/158402
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29609}

test/fuzzers/utils/BUILD.gn

diff --git a/test/fuzzers/utils/BUILD.gn b/test/fuzzers/utils/BUILD.gn
index 8436dc0..165ac93 100644
--- a/test/fuzzers/utils/BUILD.gn
+++ b/test/fuzzers/utils/BUILD.gn
@@ -35,7 +35,7 @@
     "../../../test:rtp_test_utils",
     "../../../test:run_test",
     "../../../test:run_test_interface",
-    "../../../test:test_common",
+    "../../../test:test_renderer",
     "../../../test:test_support",
     "../../../test:video_test_common",
   ]

test/fuzzers/utils/rtp_replayer.cc

diff --git a/test/fuzzers/utils/rtp_replayer.cc b/test/fuzzers/utils/rtp_replayer.cc
index fe41f00..af03be2 100644
--- a/test/fuzzers/utils/rtp_replayer.cc
+++ b/test/fuzzers/utils/rtp_replayer.cc
@@ -21,7 +21,6 @@
 #include "test/call_config_utils.h"
 #include "test/encoder_settings.h"
 #include "test/fake_decoder.h"
-#include "test/fake_videorenderer.h"
 #include "test/rtp_file_reader.h"
 #include "test/rtp_header_parser.h"
 
@@ -112,7 +111,9 @@
       decoder.decoder_factory = stream_state->decoder_factory.get();
     }
 
-    stream_state->sinks.emplace_back(new test::FakeVideoRenderer());
+    // Create the window to display the rendered video.
+    stream_state->sinks.emplace_back(
+        test::VideoRenderer::Create("Fuzzing WebRTC Video Config", 640, 480));
     // Create a receive stream for this config.
     receive_config.renderer = stream_state->sinks.back().get();
     stream_state->receive_streams.emplace_back(

test/fuzzers/utils/rtp_replayer.h

diff --git a/test/fuzzers/utils/rtp_replayer.h b/test/fuzzers/utils/rtp_replayer.h
index 1fbd3fd..c79a17e 100644
--- a/test/fuzzers/utils/rtp_replayer.h
+++ b/test/fuzzers/utils/rtp_replayer.h
@@ -28,6 +28,7 @@
 #include "test/null_transport.h"
 #include "test/rtp_file_reader.h"
 #include "test/test_video_capturer.h"
+#include "test/video_renderer.h"
 
 namespace webrtc {
 namespace test {