admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update PeerConnectionFactory unittests to use newer video factory api

Browse Source 
Bug: webrtc:13573
Change-Id: I8891fb788298890685c7b8c25efd19157c856631
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/299705
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39746}
This commit is contained in:
Danil Chapovalov 2023-04-03 13:01:04 +02:00 committed by WebRTC LUCI CQ
parent e0727118f1
commit f3bdce9a99
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pc/peer_connection_factory_unittest.cc
View File

@ -10,6 +10,7 @@
#include "pc/peer_connection_factory.h" #include "pc/peer_connection_factory.h"
#include <memory>
#include <utility> #include <utility>
#include <vector> #include <vector>
@ -21,8 +22,16 @@
#include "api/jsep.h" #include "api/jsep.h"
#include "api/media_stream_interface.h" #include "api/media_stream_interface.h"
#include "api/test/mock_packet_socket_factory.h" #include "api/test/mock_packet_socket_factory.h"
#include "api/video_codecs/builtin_video_decoder_factory.h" #include "api/video_codecs/video_decoder_factory_template.h"
#include "api/video_codecs/builtin_video_encoder_factory.h" #include "api/video_codecs/video_decoder_factory_template_dav1d_adapter.h"
#include "api/video_codecs/video_decoder_factory_template_libvpx_vp8_adapter.h"
#include "api/video_codecs/video_decoder_factory_template_libvpx_vp9_adapter.h"
#include "api/video_codecs/video_decoder_factory_template_open_h264_adapter.h"
#include "api/video_codecs/video_encoder_factory_template.h"
#include "api/video_codecs/video_encoder_factory_template_libaom_av1_adapter.h"
#include "api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter.h"
#include "api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter.h"
#include "api/video_codecs/video_encoder_factory_template_open_h264_adapter.h"
#include "media/base/fake_frame_source.h" #include "media/base/fake_frame_source.h"
#include "modules/audio_device/include/audio_device.h" #include "modules/audio_device/include/audio_device.h"
#include "modules/audio_processing/include/audio_processing.h" #include "modules/audio_processing/include/audio_processing.h"
@ -48,14 +57,8 @@
#include "pc/test/fake_rtc_certificate_generator.h" #include "pc/test/fake_rtc_certificate_generator.h"
#include "pc/test/fake_video_track_renderer.h" #include "pc/test/fake_video_track_renderer.h"
using webrtc::DataChannelInterface; namespace webrtc {
using webrtc::FakeVideoTrackRenderer; namespace {
using webrtc::MediaStreamInterface;
using webrtc::PeerConnectionFactoryInterface;
using webrtc::PeerConnectionInterface;
using webrtc::PeerConnectionObserver;
using webrtc::VideoTrackInterface;
using webrtc::VideoTrackSourceInterface;
using ::testing::_; using ::testing::_;
using ::testing::AtLeast; using ::testing::AtLeast;
@ -64,8 +67,6 @@ using ::testing::NiceMock;
using ::testing::Return; using ::testing::Return;
using ::testing::UnorderedElementsAre; using ::testing::UnorderedElementsAre;
namespace {
static const char kStunIceServer[] = "stun:stun.l.google.com:19302"; static const char kStunIceServer[] = "stun:stun.l.google.com:19302";
static const char kTurnIceServer[] = "turn:test.com:1234"; static const char kTurnIceServer[] = "turn:test.com:1234";
static const char kTurnIceServerWithTransport[] = static const char kTurnIceServerWithTransport[] =
@ -120,8 +121,6 @@ class MockNetworkManager : public rtc::NetworkManager {
(override)); (override));
}; };
} // namespace
class PeerConnectionFactoryTest : public ::testing::Test { class PeerConnectionFactoryTest : public ::testing::Test {
public: public:
PeerConnectionFactoryTest() PeerConnectionFactoryTest()
@ -142,9 +141,13 @@ class PeerConnectionFactoryTest : public ::testing::Test {
FakeAudioCaptureModule::Create()), FakeAudioCaptureModule::Create()),
webrtc::CreateBuiltinAudioEncoderFactory(), webrtc::CreateBuiltinAudioEncoderFactory(),
webrtc::CreateBuiltinAudioDecoderFactory(), webrtc::CreateBuiltinAudioDecoderFactory(),
webrtc::CreateBuiltinVideoEncoderFactory(), std::make_unique<VideoEncoderFactoryTemplate<
webrtc::CreateBuiltinVideoDecoderFactory(), nullptr /* audio_mixer */, LibvpxVp8EncoderTemplateAdapter, LibvpxVp9EncoderTemplateAdapter,
nullptr /* audio_processing */); OpenH264EncoderTemplateAdapter, LibaomAv1EncoderTemplateAdapter>>(),
std::make_unique<VideoDecoderFactoryTemplate<
LibvpxVp8DecoderTemplateAdapter, LibvpxVp9DecoderTemplateAdapter,
OpenH264DecoderTemplateAdapter, Dav1dDecoderTemplateAdapter>>(),
nullptr /* audio_mixer */, nullptr /* audio_processing */);
ASSERT_TRUE(factory_.get() != NULL); ASSERT_TRUE(factory_.get() != NULL);
packet_socket_factory_.reset( packet_socket_factory_.reset(
@ -274,8 +277,8 @@ TEST(PeerConnectionFactoryTestInternal, DISABLED_CreatePCUsingInternalModules) {
nullptr /* signaling_thread */, nullptr /* default_adm */, nullptr /* signaling_thread */, nullptr /* default_adm */,
webrtc::CreateBuiltinAudioEncoderFactory(), webrtc::CreateBuiltinAudioEncoderFactory(),
webrtc::CreateBuiltinAudioDecoderFactory(), webrtc::CreateBuiltinAudioDecoderFactory(),
webrtc::CreateBuiltinVideoEncoderFactory(), nullptr /* video_encoder_factory */,
webrtc::CreateBuiltinVideoDecoderFactory(), nullptr /* audio_mixer */, nullptr /* video_decoder_factory */, nullptr /* audio_mixer */,
nullptr /* audio_processing */)); nullptr /* audio_processing */));
NullPeerConnectionObserver observer; NullPeerConnectionObserver observer;
@ -646,3 +649,6 @@ TEST(PeerConnectionFactoryDependenciesTest, UsesPacketSocketFactory) {
called.Wait(kWaitTimeout); called.Wait(kWaitTimeout);
} }
} // namespace
} // namespace webrtc