aboutsummaryrefslogtreecommitdiff
path: root/video/video_receive_stream_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'video/video_receive_stream_unittest.cc')
-rw-r--r--video/video_receive_stream_unittest.cc11
1 files changed, 3 insertions, 8 deletions
diff --git a/video/video_receive_stream_unittest.cc b/video/video_receive_stream_unittest.cc
index e4ba69b7b9..4b433d28e8 100644
--- a/video/video_receive_stream_unittest.cc
+++ b/video/video_receive_stream_unittest.cc
@@ -23,7 +23,6 @@
#include "rtc_base/event.h"
#include "system_wrappers/include/clock.h"
#include "test/field_trial.h"
-#include "test/video_decoder_proxy_factory.h"
#include "video/call_stats.h"
#include "video/video_receive_stream.h"
@@ -66,9 +65,7 @@ class VideoReceiveStreamTest : public testing::Test {
VideoReceiveStreamTest()
: process_thread_(ProcessThread::Create("TestThread")),
config_(&mock_transport_),
- call_stats_(Clock::GetRealTimeClock(), process_thread_.get()),
- h264_decoder_factory_(&mock_h264_video_decoder_),
- null_decoder_factory_(&mock_null_video_decoder_) {}
+ call_stats_(Clock::GetRealTimeClock(), process_thread_.get()) {}
void SetUp() {
constexpr int kDefaultNumCpuCores = 2;
@@ -80,12 +77,12 @@ class VideoReceiveStreamTest : public testing::Test {
h264_decoder.video_format = SdpVideoFormat("H264");
h264_decoder.video_format.parameters.insert(
{"sprop-parameter-sets", "Z0IACpZTBYmI,aMljiA=="});
- h264_decoder.decoder_factory = &h264_decoder_factory_;
+ h264_decoder.decoder = &mock_h264_video_decoder_;
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_;
+ null_decoder.decoder = &mock_null_video_decoder_;
config_.decoders.push_back(null_decoder);
video_receive_stream_.reset(new webrtc::internal::VideoReceiveStream(
@@ -99,8 +96,6 @@ class VideoReceiveStreamTest : public testing::Test {
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_;