Merge pull request #9 from LivelyVideo/pli-shm

Merge shm writer updates into v3-lively
LivelyVideo · Sep 18, 2020 · d029df2 · d029df2
2 parents bcccb3f + 36b651d
commit d029df2
Show file tree

Hide file tree

Showing 20 changed files with 745 additions and 582 deletions.
diff --git a/lib/Router.js b/lib/Router.js
@@ -371,7 +371,7 @@ class Router extends EnhancedEventEmitter_1.EnhancedEventEmitter {
      * @returns {ShmTransport}
      */
     async createShmTransport({ listenIp, shm, log, appData = {} }) {
-        logger.debug('createShmTransport()');
+        logger.debug('createShmTransport() [shm:%o]', shm);
         if (!listenIp)
             throw new TypeError('missing listenIp');
         else if (appData && typeof appData !== 'object')

diff --git a/lib/Transport.d.ts.map b/lib/Transport.d.ts.map
diff --git a/lib/Transport.js b/lib/Transport.js
@@ -204,7 +204,7 @@ class Transport extends EnhancedEventEmitter_1.EnhancedEventEmitter {
      * Create a Producer.
      */
     async produce({ id = undefined, kind, rtpParameters, paused = false, keyFrameRequestDelay, appData = {} }) {
-        logger.debug('produce()');
+        logger.debug('produce() rtpParameters=%o', rtpParameters);
         if (id && this._producers.has(id))
             throw new TypeError(`a Producer with same id "${id}" already exists`);
         else if (!['audio', 'video'].includes(kind))
@@ -237,10 +237,13 @@ class Transport extends EnhancedEventEmitter_1.EnhancedEventEmitter {
             rtpParameters.rtcp.cname = this._cnameForProducers;
         }
         const routerRtpCapabilities = this._getRouterRtpCapabilities();
+        logger.debug("produce(): routerRtpCapabilities=%o", routerRtpCapabilities);
         // This may throw.
         const rtpMapping = ortc.getProducerRtpParametersMapping(rtpParameters, routerRtpCapabilities);
+        logger.debug("produce(): rtpMapping=%o", rtpMapping);
         // This may throw.
         const consumableRtpParameters = ortc.getConsumableRtpParameters(kind, rtpParameters, routerRtpCapabilities, rtpMapping);
+        logger.debug("produce(): consumableRtpParameters=%o", consumableRtpParameters);
         const internal = { ...this._internal, producerId: id || uuid_1.v4() };
         const reqData = { kind, rtpParameters, rtpMapping, keyFrameRequestDelay, paused };
         const status = await this._channel.request('transport.produce', internal, reqData);

diff --git a/lib/Worker.js b/lib/Worker.js
@@ -67,7 +67,7 @@ class Worker extends EnhancedEventEmitter_1.EnhancedEventEmitter {
         // options
         {
             env: {
-                MEDIASOUP_VERSION: '3.5.7-shm95'
+                MEDIASOUP_VERSION: '3.5.7-rtx2'
             },
             detached: false,
             // fd 0 (stdin)   : Just ignore it.

diff --git a/lib/index.js b/lib/index.js
@@ -10,7 +10,7 @@ exports.types = types;
 /**
  * Expose mediasoup version.
  */
-exports.version = '3.5.7-shm95';
+exports.version = '3.5.7-rtx2';
 /**
  * Expose parseScalabilityMode() function.
  */

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@livelyvideo/mediasoup",
-  "version": "3.5.7-shm95",
+  "version": "3.5.7-rtx2",
   "description": "Cutting Edge WebRTC Video Conferencing",
   "contributors": [
     "Iñaki Baz Castillo <ibc@aliax.net> (https://inakibaz.me)",

diff --git a/src/Router.ts b/src/Router.ts
@@ -700,7 +700,7 @@ export class Router extends EnhancedEventEmitter
 		} : ShmTransportOptions
 	): Promise<ShmTransport>
 	{
-		logger.debug('createShmTransport()');
+		logger.debug('createShmTransport() [shm:%o]', shm);
 
 		if (!listenIp)
 			throw new TypeError('missing listenIp');

diff --git a/src/Transport.ts b/src/Transport.ts
@@ -416,7 +416,7 @@ export class Transport extends EnhancedEventEmitter
 		}: ProducerOptions
 	): Promise<Producer>
 	{
-		logger.debug('produce()');
+		logger.debug('produce() rtpParameters=%o', rtpParameters);
 
 		if (id && this._producers.has(id))
 			throw new TypeError(`a Producer with same id "${id}" already exists`);
@@ -461,15 +461,20 @@ export class Transport extends EnhancedEventEmitter
 		}
 
 		const routerRtpCapabilities = this._getRouterRtpCapabilities();
+		logger.debug("produce(): routerRtpCapabilities=%o", routerRtpCapabilities);
 
 		// This may throw.
 		const rtpMapping = ortc.getProducerRtpParametersMapping(
 			rtpParameters, routerRtpCapabilities);
 
+		logger.debug("produce(): rtpMapping=%o", rtpMapping);
+
 		// This may throw.
 		const consumableRtpParameters = ortc.getConsumableRtpParameters(
 			kind, rtpParameters, routerRtpCapabilities, rtpMapping);
 
+		logger.debug("produce(): consumableRtpParameters=%o", consumableRtpParameters);
+
 		const internal = { ...this._internal, producerId: id || uuidv4() };
 		const reqData = { kind, rtpParameters, rtpMapping, keyFrameRequestDelay, paused };