Skip to content
This repository was archived by the owner on Oct 23, 2024. It is now read-only.

Commit 8278447

Browse files
jianjunzjianjunz
committed
Remove P2P QUIC and code cleanup.
1 parent a3a8b6b commit 8278447

File tree

9 files changed

+110
-272
lines changed

9 files changed

+110
-272
lines changed

‎source/agent/conference/accessController.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ module.exports.create = function(spec, rpcReq, on_session_established, on_sessio
152152
onReady(sessionId, status);
153153
} else if (status.type === 'failed') {
154154
onFailed(sessionId, status.reason);
155-
} else if (status.type === 'offer' || status.type === 'answer' || status.type === 'candidate' || status.type === 'quic-p2p-parameters') {
155+
} else if (status.type === 'offer' || status.type === 'answer' || status.type === 'candidate') {
156156
onSignaling(sessionId, status);
157157
} else {
158158
log.error('Irrispective status:' + status.type);

‎source/agent/conference/roomController.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1594,7 +1594,7 @@ module.exports.create = function (spec, on_init_ok, on_init_failed) {
15941594
on_spread_error('Terminal or stream early left.');
15951595
}
15961596
}, on_error);
1597-
} else if (terminals[terminal_id] && (audioStream !== undefined || videoStream !== undefined || dataStream !== undefined)) {
1597+
} else if (terminals[terminal_id] && (audioStream !== undefined || videoStream !== undefined)) {
15981598
var target_node = terminals[terminal_id].locality.node,
15991599
target_node_type = terminals[terminal_id].type;
16001600

‎source/agent/quic/dist.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,15 @@
3030
"../connections.js",
3131
"../InternalConnectionFactory.js"
3232
],
33-
"quic/p2p": [
34-
"p2p/p2pQuicStream.js",
35-
"p2p/p2pQuicTransport.js"
36-
],
3733
"quic/webtransport": [
3834
"webtransport/quicTransportServer.js",
3935
"webtransport/quicTransportStreamPipeline.js"
4036
],
4137
"cert": [
4238
"../../../cert/.owt.keystore"
39+
],
40+
"data_access": [
41+
"../../data_access/*"
4342
]
4443
}
4544
},

‎source/agent/quic/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ module.exports = function (rpcClient, selfRpcId, parentRpcId, clusterWorkerIP) {
221221
log.debug('mediaOnOff, connection id:', connectionId, 'track:', track, 'direction:', direction, 'action:', action);
222222
var conn = connections.getConnection(connectionId);
223223
if (conn) {
224-
if (conn.type === 'quic-p2p') {//NOTE: Only webrtc connection supports media-on-off
224+
if (conn.type === 'quic') {//NOTE: Only webrtc connection supports media-on-off
225225
conn.connection.onTrackControl(track,
226226
direction,
227227
action,

‎source/agent/quic/log4cxx.properties

Lines changed: 98 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,105 @@ log4j.appender.A1.layout=org.apache.log4j.PatternLayout
99
# Print the date in ISO 8601 format
1010
log4j.appender.A1.layout.ConversionPattern=%d - %p: %c - %m%n
1111

12+
# The utility to handle the received RTP packets from the browser,
13+
# to handle the FEC/RED packets, generate NACK requests upon packet loss, and
14+
# count receive statistics (packet loss etc.) for RTCP Receiver feedback generation, etc.
15+
log4j.logger.woogeen.ProtectedRTPReceiver=INFO
16+
17+
# The utility to handle the RTP packets sent to the browser,
18+
# to construct the FEC/RED packets if necessary, resend lost packets, and
19+
# count send statistics (bitrate etc.) for internal QoS parameters adjustment, etc.
20+
log4j.logger.woogeen.ProtectedRTPSender=INFO
21+
1222
# The raw UDP and TCP transports which are used for the connection between the Gateway and AVS.
13-
log4j.logger.owt.RawTransport=INFO
23+
log4j.logger.woogeen.RawTransport=INFO
1424
# If the SctpTransport log is set to debug, heavy IO would affact the connections
15-
log4j.logger.owt.SctpTransport=INFO
25+
log4j.logger.woogeen.SctpTransport=INFO
26+
27+
# The VideoFeedbackReactor is used to connect the WebRTCFeedbackProcessor and
28+
# the ProtectedRTPSender; the WebRTCFeedbackProcessor handles the received RTCP
29+
# feedback from the browser including the receiver report and the NACK message,
30+
# calculate RTT and browser packet loss, adjust target send bitrate and pass the
31+
# information to the VideoFeedbackReactor, which will adjust the (FEC) protection parameters
32+
# according to the RTT, the target send bitrate and the actual bitrate from the
33+
# ProtectedRTPSender statistics, and notify ProtectedRTPSender about the new parameters.
34+
log4j.logger.woogeen.VideoFeedbackReactor=INFO
35+
log4j.logger.woogeen.WebRTCFeedbackProcessor=INFO
36+
37+
log4j.logger.woogeen.AudioFrameConstructor=INFO
38+
log4j.logger.woogeen.AudioFramePacketizer=INFO
39+
40+
log4j.logger.woogeen.VideoFrameConstructor=INFO
41+
log4j.logger.woogeen.VideoFramePacketizer=INFO
42+
43+
log4j.logger.woogeen.LiveStreamIn=INFO
44+
log4j.logger.woogeen.LiveStreamIn.JitterBuffer=INFO
45+
log4j.logger.woogeen.AVStreamOut=INFO
46+
log4j.logger.woogeen.MediaFileOut=INFO
47+
log4j.logger.woogeen.LiveStreamOut=INFO
48+
49+
log4j.logger.mcu.media.AudioMixer=INFO
50+
log4j.logger.mcu.media.AcmmFrameMixer=INFO
51+
log4j.logger.mcu.media.AcmmBroadcastGroup=INFO
52+
log4j.logger.mcu.media.AcmmGroup=INFO
53+
log4j.logger.mcu.media.AcmmInput=INFO
54+
log4j.logger.mcu.media.AcmmOutput=INFO
55+
log4j.logger.mcu.media.AcmDecoder=INFO
56+
log4j.logger.mcu.media.FfDecoder=INFO
57+
log4j.logger.mcu.media.AcmEncoder=INFO
58+
log4j.logger.mcu.media.FfEncoder=INFO
59+
log4j.logger.mcu.media.PcmEncoder=INFO
60+
61+
log4j.logger.mcu.media.VideoMixer=INFO
62+
log4j.logger.mcu.media.VideoTranscoder=INFO
63+
64+
log4j.logger.mcu.media.SoftVideoCompositor=INFO
65+
log4j.logger.mcu.media.SoftVideoCompositor.AvatarManager=INFO
66+
log4j.logger.mcu.media.SoftVideoCompositor.SoftInput=INFO
67+
log4j.logger.mcu.media.SoftVideoCompositor.SoftFrameGenerator=INFO
68+
69+
log4j.logger.woogeen.VCMFrameDecoder=INFO
70+
log4j.logger.woogeen.VCMFrameEncoder=INFO
71+
log4j.logger.woogeen.SVTHEVCEncoder=INFO
72+
log4j.logger.woogeen.FrameProcesser=INFO
73+
74+
# Msdk media pipeline
75+
log4j.logger.woogeen.MsdkBase=INFO
76+
log4j.logger.woogeen.MsdkFrame=INFO
77+
log4j.logger.woogeen.MsdkFramePool=INFO
78+
log4j.logger.woogeen.MsdkScaler=INFO
79+
log4j.logger.woogeen.MsdkFrameDecoder=INFO
80+
log4j.logger.woogeen.StreamEncoder=INFO
81+
log4j.logger.woogeen.MsdkFrameEncoder=INFO
82+
83+
log4j.logger.mcu.media.MsdkVideoCompositor=INFO
84+
log4j.logger.mcu.media.MsdkVideoCompositor.MsdkAvatarManager=INFO
85+
log4j.logger.mcu.media.MsdkVideoCompositor.MsdkInput=INFO
86+
log4j.logger.mcu.media.MsdkVideoCompositor.MsdkVpp=INFO
87+
log4j.logger.mcu.media.MsdkVideoCompositor.MsdkFrameGenerator=INFO
88+
89+
# Webrtc
90+
log4j.logger.DtlsTransport=WARN
91+
log4j.logger.LibNiceConnection=WARN
92+
log4j.logger.NicerConnection=WARN
93+
log4j.logger.OneToManyProcessor=WARN
94+
log4j.logger.Resender=WARN
95+
log4j.logger.SdpInfo=WARN
96+
log4j.logger.SrtpChannel=WARN
97+
log4j.logger.Stats=WARN
98+
log4j.logger.WebRtcConnection=WARN
99+
log4j.logger.IceConnection=DEBUG
16100

17-
log4j.logger.owt.AudioFrameConstructor=INFO
18-
log4j.logger.owt.AudioFramePacketizer=INFO
101+
log4j.logger.dtls.DtlsSocket=WARN
102+
log4j.logger.dtls.DtlsFactory=WARN
103+
log4j.logger.dtls.DtlsSocketContext=WARN
104+
log4j.logger.dtls.SSL=WARN
19105

20-
log4j.logger.owt.VideoFrameConstructor=INFO
21-
log4j.logger.owt.VideoFramePacketizer=INFO
22-
log4j.logger.MediaStreamWrapper=INFO
106+
log4j.logger.RTCCertificate=DEBUG
107+
log4j.logger.RTCIceTransport=DEBUG
108+
log4j.logger.RTCQuicTransport=DEBUG
109+
log4j.logger.LibNiceConnection=DEBUG
110+
log4j.logger.QuicFactory=DEBUG
111+
log4j.logger.QuicTransportServer=DEBUG
112+
log4j.logger.QuicTransportConnection=DEBUG
113+
log4j.logger.QuicTransportStream=DEBUG

‎source/agent/quic/log4js_configuration.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
"AmqpClient": "INFO",
1616
"WorkingJS": "INFO",
1717
"NodeManager": "INFO",
18-
"QuicNode": "INFO",
18+
"QuicNode": "DEBUG",
1919
"Connection": "WARN",
2020
"WorkingAgent": "INFO",
21-
"Connections": "INFO",
21+
"Connections": "DEBUG",
2222
"InternalConnectionFactory": "INFO",
23-
"QuicConnection": "DEBUG"
23+
"QuicConnection": "DEBUG",
24+
"QuicTransportServer": "DEBUG",
25+
"QuicTransportStreamPipeline": "DEBUG"
2426
}
2527
}

‎source/agent/quic/p2p/p2pQuicStream.js

Lines changed: 0 additions & 142 deletions
This file was deleted.

0 commit comments

Comments
 (0)