From 668b0530e130fc09a5b93465f1906f6a4b6da627 Mon Sep 17 00:00:00 2001 From: philipel Date: Thu, 23 Jul 2020 13:13:40 +0200 Subject: [PATCH] Removed unused MockVideoDecoder from VideoReceiveStream tests. Bug: webrtc:9106 Change-Id: I2ccb3287dd87b1dce74b73727e1264a75c87a010 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180121 Reviewed-by: Ilya Nikolaevskiy Commit-Queue: Philip Eliasson Cr-Commit-Position: refs/heads/master@{#31786} --- video/video_receive_stream2_unittest.cc | 10 +--------- video/video_receive_stream_unittest.cc | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/video/video_receive_stream2_unittest.cc b/video/video_receive_stream2_unittest.cc index 17dc4de86b..3e8d971246 100644 --- a/video/video_receive_stream2_unittest.cc +++ b/video/video_receive_stream2_unittest.cc @@ -98,8 +98,7 @@ class VideoReceiveStream2Test : public ::testing::Test { task_queue_factory_(CreateDefaultTaskQueueFactory()), config_(&mock_transport_), call_stats_(Clock::GetRealTimeClock(), loop_.task_queue()), - h264_decoder_factory_(&mock_h264_video_decoder_), - null_decoder_factory_(&mock_null_video_decoder_) {} + h264_decoder_factory_(&mock_h264_video_decoder_) {} void SetUp() { constexpr int kDefaultNumCpuCores = 2; @@ -113,11 +112,6 @@ class VideoReceiveStream2Test : public ::testing::Test { {"sprop-parameter-sets", "Z0IACpZTBYmI,aMljiA=="}); h264_decoder.decoder_factory = &h264_decoder_factory_; config_.decoders.push_back(h264_decoder); - VideoReceiveStream::Decoder null_decoder; - null_decoder.payload_type = 98; - null_decoder.video_format = SdpVideoFormat("null"); - null_decoder.decoder_factory = &null_decoder_factory_; - config_.decoders.push_back(null_decoder); clock_ = Clock::GetRealTimeClock(); timing_ = new VCMTiming(clock_); @@ -137,9 +131,7 @@ class VideoReceiveStream2Test : public ::testing::Test { VideoReceiveStream::Config config_; internal::CallStats call_stats_; MockVideoDecoder mock_h264_video_decoder_; - MockVideoDecoder mock_null_video_decoder_; test::VideoDecoderProxyFactory h264_decoder_factory_; - test::VideoDecoderProxyFactory null_decoder_factory_; cricket::FakeVideoRenderer fake_renderer_; MockTransport mock_transport_; PacketRouter packet_router_; diff --git a/video/video_receive_stream_unittest.cc b/video/video_receive_stream_unittest.cc index abdabfb0be..611cffccc4 100644 --- a/video/video_receive_stream_unittest.cc +++ b/video/video_receive_stream_unittest.cc @@ -97,8 +97,7 @@ class VideoReceiveStreamTest : public ::testing::Test { task_queue_factory_(CreateDefaultTaskQueueFactory()), config_(&mock_transport_), call_stats_(Clock::GetRealTimeClock(), process_thread_.get()), - h264_decoder_factory_(&mock_h264_video_decoder_), - null_decoder_factory_(&mock_null_video_decoder_) {} + h264_decoder_factory_(&mock_h264_video_decoder_) {} void SetUp() { constexpr int kDefaultNumCpuCores = 2; @@ -112,11 +111,6 @@ class VideoReceiveStreamTest : public ::testing::Test { {"sprop-parameter-sets", "Z0IACpZTBYmI,aMljiA=="}); h264_decoder.decoder_factory = &h264_decoder_factory_; config_.decoders.push_back(h264_decoder); - VideoReceiveStream::Decoder null_decoder; - null_decoder.payload_type = 98; - null_decoder.video_format = SdpVideoFormat("null"); - null_decoder.decoder_factory = &null_decoder_factory_; - config_.decoders.push_back(null_decoder); clock_ = Clock::GetRealTimeClock(); timing_ = new VCMTiming(clock_); @@ -134,9 +128,7 @@ class VideoReceiveStreamTest : public ::testing::Test { VideoReceiveStream::Config config_; CallStats call_stats_; MockVideoDecoder mock_h264_video_decoder_; - MockVideoDecoder mock_null_video_decoder_; test::VideoDecoderProxyFactory h264_decoder_factory_; - test::VideoDecoderProxyFactory null_decoder_factory_; cricket::FakeVideoRenderer fake_renderer_; MockTransport mock_transport_; PacketRouter packet_router_;