godotengine/webrtc-native
1
0
Fork 0
mirror of https://github.com/godotengine/webrtc-native.git synced 2026-01-01 05:48:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Bump webrtc to branch-heads/4472.

Browse Source
This commit is contained in:
Fabio Alessandrelli
2021-06-28 22:05:55 +02:00
parent 001be78500
commit 3711ad23f6
5 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@@ -115,7 +115,7 @@ if target_platform == 'linux':
else:
env.Prepend(CCFLAGS=['-O3'])
env.Append(CCFLAGS=['-fPIC', '-std=c++11'])
env.Append(CCFLAGS=['-fPIC', '-std=c++14'])
if target_arch == '32':
env.Append(CCFLAGS = [ '-m32' ])
@@ -276,7 +276,7 @@ if target == 'debug':
else:
lib_path += '/Release'
env.Append(CPPPATH=[webrtc_dir + "/include"])
env.Append(CPPPATH=[webrtc_dir + "/include", webrtc_dir + "/include/third_party/abseil-cpp"])
if target_platform == "linux":
env.Append(LIBS=[lib_name, "atomic"])

4
src/WebRTCLibDataChannel.hpp
View File

@@ -3,8 +3,8 @@
#include <Godot.hpp> // Godot.hpp must go first, or windows builds breaks
#include "api/peerconnectioninterface.h" // interface for all things needed from WebRTC
#include "media/base/mediaengine.h" // needed for CreateModularPeerConnectionFactory
#include "api/peer_connection_interface.h" // interface for all things needed from WebRTC
#include "media/base/media_engine.h" // needed for CreateModularPeerConnectionFactory
#include "net/WebRTCDataChannelNative.hpp"
#include "PoolArrays.hpp"

4
src/WebRTCLibObservers.cpp
View File

@@ -15,7 +15,7 @@ void WebRTCLibPeerConnection::GodotCSDO::OnSuccess(webrtc::SessionDescriptionInt
parent->queue_signal("session_description_created", 2, desc->type().c_str(), sdp.c_str());
};
void WebRTCLibPeerConnection::GodotCSDO::OnFailure(const std::string &error){};
void WebRTCLibPeerConnection::GodotCSDO::OnFailure(webrtc::RTCError error){};
// SetSessionObseerver
WebRTCLibPeerConnection::GodotSSDO::GodotSSDO(WebRTCLibPeerConnection *parent) {
@@ -23,7 +23,7 @@ WebRTCLibPeerConnection::GodotSSDO::GodotSSDO(WebRTCLibPeerConnection *parent) {
}
void WebRTCLibPeerConnection::GodotSSDO::OnSuccess(){};
void WebRTCLibPeerConnection::GodotSSDO::OnFailure(const std::string &error){};
void WebRTCLibPeerConnection::GodotSSDO::OnFailure(webrtc::RTCError error){};
// PeerConnectionObserver
WebRTCLibPeerConnection::GodotPCO::GodotPCO(WebRTCLibPeerConnection *parent) {

20
src/WebRTCLibPeerConnection.cpp
View File

@@ -57,7 +57,7 @@ godot_error _parse_channel_config(webrtc::DataChannelInit &r_config, godot::Dict
// ID makes sense only when negotiated is true (and must be set in that case)
ERR_FAIL_COND_V(r_config.negotiated ? r_config.id == -1 : r_config.id != -1, GODOT_ERR_INVALID_PARAMETER);
// Only one of maxRetransmits and maxRetransmitTime can be set on a channel.
ERR_FAIL_COND_V(r_config.maxRetransmits != -1 && r_config.maxRetransmitTime != -1, GODOT_ERR_INVALID_PARAMETER);
ERR_FAIL_COND_V(r_config.maxRetransmits && r_config.maxRetransmitTime, GODOT_ERR_INVALID_PARAMETER);
return GODOT_OK;
}
@@ -119,7 +119,7 @@ godot_object *WebRTCLibPeerConnection::create_data_channel(const char *p_channel
godot_error WebRTCLibPeerConnection::create_offer() {
ERR_FAIL_COND_V(peer_connection.get() == nullptr, GODOT_ERR_UNCONFIGURED);
peer_connection->CreateOffer(ptr_csdo, nullptr);
peer_connection->CreateOffer(ptr_csdo, webrtc::PeerConnectionInterface::RTCOfferAnswerOptions());
return GODOT_OK;
}
@@ -191,16 +191,12 @@ void WebRTCLibPeerConnection::_init() {
mutex_signal_queue = new std::mutex;
// create a PeerConnectionFactoryInterface:
signaling_thread = new rtc::Thread;
signaling_thread->Start();
pc_factory = webrtc::CreateModularPeerConnectionFactory(
nullptr, // rtc::Thread* network_thread,
nullptr, // rtc::Thread* worker_thread,
signaling_thread,
nullptr, // std::unique_ptr<cricket::MediaEngineInterface> media_engine,
nullptr, // std::unique_ptr<CallFactoryInterface> call_factory,
nullptr // std::unique_ptr<RtcEventLogFactoryInterface> event_log_factory
);
webrtc::PeerConnectionFactoryDependencies deps;
signaling_thread = rtc::Thread::Create();
ERR_FAIL_COND(!signaling_thread->Start());
deps.signaling_thread = signaling_thread.get();
pc_factory = webrtc::CreateModularPeerConnectionFactory(std::move(deps));
// Create peer connection with default configuration.
webrtc::PeerConnectionInterface::RTCConfiguration config;

10
src/WebRTCLibPeerConnection.hpp
View File

@@ -3,8 +3,8 @@
#include <Godot.hpp> // Godot.hpp must go first, or windows builds breaks
#include "api/peerconnectioninterface.h" // interface for all things needed from WebRTC
#include "media/base/mediaengine.h" // needed for CreateModularPeerConnectionFactory
#include "api/peer_connection_interface.h" // interface for all things needed from WebRTC
#include "media/base/media_engine.h" // needed for CreateModularPeerConnectionFactory
#include <functional> // std::function
#include <mutex> // mutex @TODO replace std::mutex with Godot mutex
@@ -66,7 +66,7 @@ public:
GodotCSDO(WebRTCLibPeerConnection *parent);
void OnSuccess(webrtc::SessionDescriptionInterface *desc) override;
void OnFailure(const std::string &error) override;
void OnFailure(webrtc::RTCError error) override;
};
/** SetSessionDescriptionObserver callback functions **/
@@ -76,7 +76,7 @@ public:
GodotSSDO(WebRTCLibPeerConnection *parent);
void OnSuccess() override;
void OnFailure(const std::string &error) override;
void OnFailure(webrtc::RTCError error) override;
};
GodotPCO pco;
@@ -86,7 +86,7 @@ public:
std::mutex *mutex_signal_queue;
std::queue<std::function<void()> > signal_queue;
rtc::Thread *signaling_thread;
std::unique_ptr<rtc::Thread> signaling_thread;
rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> pc_factory;
rtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection;
};