Merge pull request #2 from versatica/v3

merge
penguinol · May 14, 2020 · 2b6ece9 · 2b6ece9
2 parents 3e87c60 + 8e5d644
commit 2b6ece9
Show file tree

Hide file tree

Showing 29 changed files with 192 additions and 144 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+### 3.5.13 (WIP)
+
+* Simplify `GetDesiredBitrate()` in `SimulcastConsumer` and `SvcConsumer`.
+
+
+### 3.5.12
+
+* `SeqManager.cpp`: Improve performance.
+  - PR #398 (credits to @penguinol).
+
+
 ### 3.5.11
 
 * `SeqManager.cpp`: Fix a bug and improve performance.

diff --git a/lib/AudioLevelObserver.js b/lib/AudioLevelObserver.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.AudioLevelObserver = void 0;
 const Logger_1 = require("./Logger");
 const RtpObserver_1 = require("./RtpObserver");
 const logger = new Logger_1.Logger('AudioLevelObserver');

diff --git a/lib/Channel.js b/lib/Channel.js
@@ -1,12 +1,25 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Channel = void 0;
 // @ts-ignore
 const netstring = __importStar(require("netstring"));
 const Logger_1 = require("./Logger");

diff --git a/lib/Consumer.js b/lib/Consumer.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Consumer = void 0;
 const Logger_1 = require("./Logger");
 const EnhancedEventEmitter_1 = require("./EnhancedEventEmitter");
 const logger = new Logger_1.Logger('Consumer');

diff --git a/lib/DataConsumer.js b/lib/DataConsumer.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataConsumer = void 0;
 const Logger_1 = require("./Logger");
 const EnhancedEventEmitter_1 = require("./EnhancedEventEmitter");
 const logger = new Logger_1.Logger('DataConsumer');

diff --git a/lib/DataProducer.js b/lib/DataProducer.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataProducer = void 0;
 const Logger_1 = require("./Logger");
 const EnhancedEventEmitter_1 = require("./EnhancedEventEmitter");
 const logger = new Logger_1.Logger('DataProducer');

diff --git a/lib/EnhancedEventEmitter.js b/lib/EnhancedEventEmitter.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.EnhancedEventEmitter = void 0;
 const events_1 = require("events");
 const Logger_1 = require("./Logger");
 const logger = new Logger_1.Logger('EnhancedEventEmitter');

diff --git a/lib/Logger.js b/lib/Logger.js
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Logger = void 0;
 const debug_1 = __importDefault(require("debug"));
 const APP_NAME = 'mediasoup';
 class Logger {

diff --git a/lib/PipeTransport.js b/lib/PipeTransport.js
@@ -1,12 +1,25 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.PipeTransport = void 0;
 const uuid_1 = require("uuid");
 const Logger_1 = require("./Logger");
 const ortc = __importStar(require("./ortc"));

diff --git a/lib/PlainTransport.js b/lib/PlainTransport.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.PlainRtpTransport = exports.PlainTransport = void 0;
 const Logger_1 = require("./Logger");
 const Transport_1 = require("./Transport");
 const logger = new Logger_1.Logger('PlainTransport');

diff --git a/lib/Producer.js b/lib/Producer.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Producer = void 0;
 const Logger_1 = require("./Logger");
 const EnhancedEventEmitter_1 = require("./EnhancedEventEmitter");
 const logger = new Logger_1.Logger('Producer');

diff --git a/lib/Router.js b/lib/Router.js
@@ -1,12 +1,25 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Router = void 0;
 const uuid_1 = require("uuid");
 const awaitqueue_1 = require("awaitqueue");
 const Logger_1 = require("./Logger");

diff --git a/lib/RtpObserver.js b/lib/RtpObserver.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.RtpObserver = void 0;
 const Logger_1 = require("./Logger");
 const EnhancedEventEmitter_1 = require("./EnhancedEventEmitter");
 const logger = new Logger_1.Logger('RtpObserver');

diff --git a/lib/SctpParameters.d.ts b/lib/SctpParameters.d.ts
@@ -64,7 +64,7 @@ export declare type SctpStreamParameters = {
      */
     streamId: number;
     /**
-     * Whether data messages must be received in order. if true the messages will
+     * Whether data messages must be received in order. If true the messages will
      * be sent reliably. Default true.
      */
     ordered?: boolean;

diff --git a/lib/Transport.js b/lib/Transport.js
@@ -1,12 +1,25 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Transport = void 0;
 const uuid_1 = require("uuid");
 const Logger_1 = require("./Logger");
 const EnhancedEventEmitter_1 = require("./EnhancedEventEmitter");

diff --git a/lib/WebRtcTransport.js b/lib/WebRtcTransport.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebRtcTransport = void 0;
 const Logger_1 = require("./Logger");
 const Transport_1 = require("./Transport");
 const logger = new Logger_1.Logger('WebRtcTransport');

diff --git a/lib/Worker.js b/lib/Worker.js
@@ -1,12 +1,25 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Worker = void 0;
 const process = __importStar(require("process"));
 const path = __importStar(require("path"));
 const child_process_1 = require("child_process");
@@ -73,7 +86,7 @@ class Worker extends EnhancedEventEmitter_1.EnhancedEventEmitter {
         // options
         {
             env: {
-                MEDIASOUP_VERSION: '3.5.11'
+                MEDIASOUP_VERSION: '3.5.12'
             },
             detached: false,
             // fd 0 (stdin)   : Just ignore it.

diff --git a/lib/errors.js b/lib/errors.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.InvalidStateError = exports.UnsupportedError = void 0;
 /**
  * Error indicating not support for something.
  */

diff --git a/lib/index.js b/lib/index.js
@@ -1,12 +1,25 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSupportedRtpCapabilities = exports.createWorker = exports.observer = exports.version = exports.types = void 0;
 const Logger_1 = require("./Logger");
 const EnhancedEventEmitter_1 = require("./EnhancedEventEmitter");
 const Worker_1 = require("./Worker");
@@ -17,12 +30,12 @@ exports.types = types;
 /**
  * Expose mediasoup version.
  */
-exports.version = '3.5.11';
+exports.version = '3.5.12';
 /**
  * Expose parseScalabilityMode() function.
  */
 var scalabilityModes_1 = require("./scalabilityModes");
-exports.parseScalabilityMode = scalabilityModes_1.parse;
+Object.defineProperty(exports, "parseScalabilityMode", { enumerable: true, get: function () { return scalabilityModes_1.parse; } });
 const logger = new Logger_1.Logger();
 const observer = new EnhancedEventEmitter_1.EnhancedEventEmitter();
 exports.observer = observer;

diff --git a/lib/ortc.js b/lib/ortc.js
@@ -1,12 +1,25 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPipeConsumerRtpParameters = exports.getConsumerRtpParameters = exports.canConsume = exports.getConsumableRtpParameters = exports.getProducerRtpParametersMapping = exports.generateRouterRtpCapabilities = exports.validateSctpStreamParameters = exports.validateSctpParameters = exports.validateNumSctpStreams = exports.validateSctpCapabilities = exports.validateRtcpParameters = exports.validateRtpEncodingParameters = exports.validateRtpHeaderExtensionParameters = exports.validateRtpCodecParameters = exports.validateRtpParameters = exports.validateRtpHeaderExtension = exports.validateRtcpFeedback = exports.validateRtpCodecCapability = exports.validateRtpCapabilities = void 0;
 const h264 = __importStar(require("h264-profile-level-id"));
 const utils = __importStar(require("./utils"));
 const errors_1 = require("./errors");

diff --git a/lib/scalabilityModes.js b/lib/scalabilityModes.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.parse = void 0;
 const ScalabilityModeRegex = new RegExp('^[LS]([1-9]\\d{0,1})T([1-9]\\d{0,1})(_KEY)?');
 function parse(scalabilityMode) {
     const match = ScalabilityModeRegex.exec(scalabilityMode);

diff --git a/lib/supportedRtpCapabilities.js b/lib/supportedRtpCapabilities.js
@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.supportedRtpCapabilities = void 0;
 const supportedRtpCapabilities = {
     codecs: [
         {

diff --git a/lib/types.js b/lib/types.js
@@ -1,18 +1,28 @@
 "use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
 }
 Object.defineProperty(exports, "__esModule", { value: true });
-__export(require("./Worker"));
-__export(require("./Router"));
-__export(require("./Transport"));
-__export(require("./WebRtcTransport"));
-__export(require("./PlainTransport"));
-__export(require("./PipeTransport"));
-__export(require("./Producer"));
-__export(require("./Consumer"));
-__export(require("./DataProducer"));
-__export(require("./DataConsumer"));
-__export(require("./RtpObserver"));
-__export(require("./AudioLevelObserver"));
-__export(require("./errors"));
+__exportStar(require("./Worker"), exports);
+__exportStar(require("./Router"), exports);
+__exportStar(require("./Transport"), exports);
+__exportStar(require("./WebRtcTransport"), exports);
+__exportStar(require("./PlainTransport"), exports);
+__exportStar(require("./PipeTransport"), exports);
+__exportStar(require("./Producer"), exports);
+__exportStar(require("./Consumer"), exports);
+__exportStar(require("./DataProducer"), exports);
+__exportStar(require("./DataConsumer"), exports);
+__exportStar(require("./RtpObserver"), exports);
+__exportStar(require("./AudioLevelObserver"), exports);
+__exportStar(require("./RtpParameters"), exports);
+__exportStar(require("./SctpParameters"), exports);
+__exportStar(require("./SrtpParameters"), exports);
+__exportStar(require("./errors"), exports);