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

Commit a0e359a

Browse files
committed
Address comments.
1 parent 1d52eea commit a0e359a

File tree

3 files changed

+4
-57
lines changed

3 files changed

+4
-57
lines changed

source/agent/quic/dist.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"quic": [
2828
"index.js",
2929
"../connections.js",
30-
"../InternalConnectionFactory.js",
3130
"../../common/makeRPC.js",
3231
"../../common/rpcChannel.js",
3332
"../internalConnectionRouter.js"

source/agent/quic/index.js

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
// all agents. They are defined in base-agent.js.
1616

1717
'use strict';
18-
const InternalConnectionFactory = require('./InternalConnectionFactory');
1918
const logger = require('../logger').logger;
2019
const QuicTransportServer = require('./webtransport/quicTransportServer');
2120
const QuicTransportStreamPipeline =
@@ -35,7 +34,6 @@ module.exports = function (rpcClient, selfRpcId, parentRpcId, clusterWorkerIP) {
3534
clusterIP: clusterWorkerIP
3635
};
3736
const router = new InternalConnectionRouter(global.config.internal);
38-
const internalConnFactory = new InternalConnectionFactory;
3937
const incomingStreamPipelines =
4038
new Map(); // Key is publication ID, value is stream pipeline.
4139
const outgoingStreamPipelines =
@@ -201,10 +199,8 @@ module.exports = function (rpcClient, selfRpcId, parentRpcId, clusterWorkerIP) {
201199
log.debug('unpublish, connectionId:', connectionId);
202200
var conn = router.getConnection(connectionId);
203201
router.removeConnection(connectionId).then(function(ok) {
204-
if (conn && conn.type === 'internal') {
205-
internalConnFactory.destroy(connectionId, 'in');
206-
} else if (conn) {
207-
conn.connection.close();
202+
if (conn) {
203+
conn.close();
208204
}
209205
callback('callback', 'ok');
210206
}, onError(callback));
@@ -250,10 +246,8 @@ module.exports = function (rpcClient, selfRpcId, parentRpcId, clusterWorkerIP) {
250246
log.debug('unsubscribe, connectionId:', connectionId);
251247
var conn = router.getConnection(connectionId);
252248
router.removeConnection(connectionId).then(function(ok) {
253-
if (conn && conn.type === 'internal') {
254-
internalConnFactory.destroy(connectionId, 'out');
255-
} else if (conn) {
256-
conn.connection.close();
249+
if (conn) {
250+
conn.close();
257251
}
258252
callback('callback', 'ok');
259253
}, onError(callback));

source/agent/quic/log4cxx.properties

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -43,52 +43,6 @@ log4j.logger.owt.AudioFramePacketizer=INFO
4343
log4j.logger.owt.VideoFrameConstructor=INFO
4444
log4j.logger.owt.VideoFramePacketizer=INFO
4545

46-
log4j.logger.owt.LiveStreamIn=INFO
47-
log4j.logger.owt.LiveStreamIn.JitterBuffer=INFO
48-
log4j.logger.owt.AVStreamOut=INFO
49-
log4j.logger.owt.MediaFileOut=INFO
50-
log4j.logger.owt.LiveStreamOut=INFO
51-
52-
log4j.logger.mcu.media.AudioMixer=INFO
53-
log4j.logger.mcu.media.AcmmFrameMixer=INFO
54-
log4j.logger.mcu.media.AcmmBroadcastGroup=INFO
55-
log4j.logger.mcu.media.AcmmGroup=INFO
56-
log4j.logger.mcu.media.AcmmInput=INFO
57-
log4j.logger.mcu.media.AcmmOutput=INFO
58-
log4j.logger.mcu.media.AcmDecoder=INFO
59-
log4j.logger.mcu.media.FfDecoder=INFO
60-
log4j.logger.mcu.media.AcmEncoder=INFO
61-
log4j.logger.mcu.media.FfEncoder=INFO
62-
log4j.logger.mcu.media.PcmEncoder=INFO
63-
64-
log4j.logger.mcu.media.VideoMixer=INFO
65-
log4j.logger.mcu.media.VideoTranscoder=INFO
66-
67-
log4j.logger.mcu.media.SoftVideoCompositor=INFO
68-
log4j.logger.mcu.media.SoftVideoCompositor.AvatarManager=INFO
69-
log4j.logger.mcu.media.SoftVideoCompositor.SoftInput=INFO
70-
log4j.logger.mcu.media.SoftVideoCompositor.SoftFrameGenerator=INFO
71-
72-
log4j.logger.owt.VCMFrameDecoder=INFO
73-
log4j.logger.owt.VCMFrameEncoder=INFO
74-
log4j.logger.owt.SVTHEVCEncoder=INFO
75-
log4j.logger.owt.FrameProcesser=INFO
76-
77-
# Msdk media pipeline
78-
log4j.logger.owt.MsdkBase=INFO
79-
log4j.logger.owt.MsdkFrame=INFO
80-
log4j.logger.owt.MsdkFramePool=INFO
81-
log4j.logger.owt.MsdkScaler=INFO
82-
log4j.logger.owt.MsdkFrameDecoder=INFO
83-
log4j.logger.owt.StreamEncoder=INFO
84-
log4j.logger.owt.MsdkFrameEncoder=INFO
85-
86-
log4j.logger.mcu.media.MsdkVideoCompositor=INFO
87-
log4j.logger.mcu.media.MsdkVideoCompositor.MsdkAvatarManager=INFO
88-
log4j.logger.mcu.media.MsdkVideoCompositor.MsdkInput=INFO
89-
log4j.logger.mcu.media.MsdkVideoCompositor.MsdkVpp=INFO
90-
log4j.logger.mcu.media.MsdkVideoCompositor.MsdkFrameGenerator=INFO
91-
9246
# QUIC
9347
log4j.logger.QuicFactory=INFO
9448
log4j.logger.QuicTransportServer=INFO

0 commit comments

Comments
 (0)