source code robustness

Author: bbert

app/js/streaming/MediaPlayer.js

@@ -1141,6 +1141,9 @@ MediaPlayer = function () {
          */
         getVideoBitrates: function () {
             _isPlayerInitialized();
+            if (!videoBitrates) {
+                return [];
+            }
             return videoBitrates.slice();
         },
 

app/js/streaming/MetricsExtensions.js

@@ -104,6 +104,10 @@ MediaPlayer.dependencies.MetricsExtensions = function() {
             i = 0,
             adaptation;
 
+        if (!manifest) {
+            return null;
+        }
+
         for (i = 0; i < manifest.Period.AdaptationSet.length; i++) {
             adaptation = manifest.Period.AdaptationSet[i];
             if (adaptation.type === type) {
@@ -120,6 +124,10 @@ MediaPlayer.dependencies.MetricsExtensions = function() {
             i = 0,
             adaptation;
 
+        if (!manifest) {
+            return null;
+        }
+
         for (i = 0; i < manifest.Period.AdaptationSet.length; i++) {
             adaptation = manifest.Period.AdaptationSet[i];
             if (adaptation.type === type || adaptation.contentType === type) {
@@ -137,19 +145,16 @@ MediaPlayer.dependencies.MetricsExtensions = function() {
             representation,
             periodArray;
 
-        if (manifest) {
-            periodArray = manifest.Period_asArray;
-
-            representation = findRepresentionInPeriodArray.call(self, periodArray, representationId);
-
-            if (representation === null) {
-                return null;
-            }
+        if (!manifest) {
+            return null;
+        }
 
-            return representation.width;
-        } else {
+        periodArray = manifest.Period_asArray;
+        representation = findRepresentionInPeriodArray.call(self, periodArray, representationId);
+        if (representation === null) {
             return null;
         }
+        return representation.width;
     };
 
     rslt.getVideoHeightForRepresentation = function(representationId) {
@@ -158,19 +163,16 @@ MediaPlayer.dependencies.MetricsExtensions = function() {
             representation,
             periodArray;
 
-        if (manifest) {
-            periodArray = manifest.Period_asArray;
-
-            representation = findRepresentionInPeriodArray.call(self, periodArray, representationId);
-
-            if (representation === null) {
-                return null;
-            }
+        if (!manifest) {
+            return null;
+        }
 
-            return representation.height;
-        } else {
+        periodArray = manifest.Period_asArray;
+        representation = findRepresentionInPeriodArray.call(self, periodArray, representationId);
+        if (representation === null) {
             return null;
         }
+        return representation.height;
     };
 
     rslt.getCodecsForRepresentation = function(representationId) {
@@ -179,12 +181,14 @@ MediaPlayer.dependencies.MetricsExtensions = function() {
             representation,
             periodArray = manifest.Period_asArray;
 
-        representation = findRepresentionInPeriodArray.call(self, periodArray, representationId);
+        if (!manifest) {
+            return null;
+        }
 
+        representation = findRepresentionInPeriodArray.call(self, periodArray, representationId);
         if (representation === null) {
             return null;
         }
-
         return representation.codecs;
     };
 
@@ -213,7 +217,7 @@ MediaPlayer.dependencies.MetricsExtensions = function() {
             representationArrayIndex,
             bitrateArray = [];
 
-        if (((manifest === null) || (manifest === undefined)) && ((data === null) || (data === undefined))) {
+        if (!manifest) {
             return null;
         }
 
@@ -262,7 +266,7 @@ MediaPlayer.dependencies.MetricsExtensions = function() {
             representationArrayIndex,
             bitrateArray = [];
 
-        if ((manifest === null) || (manifest === undefined)) {
+        if (!manifest) {
             return null;
         }
 

app/js/streaming/protection/drm/KeySystem_Widevine.js

@@ -40,7 +40,7 @@ MediaPlayer.dependencies.protection.KeySystem_Widevine = function() {
 
     var keySystemStr = "com.widevine.alpha",
         keySystemUUID = "edef8ba9-79d6-4ace-a3c8-27dcd51d21ed",
-        protData = null,
+        protData,
 
         doGetInitData = function(cpData) {
             return MediaPlayer.dependencies.protection.CommonEncryption.parseInitDataFromContentProtection(cpData);
@@ -74,11 +74,9 @@ MediaPlayer.dependencies.protection.KeySystem_Widevine = function() {
         sessionType: "temporary",
 
         init: function(protectionData) {
-            if (protectionData) {
-                protData = protectionData;
-                if (protData.sessionType) {
-                    this.sessionType = protData.sessionType;
-                }
+            protData = protectionData;
+            if (protData && protData.sessionType) {
+                this.sessionType = protData.sessionType;
             }
         },