Merge pull request #166 from hwx350758/master

Modify null pointer in Cam.js
agsh · Jun 10, 2020 · eae4680 · eae4680
2 parents e2ab59e + d807b48
commit eae4680
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/lib/cam.js b/lib/cam.js
@@ -658,13 +658,16 @@ Cam.prototype.getActiveSources = function() {
 
 		this.activeSources[idx] = {
 			sourceToken: videoSource.$.token
-			, profileToken: this.defaultProfiles[idx].$.token
-			, encoding: this.defaultProfiles[idx].videoEncoderConfiguration.encoding
-			, width: this.defaultProfiles[idx].videoEncoderConfiguration.resolution.width
-			, height: this.defaultProfiles[idx].videoEncoderConfiguration.resolution.height
-			, fps: this.defaultProfiles[idx].videoEncoderConfiguration.rateControl.frameLimit
-			, bitrate: this.defaultProfiles[idx].videoEncoderConfiguration.rateControl.bitrateLimit
+			, profileToken: this.defaultProfiles[idx].$.token 
 		};
+		if (this.defaultProfiles[idx].videoEncoderConfiguration) {
+			var configuration = this.defaultProfiles[idx].videoEncoderConfiguration;
+			this.activeSources[idx].encoding = configuration.encoding;
+			this.activeSources[idx].width = configuration.resolution ? configuration.resolution.width : "";
+			this.activeSources[idx].height = configuration.resolution ? configuration.resolution.height : "";
+			this.activeSources[idx].fps = configuration.rateControl ? configuration.rateControl.frameLimit : "";
+			this.activeSources[idx].bitrate = configuration.rateControl ? configuration.rateControl.bitrateLimit : "";
+		}
 
 		if (idx === 0) {
 			/**