Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 04:37:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve WebRTC debug

Browse source
This commit is contained in:
David Rowe 2021-11-20 11:06:05 +13:00
parent 861b8398f4
commit fb79d57fef
2 changed files with 65 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
libraries/networking/src/webrtc/WebRTCDataChannels.cpp
View file

@ -71,7 +71,7 @@ WDCPeerConnectionObserver::WDCPeerConnectionObserver(WDCConnection* parent) :
void WDCPeerConnectionObserver::OnSignalingChange(PeerConnectionInterface::SignalingState newState) { void WDCPeerConnectionObserver::OnSignalingChange(PeerConnectionInterface::SignalingState newState) {
#ifdef WEBRTC_DEBUG #ifdef WEBRTC_DEBUG
QStringList states{ QStringList states {
"Stable", "Stable",
"HaveLocalOffer", "HaveLocalOffer",
"HaveLocalPrAnswer", "HaveLocalPrAnswer",
@ -79,7 +79,7 @@ void WDCPeerConnectionObserver::OnSignalingChange(PeerConnectionInterface::Signa
"HaveRemotePrAnswer", "HaveRemotePrAnswer",
"Closed" "Closed"
}; };
qCDebug(networking_webrtc) << "WDCPeerConnectionObserver::OnSignalingChange()" << newState << states[newState]; qCDebug(networking_webrtc) << "WDCPeerConnectionObserver::OnSignalingChange() :" << newState << states[newState];
#endif #endif
} }
@ -91,7 +91,12 @@ void WDCPeerConnectionObserver::OnRenegotiationNeeded() {
void WDCPeerConnectionObserver::OnIceGatheringChange(PeerConnectionInterface::IceGatheringState newState) { void WDCPeerConnectionObserver::OnIceGatheringChange(PeerConnectionInterface::IceGatheringState newState) {
#ifdef WEBRTC_DEBUG #ifdef WEBRTC_DEBUG
qCDebug(networking_webrtc) << "WDCPeerConnectionObserver::OnIceGatheringChange()" << newState; QStringList states {
"New",
"Gathering",
"Complete"
};
qCDebug(networking_webrtc) << "WDCPeerConnectionObserver::OnIceGatheringChange() :" << newState << states[newState];
#endif #endif
} }
@ -102,6 +107,39 @@ void WDCPeerConnectionObserver::OnIceCandidate(const IceCandidateInterface* cand
_parent->sendIceCandidate(candidate); _parent->sendIceCandidate(candidate);
} }
void WDCPeerConnectionObserver::OnIceConnectionChange(PeerConnectionInterface::IceConnectionState newState) {
#ifdef WEBRTC_DEBUG
QStringList states {
"New",
"Checking",
"Connected",
"Completed",
"Failed",
"Disconnected",
"Closed",
"Max"
};
qCDebug(networking_webrtc) << "WDCPeerConnectionObserver::OnIceConnectionChange() :" << newState << states[newState];
#endif
}
void WDCPeerConnectionObserver::OnStandardizedIceConnectionChange(PeerConnectionInterface::IceConnectionState newState) {
#ifdef WEBRTC_DEBUG
QStringList states {
"New",
"Checking",
"Connected",
"Completed",
"Failed",
"Disconnected",
"Closed",
"Max"
};
qCDebug(networking_webrtc) << "WDCPeerConnectionObserver::OnStandardizedIceConnectionChange() :" << newState
<< states[newState];
#endif
}
void WDCPeerConnectionObserver::OnDataChannel(rtc::scoped_refptr<DataChannelInterface> dataChannel) { void WDCPeerConnectionObserver::OnDataChannel(rtc::scoped_refptr<DataChannelInterface> dataChannel) {
#ifdef WEBRTC_DEBUG #ifdef WEBRTC_DEBUG
qCDebug(networking_webrtc) << "WDCPeerConnectionObserver::OnDataChannel()"; qCDebug(networking_webrtc) << "WDCPeerConnectionObserver::OnDataChannel()";
@ -111,7 +149,16 @@ void WDCPeerConnectionObserver::OnDataChannel(rtc::scoped_refptr<DataChannelInte
void WDCPeerConnectionObserver::OnConnectionChange(PeerConnectionInterface::PeerConnectionState newState) { void WDCPeerConnectionObserver::OnConnectionChange(PeerConnectionInterface::PeerConnectionState newState) {
#ifdef WEBRTC_DEBUG #ifdef WEBRTC_DEBUG
qCDebug(networking_webrtc) << "WDCPeerConnectionObserver::OnConnectionChange()" << (uint)newState; QStringList states {
"New",
"Connecting",
"Connected",
"Disconnected",
"Failed",
"Closed"
};
qCDebug(networking_webrtc) << "WDCPeerConnectionObserver::OnConnectionChange() :" << (uint)newState
<< states[(uint)newState];
#endif #endif
_parent->onPeerConnectionStateChanged(newState); _parent->onPeerConnectionStateChanged(newState);
} }
@ -267,7 +314,7 @@ void WDCConnection::sendIceCandidate(const IceCandidateInterface* candidate) {
void WDCConnection::onPeerConnectionStateChanged(PeerConnectionInterface::PeerConnectionState state) { void WDCConnection::onPeerConnectionStateChanged(PeerConnectionInterface::PeerConnectionState state) {
#ifdef WEBRTC_DEBUG #ifdef WEBRTC_DEBUG
const char* STATES[] = { QStringList states {
"New", "New",
"Connecting", "Connecting",
"Connected", "Connected",
@ -275,7 +322,7 @@ void WDCConnection::onPeerConnectionStateChanged(PeerConnectionInterface::PeerCo
"Failed", "Failed",
"Closed" "Closed"
}; };
qCDebug(networking_webrtc) << "WDCConnection::onPeerConnectionStateChanged() :" << (int)state << STATES[(int)state]; qCDebug(networking_webrtc) << "WDCConnection::onPeerConnectionStateChanged() :" << (int)state << states[(int)state];
#endif #endif
} }
@ -372,7 +419,7 @@ bool WDCConnection::sendDataMessage(const DataBuffer& buffer) {
void WDCConnection::closePeerConnection() { void WDCConnection::closePeerConnection() {
#ifdef WEBRTC_DEBUG #ifdef WEBRTC_DEBUG
qCDebug(networking_webrtc) << "WDCConnection::closePeerConnection()"; qCDebug(networking_webrtc) << "WDCConnection::closePeerConnection() :" << (int)_peerConnection->peer_connection_state();
#endif #endif
_peerConnection->Close(); _peerConnection->Close();
_peerConnection = nullptr; _peerConnection = nullptr;
@ -430,6 +477,9 @@ WebRTCDataChannels::~WebRTCDataChannels() {
} }
void WebRTCDataChannels::reset() { void WebRTCDataChannels::reset() {
#ifdef WEBRTC_DEBUG
qCDebug(networking_webrtc) << "WebRTCDataChannels::reset() :" << _connectionsByID.count();
#endif
QHashIterator<QString, WDCConnection*> i(_connectionsByID); QHashIterator<QString, WDCConnection*> i(_connectionsByID);
while (i.hasNext()) { while (i.hasNext()) {
i.next(); i.next();

8
libraries/networking/src/webrtc/WebRTCDataChannels.h
View file

@ -88,6 +88,14 @@ public:
/// @param candidate The new ICE candidate. /// @param candidate The new ICE candidate.
void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override; void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override;
/// @brief Called when the legacy ICE connection state changes.
/// @param new_state The new ICE connection state.
virtual void OnIceConnectionChange(webrtc::PeerConnectionInterface::IceConnectionState newState) override;
/// @brief Called when the standards-compliant ICE connection state changes.
/// @param new_state The new ICE connection state.
virtual void OnStandardizedIceConnectionChange(webrtc::PeerConnectionInterface::IceConnectionState newState) override;
/// @brief Called when a remote peer opens a data channel. /// @brief Called when a remote peer opens a data channel.
/// @param dataChannel The data channel. /// @param dataChannel The data channel.
void OnDataChannel(rtc::scoped_refptr<webrtc::DataChannelInterface> dataChannel) override; void OnDataChannel(rtc::scoped_refptr<webrtc::DataChannelInterface> dataChannel) override;