replace Peerconnection header by forward declaration

millicast · Nov 13, 2023 · e978214 · e978214
1 parent cfa1345
commit e978214
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 6 deletions.
diff --git a/Source/MillicastPublisher/Private/Components/MillicastPublisherComponent.cpp b/Source/MillicastPublisher/Private/Components/MillicastPublisherComponent.cpp
@@ -59,7 +59,10 @@ UMillicastPublisherComponent::UMillicastPublisherComponent(const FObjectInitiali
 	EventBroadcaster.Emplace("inactive", [this](TSharedPtr<FJsonObject> Msg) { ParseInactiveEvent(Msg); });
 	EventBroadcaster.Emplace("viewercount", [this](TSharedPtr<FJsonObject> Msg) { ParseViewerCountEvent(Msg); });
 
-	PeerConnectionConfig = Millicast::Publisher::FWebRTCPeerConnection::GetDefaultConfig();
+
+	PeerConnectionConfig = 
+		MakeUnique<Millicast::Publisher::FWebRTCPeerConnectionConfig>(
+			Millicast::Publisher::FWebRTCPeerConnection::GetDefaultConfig());
 
 	MaximumBitrate = 4'000'000;
 	StartingBitrate = 2'000'000;
@@ -94,7 +97,7 @@ void UMillicastPublisherComponent::SetupIceServersFromJson(TArray<TSharedPtr<FJs
 {
 	using namespace Millicast::Publisher;
 
-	PeerConnectionConfig.servers.clear();
+	(*PeerConnectionConfig)->servers.clear();
 	for (const auto& Server : IceServersField)
 	{
 		// Grab Ice Server Details
@@ -137,7 +140,7 @@ void UMillicastPublisherComponent::SetupIceServersFromJson(TArray<TSharedPtr<FJs
 			}
 		}
 
-		PeerConnectionConfig.servers.push_back(IceServer);
+		(*PeerConnectionConfig)->servers.push_back(IceServer);
 	}
 }
 
@@ -372,7 +375,7 @@ bool UMillicastPublisherComponent::PublishToMillicast()
 
 	using namespace Millicast::Publisher;
 
-	PeerConnection.Reset(FWebRTCPeerConnection::Create(PeerConnectionConfig));
+	PeerConnection.Reset(FWebRTCPeerConnection::Create(*(*PeerConnectionConfig)));
 
 	// Starts the capture first and add track to the peerconnection
 	// TODO: add a boolean to let choose autoplay or not

diff --git a/Source/MillicastPublisher/Private/WebRTC/PeerConnection.h b/Source/MillicastPublisher/Private/WebRTC/PeerConnection.h
@@ -17,6 +17,25 @@ class TaskQueueFactory;
 
 namespace Millicast::Publisher
 {
+	class FWebRTCPeerConnectionConfig
+	{
+	public:
+		webrtc::PeerConnectionInterface::RTCConfiguration Config;
+
+		explicit FWebRTCPeerConnectionConfig(const webrtc::PeerConnectionInterface::RTCConfiguration& Other)
+			: Config(Other) {}
+
+		webrtc::PeerConnectionInterface::RTCConfiguration* operator->()
+		{
+			return &Config;
+		}
+
+		webrtc::PeerConnectionInterface::RTCConfiguration& operator*()
+		{
+			return Config;
+		}
+	};
+
 	/*
 	 * Small wrapper for the WebRTC peerconnection
 	 */

diff --git a/Source/MillicastPublisher/Public/MillicastPublisherComponent.h b/Source/MillicastPublisher/Public/MillicastPublisherComponent.h
@@ -6,7 +6,7 @@
 #include "RtcCodecsConstants.h"
 
 #include "Components/ActorComponent.h"
-#include "WebRTC/PeerConnection.h"
+// #include "WebRTC/PeerConnection.h"
 
 #include "MillicastPublisherComponent.generated.h"
 
@@ -20,6 +20,12 @@ namespace webrtc
 	struct RtpTransceiverInit;
 }
 
+namespace Millicast::Publisher
+{
+	class FWebRTCPeerConnection;
+	class FWebRTCPeerConnectionConfig;
+}
+
 enum class EMillicastPublisherState : uint8
 {
 	Disconnected,
@@ -257,7 +263,7 @@ class MILLICASTPUBLISHER_API UMillicastPublisherComponent : public UActorCompone
 
 	/** WebRTC */
 	TUniquePtr<Millicast::Publisher::FWebRTCPeerConnection> PeerConnection;
-	webrtc::PeerConnectionInterface::RTCConfiguration PeerConnectionConfig;
+	TUniquePtr<Millicast::Publisher::FWebRTCPeerConnectionConfig> PeerConnectionConfig;
 
 	/** Publisher */
 	TAtomic<EMillicastPublisherState> State = EMillicastPublisherState::Disconnected;