cloudinary-video-player 4.1.3 → 4.1.4-edge.1

package/lib/video-player.js

@@ -1,6 +1,6 @@
 import { _ as _vjs } from './_videojs-proxy.js';
 import { g as getDefaultExportFromCjs } from './_commonjsHelpers.js';
-import { e as require_baseKeys, h as require_getTag, j as requireIsArguments, k as requireIsArrayLike, l as requireIsBuffer, m as requireIsTypedArray, n as require_isPrototype, q as require_assignValue, t as require_castPath, u as require_toKey, v as require_isIndex, w as require_baseGet, x as requireIsLength, y as require_flatRest, P as PLAYER_EVENT, c as componentUtils, s as sliceProperties, z as isElementInViewport, V as VIDEO_CODEC, A as isKeyInTransformation, B as BaseSource, C as normalizeOptions, S as SOURCE_TYPE, I as ImageSource, T as Transformation, D as isSrcEqual, E as castArray, F as mergeTransformations, G as sliceAndUnsetProperties, H as setupCloudinaryMiddleware, J as extendCloudinaryConfig, K as omitVideoOnlyTransformations, i as isPlainObject, L as isElement, M as setPosition, N as getPointerPosition, O as fontFace, p as playerClassPrefix, U as Utils, Q as defaults$6, R as ERROR_CODE, a as get } from './index2.js';
+import { e as require_baseKeys, h as require_getTag, j as requireIsArguments, k as requireIsArrayLike, l as requireIsBuffer, m as requireIsTypedArray, n as require_isPrototype, q as require_assignValue, t as require_castPath, u as require_toKey, v as require_isIndex, w as require_baseGet, x as requireIsLength, y as require_flatRest, P as PLAYER_EVENT, c as componentUtils, s as sliceProperties, z as isElementInViewport, V as VIDEO_CODEC, A as isKeyInTransformation, B as BaseSource, C as normalizeOptions, S as SOURCE_TYPE, I as ImageSource, T as Transformation, D as isSrcEqual, E as castArray, F as mergeTransformations, G as getTransformationValue, H as sliceAndUnsetProperties, J as setupCloudinaryMiddleware, K as extendCloudinaryConfig, L as omitVideoOnlyTransformations, i as isPlainObject, M as isElement, N as setPosition, O as getPointerPosition, Q as fontFace, p as playerClassPrefix, U as Utils, R as defaults$6, W as ERROR_CODE, a as get } from './index2.js';
 import { c as requireIsArray, a as requireIsObject, i as isObject, d as isString, S as SOURCE_PARAMS, C as CROP_MODE, F as FLOATING_TO, e as FLUID_CLASS_NAME, P as PLAYER_PARAMS, A as AUTO_PLAY_MODE } from './video-player.const.js';
 import { i as isFunction, a as isValidPlayerConfig, b as isValidSourceConfig } from './validators-functions.js';
 import { a as appendQueryParams, u as utf8ToBase64, i as isRawUrl, g as getCloudinaryConfigFromOptions, C as CLOUDINARY_CONFIG_PARAM } from './cloudinary-config-from-options.js';
@@ -561,7 +561,7 @@ class TitleBar extends Component {
     const metadataUrl = appendQueryParams(`${urlPrefix}/_applet_/video_service/video_metadata/${deliveryType}/${utf8ToBase64(publicId)}.json`, source.queryParams());
     fetch(metadataUrl, {
       headers: {
-        'X-Cld-Video-Player-Version': "4.1.3"
+        'X-Cld-Video-Player-Version': "4.1.4-edge.1"
       }
     }).then(response => {
       if (!response.ok) throw new Error(`HTTP ${response.status}`);
@@ -2509,7 +2509,9 @@ class VideoSource extends BaseSource {
     }
     const srcs = this.sourceTypes().map(sourceType => {
       const srcTransformation = this.sourceTransformation()[sourceType] || this.transformation();
-      const format = normalizeFormat(sourceType);
+      // An empty source type delivers the asset as-is: like 'auto', but without f_auto:video
+      const deliverAsIs = sourceType === '';
+      const format = normalizeFormat(sourceType || 'auto');
       const isAdaptive = ADAPTIVE_SOURCETYPES.includes(format);
       const opts = {};
       if (srcTransformation) {
@@ -2518,17 +2520,30 @@ class VideoSource extends BaseSource {
       Object.assign(opts, {
         format
       });
-      const [type, codecTrans] = formatToMimeTypeAndTransformation(sourceType);
+      let [type, codecTrans] = formatToMimeTypeAndTransformation(sourceType || 'auto');
 
       // If user's transformation include video_codec then don't add another video codec to transformation
       if (codecTrans && !(hasCodec(opts.transformation) || hasCodec(this.rawTransformation()))) {
         opts.transformation = mergeTransformations(opts.transformation, codecTrans);
       }
       if (opts.format === 'auto') {
+        const fetchFormat = getTransformationValue(opts.transformation, 'fetch_format');
+        // `format` is an alias of `fetch_format`
+        const callerFormat = fetchFormat || getTransformationValue(opts.transformation, 'format');
         delete opts.format;
-        opts.transformation = mergeTransformations(opts.transformation, {
-          fetch_format: 'auto:video'
-        });
+        if (callerFormat && !callerFormat.startsWith('auto')) {
+          // Respect the caller's format instead of adding f_auto:video
+          if (!fetchFormat) {
+            opts.transformation = mergeTransformations(opts.transformation, {
+              fetch_format: callerFormat
+            });
+          }
+          [type] = formatToMimeTypeAndTransformation(callerFormat);
+        } else if (!deliverAsIs) {
+          opts.transformation = mergeTransformations(opts.transformation, {
+            fetch_format: 'auto:video'
+          });
+        }
       }
       if (isAdaptive) {
         // Search for streaming_profile anywhere in the transformation
@@ -3196,7 +3211,7 @@ class CloudinaryAnalytics {
       }, {
         ...(isPlainObject(this.analyticsOptions) ? this.analyticsOptions : {}),
         videoPlayerType: 'cloudinary video player',
-        videoPlayerVersion: "4.1.3"
+        videoPlayerVersion: "4.1.4-edge.1"
       });
     } else if (this.currentVideoMetadata.cloudName !== metadata.cloudName || this.currentVideoMetadata.publicId !== metadata.publicId) {
       this.cloudinaryAnalytics.stopManualTracking();
@@ -4535,7 +4550,7 @@ const getTranscriptionFileUrl = function (urlPrefix, deliveryType, publicId) {
 function textTracksManager() {
   const player = this;
   const textTracksData = new WeakMap();
-  let activeTrack = null;
+  let showingTracks = new Set();
   const removeAllTextTracks = () => {
     const currentTracks = player.remoteTextTracks();
     if (currentTracks) {
@@ -4679,37 +4694,27 @@ function textTracksManager() {
         addTextTrack('transcript', textTrackConfig);
       }
     });
-    const defaultTextTrack = Array.from(player.remoteTextTracks()).find(textTrack => textTrack.default);
-    if (defaultTextTrack) {
-      onChangeActiveTrack(defaultTextTrack);
-    }
-  };
-  const onChangeActiveTrack = textTrack => {
-    const prevActiveTrack = activeTrack;
-    activeTrack = textTrack;
-    const prevTextTrackData = textTracksData.get(prevActiveTrack);
-    if (prevTextTrackData) {
-      prevTextTrackData.abortLoading();
-    }
-    const selectedTextTrackData = textTracksData.get(activeTrack);
-    if (selectedTextTrackData) {
-      selectedTextTrackData.load();
-    }
+    syncShowingTracks();
   };
-  player.on('texttrackchange', () => {
-    const textTracks = player.textTracks();
-    let newActiveTrack = null;
-    for (let i = 0; i < textTracks.length; i++) {
-      const track = textTracks[i];
-      if (track.mode === 'showing') {
-        newActiveTrack = track;
-        break;
+
+  // Several tracks can show at once (e.g. descriptions + captions), so each one needs its cues loaded
+  const syncShowingTracks = () => {
+    const textTracks = Array.from(player.textTracks());
+    // texttrackchange can fire inside addRemoteTextTrack, before the track's data exists - skip it until then
+    const nowShowing = new Set(textTracks.filter(track => track.mode === 'showing' && textTracksData.has(track)));
+    showingTracks.forEach(track => {
+      if (!nowShowing.has(track)) {
+        textTracksData.get(track)?.abortLoading();
       }
-    }
-    if (activeTrack !== newActiveTrack) {
-      onChangeActiveTrack(newActiveTrack);
-    }
-  });
+    });
+    nowShowing.forEach(track => {
+      if (!showingTracks.has(track)) {
+        textTracksData.get(track)?.load();
+      }
+    });
+    showingTracks = nowShowing;
+  };
+  player.on('texttrackchange', syncShowingTracks);
   return {
     removeAllTextTracks,
     addTextTracks: function () {
@@ -5180,7 +5185,7 @@ class VideoPlayer {
       const analyticsData = getAnalyticsFromPlayerOptions(options);
       const analyticsParams = new URLSearchParams(analyticsData).toString();
       const baseParams = new URLSearchParams({
-        vpVersion: "4.1.3",
+        vpVersion: "4.1.4-edge.1",
         vpInstanceId: this.getVPInstanceId(),
         cloudName: options.cloudinary.cloud_name,
         ...internalAnalyticsMetadata

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudinary-video-player",
-  "version": "4.1.3",
+  "version": "4.1.4-edge.1",
   "description": "Cloudinary Video Player",
   "author": "Cloudinary",
   "license": "MIT",