change fallback behavior

Author: Yaniv Aran-Shamir

src/plugins/cloudinary/common.js

@@ -158,12 +158,15 @@ const h264avcToString = (s) => {
     throw new Error('Codec string is not formatted according to H.264/AVC standards for example avc1.42001e (maybe an iOS friendly version...)');
   }
   let matches = s.match(REGEX);
-  matches.shift(); // first one is the entire-string.
+  if (matches !== null) {
+    matches.shift(); // first one is the entire-string.
 
-  let vc_codec = ISOAVC_MAP[matches[0]];
-  let avc_codec = typeof avc_codec === 'string' ? avc_codec : 'Unknown'; // explicit fix
+    let vc_codec = ISOAVC_MAP[matches[0]];
+    let avc_codec = typeof avc_codec === 'string' ? avc_codec : 'Unknown'; // explicit fix
 
-  return vc_codec + ':' + avcotiToStr(matches[1]);
+    return vc_codec + ':' + avcotiToStr(matches[1]);
+  }
+  return s;
 };
 
 const codecToSrcTransformation = (codec) => {

src/plugins/cloudinary/models/video-source.js

@@ -6,7 +6,7 @@ import assign from 'utils/assign';
 import { objectToQuerystring } from 'utils/querystring';
 
 const DEFAULT_POSTER_PARAMS = { format: 'jpg', resource_type: 'video' };
-const DEFAULT_VIDEO_SOURCE_TYPES = ['webm', 'mp4', 'fallback'];
+const DEFAULT_VIDEO_SOURCE_TYPES = ['webm', 'mp4/h265', 'mp4', 'fallback'];
 const DEFAULT_CODEC_FOR_CONTAINER = {
   mp4: 'h264',
   webm: 'vp9'
@@ -192,7 +192,7 @@ function normalizeFormat(format) {
 
   let res = FORMAT_MAPPINGS[format];
   if (!res) {
-    res = format;
+    res = format.split('\/').shift();
   }
 
   return res;

src/video-player.js

@@ -390,7 +390,6 @@ class VideoPlayer extends Utils.mixin(Eventable) {
     this.fallbackTrys = 0;
     this.videojs.on('error', () => {
       if ((this.videojs.error().code === 10 || this.videojs.error().code === 4) && !options.playerOptions.skipFallback) {
-        this.videojs.error(null);
         this.fallbackToOrigFile();
       }
     });
@@ -522,13 +521,13 @@ class VideoPlayer extends Utils.mixin(Eventable) {
   }
 
   fallbackToOrigFile() {
-    if (this.fallbackTrys === 0) {
-
-      let src = this.videojs.currentSources().filter(src => src.isFallback);
+    if (this.videojs.currentSources().length > 0) {
+      this.videojs.error(null);
+      let src = this.videojs.currentSources();
       if (src.length > 0) {
-        this.videojs.src(src.pop());
+        src.pop();
+        this.videojs.src(src);
       }
-      this.fallbackTrys++;
     }
   }