Page MenuHomePhorge
Files F125720381

D5900.1779572949.diff
No OneTemporary
Actions

Authored By
Unknown
Size
8 KB
Referenced Files
None
Subscribers
None

D5900.1779572949.diff
View Options

diff --git a/ansible/meetserver/meetconfig.js b/ansible/meetserver/meetconfig.js
--- a/ansible/meetserver/meetconfig.js
+++ b/ansible/meetserver/meetconfig.js
@@ -63,15 +63,6 @@
clockRate : 48000,
channels : 2
},
- {
- kind : 'video',
- mimeType : 'video/VP8',
- clockRate : 90000,
- parameters :
- {
- 'x-google-start-bitrate' : 1000
- }
- },
{
kind : 'video',
mimeType : 'video/VP9',
@@ -81,30 +72,6 @@
'profile-id' : 2,
'x-google-start-bitrate' : 1000
}
- },
- {
- kind : 'video',
- mimeType : 'video/h264',
- clockRate : 90000,
- parameters :
- {
- 'packetization-mode' : 1,
- 'profile-level-id' : '4d0032',
- 'level-asymmetry-allowed' : 1,
- 'x-google-start-bitrate' : 1000
- }
- },
- {
- kind : 'video',
- mimeType : 'video/h264',
- clockRate : 90000,
- parameters :
- {
- 'packetization-mode' : 1,
- 'profile-level-id' : '42e01f',
- 'level-asymmetry-allowed' : 1,
- 'x-google-start-bitrate' : 1000
- }
}
]
},
diff --git a/docker/meet/Dockerfile b/docker/meet/Dockerfile
--- a/docker/meet/Dockerfile
+++ b/docker/meet/Dockerfile
@@ -11,6 +11,8 @@
ARG GIT_REF=master
ARG GIT_REMOTE=https://git.kolab.org/source/kolab.git
ENV DEBUG="kolabmeet-server* mediasoup*"
+ENV UDP_PORT=44444
+ENV TCP_PORT=44444
COPY build.sh /build.sh
RUN /build.sh
COPY init.sh /init.sh
diff --git a/meet/server/config/config.js b/meet/server/config/config.js
--- a/meet/server/config/config.js
+++ b/meet/server/config/config.js
@@ -67,15 +67,6 @@
clockRate : 48000,
channels : 2
},
- {
- kind : 'video',
- mimeType : 'video/VP8',
- clockRate : 90000,
- parameters :
- {
- 'x-google-start-bitrate' : 1000
- }
- },
{
kind : 'video',
mimeType : 'video/VP9',
@@ -85,30 +76,6 @@
'profile-id' : 2,
'x-google-start-bitrate' : 1000
}
- },
- {
- kind : 'video',
- mimeType : 'video/h264',
- clockRate : 90000,
- parameters :
- {
- 'packetization-mode' : 1,
- 'profile-level-id' : '4d0032',
- 'level-asymmetry-allowed' : 1,
- 'x-google-start-bitrate' : 1000
- }
- },
- {
- kind : 'video',
- mimeType : 'video/h264',
- clockRate : 90000,
- parameters :
- {
- 'packetization-mode' : 1,
- 'profile-level-id' : '42e01f',
- 'level-asymmetry-allowed' : 1,
- 'x-google-start-bitrate' : 1000
- }
}
]
},
@@ -118,25 +85,25 @@
{ ip: process.env.WEBRTC_LISTEN_IP, announcedIp: process.env.WEBRTC_ANNOUNCED_ADDRESS }
],
// Initial bitrate estimation
- initialAvailableOutgoingBitrate: 1000000,
+ initialAvailableOutgoingBitrate: 1500000,
// Additional options that are not part of WebRtcTransportOptions.
- maxIncomingBitrate: 1500000
+ maxIncomingBitrate: 2500000
},
webRtcServerOptions : {
listenInfos : [
- {
+ process.env.UDP_PORT ? {
protocol : 'udp',
ip : process.env.WEBRTC_LISTEN_IP || '0.0.0.0',
announcedIp : process.env.WEBRTC_ANNOUNCED_ADDRESS,
- port : 44444
- },
- {
+ port : Number(process.env.UDP_PORT)
+ } : null,
+ process.env.TCP_PORT ? {
protocol : 'tcp',
ip : process.env.WEBRTC_LISTEN_IP || '0.0.0.0',
announcedIp : process.env.WEBRTC_ANNOUNCED_ADDRESS,
- port : 44444
- }
- ],
+ port : Number(process.env.TCP_PORT)
+ } : null
+ ].filter(x => x),
},
}
};
diff --git a/src/resources/js/meet/client.js b/src/resources/js/meet/client.js
--- a/src/resources/js/meet/client.js
+++ b/src/resources/js/meet/client.js
@@ -812,7 +812,7 @@
camProducer = await sendTransport.produce({
track,
- encodings: Config.videoOptions.simulcastEncodings,
+ encodings: Config.videoOptions.encodings,
codecOptions: {
videoGoogleStartBitrate : 1000
},
@@ -824,9 +824,7 @@
}
})
- // Workaround the firefox screenshare issue.
- // With this we effectively limit ourselves to 640 width
- await camProducer.setMaxSpatialLayer(1)
+ console.log("Negotiated Codec:", camProducer.rtpParameters.codecs[0].mimeType);
camProducer.on('transportclose', () => {
camProducer = null
@@ -959,7 +957,7 @@
screenProducer = await sendTransport.produce({
track,
// Enable dtx on the server for screensharing
- encodings: Config.screenOptions.simulcastEncodings.map((encoding) => ({ ...encoding, dtx: true })),
+ encodings: Config.screenOptions.encodings,
codecOptions: {
videoGoogleStartBitrate : 1000
},
diff --git a/src/resources/js/meet/config.js b/src/resources/js/meet/config.js
--- a/src/resources/js/meet/config.js
+++ b/src/resources/js/meet/config.js
@@ -20,24 +20,29 @@
// Default video options
videoOptions: {
- width: { max: 1280 },
+ width: { ideal: 1280, max: 1280 },
+ height: { ideal: 720, max: 720 },
aspectRatio: 1.777777778, // 16 : 9
- frameRate: { ideal: 15, max: 30 },
- simulcastEncodings: [
- { scaleResolutionDownBy: 4, maxBitrate: 300000 },
- { scaleResolutionDownBy: 2, maxBitrate: 800000 }
- // { scaleResolutionDownBy: 1, maxBitrate: 2500000 }
- ],
+ frameRate: { ideal: 24, max: 30 },
+ encodings: [{
+ // "L3T3_KEY" means 3 Spatial layers, 3 Temporal layers.
+ // This is the optimal setting for VP9 videoconferencing.
+ scalabilityMode: 'L3T3_KEY',
+ dtx: false, // Discontinuous Transmission (saves bandwidth when static)
+ maxBitrate: 1500000
+ }],
},
screenOptions: {
width: { max: 1920 },
height: { max: 1080 },
- frameRate: { ideal: 5, max: 30 },
- simulcastEncodings: [
- { maxBitrate: 1500000 },
- { maxBitrate: 5000000 }
- ],
+ frameRate: { ideal: 10, max: 30 },
+ encodings: [{
+ // "L1T3" means 1 Spatial layers, 3 Temporal layers.
+ scalabilityMode: 'L1T3',
+ dtx: true, // Discontinuous Transmission (saves bandwidth when static)
+ maxBitrate: 3000000
+ }],
},
// Socket.io request timeout

File Metadata

Mime Type
text/plain
Expires
Sat, May 23, 9:49 PM (17 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18933105
Default Alt Text
D5900.1779572949.diff (8 KB)

Event Timeline