5411b174c8
The interface is implemented by the ChannelManager and contains methods to create and destroy media channel objects as used by a transceiver. This will subsequently allow us to delete the channel objects from the transceiver class where ownership really lies rather than from the outside - which is currently required by some tests that keep channel objects on the stack. We'll furthermore be able to do the destruction asynchronously without additional Invoke()s as we do now which will remove an Invoke when making sdp changes. With introducing the interface, the following simplifications were made: * ChannelManager constructed on the signaling thread. Before, there was an Invoke in the context class, which existed for the purposes of calling MediaEngine::Init() (which in turn is only needed for the VoiceEngine). This Invoke has now been moved into the CM (more tbd). * The CM now has a pointer to the signaling thread (since that's the construction thread). That allows us to remove the signaling thread parameter from the CreateFooChannel methods. * The ssrc_generator (UniqueRandomIdGenerator) instance for SSRCs moved from SdpOfferAnswerHandler to the CM, as it's always used in combination with the CM. This simplifies the CreateFooChannel methods as well as a couple of other classes that have a CM dependency. * Removed DestroyFooChannel related code from SdpOfferAnswerHandler since the channel type detail can be taken care of by the CM. Bug: webrtc:11992, webrtc:13540 Change-Id: I04938a803734de8489ba31e6212d9eaecc244126 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/247904 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org> Cr-Commit-Position: refs/heads/main@{#35766}
137 lines
4.9 KiB
C++
137 lines
4.9 KiB
C++
/*
|
|
* Copyright 2008 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "pc/channel_manager.h"
|
|
|
|
#include <memory>
|
|
|
|
#include "api/rtc_error.h"
|
|
#include "api/video/builtin_video_bitrate_allocator_factory.h"
|
|
#include "media/base/fake_media_engine.h"
|
|
#include "media/base/test_utils.h"
|
|
#include "media/engine/fake_webrtc_call.h"
|
|
#include "p2p/base/dtls_transport_internal.h"
|
|
#include "p2p/base/fake_dtls_transport.h"
|
|
#include "p2p/base/p2p_constants.h"
|
|
#include "p2p/base/packet_transport_internal.h"
|
|
#include "pc/dtls_srtp_transport.h"
|
|
#include "rtc_base/checks.h"
|
|
#include "rtc_base/thread.h"
|
|
#include "test/gtest.h"
|
|
|
|
namespace cricket {
|
|
namespace {
|
|
const bool kDefaultSrtpRequired = true;
|
|
|
|
static const AudioCodec kAudioCodecs[] = {
|
|
AudioCodec(97, "voice", 1, 2, 3),
|
|
AudioCodec(111, "OPUS", 48000, 32000, 2),
|
|
};
|
|
|
|
static const VideoCodec kVideoCodecs[] = {
|
|
VideoCodec(99, "H264"),
|
|
VideoCodec(100, "VP8"),
|
|
VideoCodec(96, "rtx"),
|
|
};
|
|
|
|
std::unique_ptr<MediaEngineInterface> CreateFakeMediaEngine() {
|
|
auto fme = std::make_unique<FakeMediaEngine>();
|
|
fme->SetAudioCodecs(MAKE_VECTOR(kAudioCodecs));
|
|
fme->SetVideoCodecs(MAKE_VECTOR(kVideoCodecs));
|
|
return fme;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
class ChannelManagerTest : public ::testing::Test {
|
|
protected:
|
|
ChannelManagerTest()
|
|
: network_(rtc::Thread::CreateWithSocketServer()),
|
|
worker_(rtc::Thread::Current()),
|
|
video_bitrate_allocator_factory_(
|
|
webrtc::CreateBuiltinVideoBitrateAllocatorFactory()),
|
|
cm_(cricket::ChannelManager::Create(CreateFakeMediaEngine(),
|
|
false,
|
|
worker_,
|
|
network_.get())),
|
|
fake_call_(worker_, network_.get()) {
|
|
network_->SetName("Network", this);
|
|
network_->Start();
|
|
}
|
|
|
|
void TestCreateDestroyChannels(webrtc::RtpTransportInternal* rtp_transport) {
|
|
RTC_DCHECK_RUN_ON(worker_);
|
|
cricket::VoiceChannel* voice_channel = cm_->CreateVoiceChannel(
|
|
&fake_call_, cricket::MediaConfig(), cricket::CN_AUDIO,
|
|
kDefaultSrtpRequired, webrtc::CryptoOptions(), AudioOptions());
|
|
ASSERT_TRUE(voice_channel != nullptr);
|
|
|
|
cricket::VideoChannel* video_channel = cm_->CreateVideoChannel(
|
|
&fake_call_, cricket::MediaConfig(), cricket::CN_VIDEO,
|
|
kDefaultSrtpRequired, webrtc::CryptoOptions(), VideoOptions(),
|
|
video_bitrate_allocator_factory_.get());
|
|
ASSERT_TRUE(video_channel != nullptr);
|
|
|
|
cm_->DestroyChannel(video_channel);
|
|
cm_->DestroyChannel(voice_channel);
|
|
}
|
|
|
|
std::unique_ptr<rtc::Thread> network_;
|
|
rtc::Thread* const worker_;
|
|
std::unique_ptr<webrtc::VideoBitrateAllocatorFactory>
|
|
video_bitrate_allocator_factory_;
|
|
std::unique_ptr<cricket::ChannelManager> cm_;
|
|
cricket::FakeCall fake_call_;
|
|
};
|
|
|
|
TEST_F(ChannelManagerTest, SetVideoRtxEnabled) {
|
|
std::vector<VideoCodec> send_codecs;
|
|
std::vector<VideoCodec> recv_codecs;
|
|
const VideoCodec rtx_codec(96, "rtx");
|
|
|
|
// By default RTX is disabled.
|
|
cm_->GetSupportedVideoSendCodecs(&send_codecs);
|
|
EXPECT_FALSE(ContainsMatchingCodec(send_codecs, rtx_codec));
|
|
cm_->GetSupportedVideoSendCodecs(&recv_codecs);
|
|
EXPECT_FALSE(ContainsMatchingCodec(recv_codecs, rtx_codec));
|
|
|
|
// Enable and check.
|
|
cm_ = cricket::ChannelManager::Create(CreateFakeMediaEngine(),
|
|
true, worker_, network_.get());
|
|
cm_->GetSupportedVideoSendCodecs(&send_codecs);
|
|
EXPECT_TRUE(ContainsMatchingCodec(send_codecs, rtx_codec));
|
|
cm_->GetSupportedVideoSendCodecs(&recv_codecs);
|
|
EXPECT_TRUE(ContainsMatchingCodec(recv_codecs, rtx_codec));
|
|
|
|
// Disable and check.
|
|
cm_ = cricket::ChannelManager::Create(CreateFakeMediaEngine(),
|
|
false, worker_, network_.get());
|
|
cm_->GetSupportedVideoSendCodecs(&send_codecs);
|
|
EXPECT_FALSE(ContainsMatchingCodec(send_codecs, rtx_codec));
|
|
cm_->GetSupportedVideoSendCodecs(&recv_codecs);
|
|
EXPECT_FALSE(ContainsMatchingCodec(recv_codecs, rtx_codec));
|
|
}
|
|
|
|
TEST_F(ChannelManagerTest, CreateDestroyChannels) {
|
|
auto rtp_dtls_transport = std::make_unique<FakeDtlsTransport>(
|
|
"fake_dtls_transport", cricket::ICE_CANDIDATE_COMPONENT_RTP,
|
|
network_.get());
|
|
auto dtls_srtp_transport = std::make_unique<webrtc::DtlsSrtpTransport>(
|
|
/*rtcp_mux_required=*/true);
|
|
network_->Invoke<void>(
|
|
RTC_FROM_HERE, [&rtp_dtls_transport, &dtls_srtp_transport] {
|
|
dtls_srtp_transport->SetDtlsTransports(rtp_dtls_transport.get(),
|
|
/*rtcp_dtls_transport=*/nullptr);
|
|
});
|
|
TestCreateDestroyChannels(dtls_srtp_transport.get());
|
|
}
|
|
|
|
} // namespace cricket
|