diff --git a/video/BUILD.gn b/video/BUILD.gn index f2f5c99e97..7d15d27c37 100644 --- a/video/BUILD.gn +++ b/video/BUILD.gn @@ -644,6 +644,7 @@ if (rtc_include_tests) { "../api:mock_fec_controller_override", "../api:mock_frame_decryptor", "../api:mock_video_codec_factory", + "../api:mock_video_decoder", "../api:mock_video_encoder", "../api:rtp_headers", "../api:rtp_parameters", diff --git a/video/rtp_video_stream_receiver2_unittest.cc b/video/rtp_video_stream_receiver2_unittest.cc index b5ae816345..b68ef4a1bc 100644 --- a/video/rtp_video_stream_receiver2_unittest.cc +++ b/video/rtp_video_stream_receiver2_unittest.cc @@ -16,6 +16,7 @@ #include "api/task_queue/task_queue_base.h" #include "api/video/video_codec_type.h" #include "api/video/video_frame_type.h" +#include "call/test/mock_rtp_packet_sink_interface.h" #include "common_video/h264/h264_common.h" #include "media/base/media_constants.h" #include "modules/rtp_rtcp/source/rtp_descriptor_authentication.h" @@ -38,6 +39,7 @@ #include "test/gmock.h" #include "test/gtest.h" #include "test/mock_frame_transformer.h" +#include "test/mock_transport.h" #include "test/time_controller/simulated_task_queue.h" #include "test/time_controller/simulated_time_controller.h" @@ -73,15 +75,6 @@ RTPVideoHeader GetGenericVideoHeader(VideoFrameType frame_type) { return video_header; } -class MockTransport : public Transport { - public: - MOCK_METHOD(bool, - SendRtp, - (const uint8_t*, size_t length, const PacketOptions& options), - (override)); - MOCK_METHOD(bool, SendRtcp, (const uint8_t*, size_t length), (override)); -}; - class MockNackSender : public NackSender { public: MOCK_METHOD(void, @@ -130,11 +123,6 @@ class MockOnCompleteFrameCallback rtc::ByteBufferWriter buffer_; }; -class MockRtpPacketSink : public RtpPacketSinkInterface { - public: - MOCK_METHOD(void, OnRtpPacket, (const RtpPacketReceived&), (override)); -}; - constexpr uint32_t kSsrc = 111; constexpr int kPayloadType = 100; constexpr int kRedPayloadType = 125; diff --git a/video/rtp_video_stream_receiver_unittest.cc b/video/rtp_video_stream_receiver_unittest.cc index 901d6931bb..22cb37fa16 100644 --- a/video/rtp_video_stream_receiver_unittest.cc +++ b/video/rtp_video_stream_receiver_unittest.cc @@ -15,6 +15,7 @@ #include "api/video/video_codec_type.h" #include "api/video/video_frame_type.h" +#include "call/test/mock_rtp_packet_sink_interface.h" #include "common_video/h264/h264_common.h" #include "media/base/media_constants.h" #include "modules/rtp_rtcp/source/rtp_descriptor_authentication.h" @@ -37,6 +38,7 @@ #include "test/gmock.h" #include "test/gtest.h" #include "test/mock_frame_transformer.h" +#include "test/mock_transport.h" using ::testing::_; using ::testing::ElementsAre; @@ -70,15 +72,6 @@ RTPVideoHeader GetGenericVideoHeader(VideoFrameType frame_type) { return video_header; } -class MockTransport : public Transport { - public: - MOCK_METHOD(bool, - SendRtp, - (const uint8_t*, size_t length, const PacketOptions& options), - (override)); - MOCK_METHOD(bool, SendRtcp, (const uint8_t*, size_t length), (override)); -}; - class MockNackSender : public NackSender { public: MOCK_METHOD(void, @@ -127,11 +120,6 @@ class MockOnCompleteFrameCallback rtc::ByteBufferWriter buffer_; }; -class MockRtpPacketSink : public RtpPacketSinkInterface { - public: - MOCK_METHOD(void, OnRtpPacket, (const RtpPacketReceived&), (override)); -}; - constexpr uint32_t kSsrc = 111; constexpr uint16_t kSequenceNumber = 222; constexpr int kPayloadType = 100; diff --git a/video/video_receive_stream2_unittest.cc b/video/video_receive_stream2_unittest.cc index 6fb42345ce..cc282d83fb 100644 --- a/video/video_receive_stream2_unittest.cc +++ b/video/video_receive_stream2_unittest.cc @@ -17,6 +17,8 @@ #include #include "api/task_queue/default_task_queue_factory.h" +#include "api/test/mock_video_decoder.h" +#include "api/test/mock_video_decoder_factory.h" #include "api/test/video/function_video_decoder_factory.h" #include "api/video/video_frame.h" #include "api/video_codecs/video_decoder.h" @@ -34,6 +36,7 @@ #include "test/field_trial.h" #include "test/gmock.h" #include "test/gtest.h" +#include "test/mock_transport.h" #include "test/run_loop.h" #include "test/time_controller/simulated_time_controller.h" #include "test/video_decoder_proxy_factory.h" @@ -54,43 +57,6 @@ using ::testing::SizeIs; constexpr int kDefaultTimeOutMs = 50; -class MockTransport : public Transport { - public: - MOCK_METHOD(bool, - SendRtp, - (const uint8_t*, size_t length, const PacketOptions& options), - (override)); - MOCK_METHOD(bool, SendRtcp, (const uint8_t*, size_t length), (override)); -}; - -class MockVideoDecoder : public VideoDecoder { - public: - MOCK_METHOD(int32_t, - InitDecode, - (const VideoCodec*, int32_t number_of_cores), - (override)); - MOCK_METHOD(int32_t, - Decode, - (const EncodedImage& input, - bool missing_frames, - int64_t render_time_ms), - (override)); - MOCK_METHOD(int32_t, - RegisterDecodeCompleteCallback, - (DecodedImageCallback*), - (override)); - MOCK_METHOD(int32_t, Release, (), (override)); - const char* ImplementationName() const { return "MockVideoDecoder"; } -}; - -class MockVideoDecoderFactory : public VideoDecoderFactory { - public: - MOCK_CONST_METHOD0(GetSupportedFormats, std::vector()); - - MOCK_METHOD1(CreateVideoDecoder, - std::unique_ptr(const SdpVideoFormat& format)); -}; - class FrameObjectFake : public EncodedFrame { public: void SetPayloadType(uint8_t payload_type) { _payloadType = payload_type; } diff --git a/video/video_receive_stream_unittest.cc b/video/video_receive_stream_unittest.cc index d7398b8681..f3099d8de7 100644 --- a/video/video_receive_stream_unittest.cc +++ b/video/video_receive_stream_unittest.cc @@ -16,6 +16,7 @@ #include #include "api/task_queue/default_task_queue_factory.h" +#include "api/test/mock_video_decoder.h" #include "api/test/video/function_video_decoder_factory.h" #include "api/video_codecs/video_decoder.h" #include "call/rtp_stream_receiver_controller.h" @@ -31,6 +32,7 @@ #include "test/field_trial.h" #include "test/gmock.h" #include "test/gtest.h" +#include "test/mock_transport.h" #include "test/time_controller/simulated_time_controller.h" #include "test/video_decoder_proxy_factory.h" #include "video/call_stats.h" @@ -46,36 +48,6 @@ using ::testing::SizeIs; constexpr int kDefaultTimeOutMs = 50; -class MockTransport : public Transport { - public: - MOCK_METHOD(bool, - SendRtp, - (const uint8_t*, size_t length, const PacketOptions& options), - (override)); - MOCK_METHOD(bool, SendRtcp, (const uint8_t*, size_t length), (override)); -}; - -class MockVideoDecoder : public VideoDecoder { - public: - MOCK_METHOD(int32_t, - InitDecode, - (const VideoCodec*, int32_t number_of_cores), - (override)); - MOCK_METHOD(int32_t, - Decode, - (const EncodedImage& input, - bool missing_frames, - int64_t render_time_ms), - (override)); - MOCK_METHOD(int32_t, - RegisterDecodeCompleteCallback, - (DecodedImageCallback*), - (override)); - MOCK_METHOD(int32_t, Release, (), (override)); - MOCK_METHOD(VideoDecoder::DecoderInfo, GetDetcoderInfo, (), (const override)); - const char* ImplementationName() const { return "MockVideoDecoder"; } -}; - class FrameObjectFake : public EncodedFrame { public: void SetPayloadType(uint8_t payload_type) { _payloadType = payload_type; }