@galacean/effects-plugin-multimedia 2.9.0 → 2.9.1-beta.0

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects player multimedia plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 云垣
- * Version: v2.9.0
+ * Version: v2.9.1-beta.0
  */
 
 'use strict';
@@ -768,10 +768,14 @@ exports.VideoComponent = /*#__PURE__*/ function(MaskableGraphic) {
     _proto.onDisable = function onDisable() {
         MaskableGraphic.prototype.onDisable.call(this);
         this.isVideoActive = false;
+        this.playTriggered = false;
+        this.pauseVideoElement();
     };
     _proto.onEnable = function onEnable() {
         MaskableGraphic.prototype.onEnable.call(this);
         this.isVideoActive = true;
+        this.playTriggered = false;
+        this.syncVideoToItemTime();
     };
     /**
    * 处理 goto 事件：重置播放状态，记录待 seek 时间
@@ -780,7 +784,7 @@ exports.VideoComponent = /*#__PURE__*/ function(MaskableGraphic) {
         this.isWaitingForGotoResult = true;
         this.playTriggered = false;
         this.manualPause = false;
-        this.pendingSeekTime = this.item.time;
+        this.pendingSeekTime = this.getItemSeekTime();
     };
     /**
    * 处理合成 pause 事件
@@ -791,7 +795,7 @@ exports.VideoComponent = /*#__PURE__*/ function(MaskableGraphic) {
             this.isWaitingForGotoResult = false;
             if (this.video && this.video.readyState >= 2) {
                 this.isGotoAndStopSeeking = true;
-                this.performSeek(this.item.time, false, true);
+                this.performSeek(this.getItemSeekTime(), false, true);
             }
             return;
         }
@@ -809,7 +813,7 @@ exports.VideoComponent = /*#__PURE__*/ function(MaskableGraphic) {
         if (!this.checkCompositionEnded()) {
             var _this_video;
             // 如果正在 seeking，不恢复播放，等 seek 完成后再恢复
-            if (!this.manualPause && !this.videoSeeking && ((_this_video = this.video) == null ? void 0 : _this_video.paused)) {
+            if (this.canPlayCurrentItem() && ((_this_video = this.video) == null ? void 0 : _this_video.paused)) {
                 this.safePlay();
             }
             return;
@@ -882,14 +886,10 @@ exports.VideoComponent = /*#__PURE__*/ function(MaskableGraphic) {
     /**
    * 是否应该启动视频播放
    */ _proto.shouldStartVideo = function shouldStartVideo() {
-        if (this.playTriggered || this.manualPause || this.videoDestroyed || this.checkVideoEnded()) {
-            return false;
-        }
-        var composition = this.item.composition;
-        if (!composition) {
+        if (this.playTriggered || !this.canPlayCurrentItem()) {
             return false;
         }
-        return this.video.currentTime > 0 || composition.time > 0;
+        return true;
     };
     /**
    * 处理延迟 seek，返回 true 表示本帧已处理 seek，应跳过后续逻辑
@@ -1020,8 +1020,25 @@ exports.VideoComponent = /*#__PURE__*/ function(MaskableGraphic) {
         var _this = this;
         if (clearTexture === void 0) clearTexture = false;
         if (isGotoAndStop === void 0) isGotoAndStop = false;
+        time = this.getClampedSeekTime(time);
         var wasPlaying = !this.video.paused;
+        var isNoopSeek = function() {
+            return !clearTexture && Math.abs(_this.video.currentTime - time) <= VideoComponent.threshold;
+        };
+        var finishNoopSeek = function() {
+            _this.videoSeeking = false;
+            _this.isGotoAndStopSeeking = false;
+            if (isGotoAndStop) {
+                _this.video.pause();
+            } else if (wasPlaying && !_this.manualPause) {
+                _this.safePlay();
+            }
+        };
         var doSeek = function() {
+            if (isNoopSeek()) {
+                finishNoopSeek();
+                return;
+            }
             _this.videoSeeking = true;
             if (clearTexture) {
                 _this.material.setTexture("_MainTex", _this.engine.transparentTexture);
@@ -1051,6 +1068,8 @@ exports.VideoComponent = /*#__PURE__*/ function(MaskableGraphic) {
             if (wasPlaying) {
                 // 视频正在播放，直接 seek
                 doSeek();
+            } else if (isNoopSeek()) {
+                finishNoopSeek();
             } else {
                 // 视频暂停，先 play() 再 seek
                 this.video.play().then(function() {
@@ -1088,6 +1107,60 @@ exports.VideoComponent = /*#__PURE__*/ function(MaskableGraphic) {
         }
     };
     /**
+   * 当前 item 可播放的本地视频时间。
+   * item.time 在 delay 前为负数，视频时间需要从 0 开始。
+   */ _proto.getItemSeekTime = function getItemSeekTime() {
+        return Math.max(0, this.getItemLocalTime());
+    };
+    /**
+   * 获取 item 的本地时间。优先使用 timeline 写入的 item.time，
+   * 未写入时使用合成时间和 item delay 做兜底。
+   */ _proto.getItemLocalTime = function getItemLocalTime() {
+        if (this.item.time >= 0) {
+            return this.item.time;
+        }
+        var composition = this.item.composition;
+        if (!composition) {
+            return this.item.time;
+        }
+        var _this_item_definition_delay;
+        return composition.time - ((_this_item_definition_delay = this.item.definition.delay) != null ? _this_item_definition_delay : 0);
+    };
+    /**
+   * 将 seek 目标限制到视频有效时间范围内。
+   */ _proto.getClampedSeekTime = function getClampedSeekTime(time) {
+        var _this_video;
+        var seekTime = Math.max(0, time);
+        var duration = (_this_video = this.video) == null ? void 0 : _this_video.duration;
+        if (!duration || !isFinite(duration)) {
+            return seekTime;
+        }
+        return Math.min(seekTime, duration);
+    };
+    /**
+   * 组件重新启用时将视频时间对齐到 item 本地时间，但不直接触发播放。
+   */ _proto.syncVideoToItemTime = function syncVideoToItemTime() {
+        if (!this.video) {
+            return;
+        }
+        var seekTime = this.getItemSeekTime();
+        var clampedSeekTime = this.getClampedSeekTime(seekTime);
+        if (Math.abs(this.video.currentTime - clampedSeekTime) > VideoComponent.threshold) {
+            this.pendingSeekTime = clampedSeekTime;
+        }
+    };
+    /**
+   * 当前 item 已经进入自己的时间区间，且视频允许自动播放。
+   */ _proto.canPlayCurrentItem = function canPlayCurrentItem() {
+        if (!this.video || !this.isVideoActive || this.getItemLocalTime() < 0) {
+            return false;
+        }
+        if (this.manualPause || this.videoDestroyed || this.videoSeeking || this.pendingSeekTime !== null) {
+            return false;
+        }
+        return !this.checkVideoEnded();
+    };
+    /**
    * 获取当前视频时长
    */ _proto.getDuration = function getDuration() {
         return this.video ? this.video.duration : 0;
@@ -1536,7 +1609,7 @@ exports.AudioComponent = __decorate([
 
 /**
  * 插件版本号
- */ var version = "2.9.0";
+ */ var version = "2.9.1-beta.0";
 EFFECTS.registerPlugin("video", VideoLoader);
 EFFECTS.registerPlugin("audio", AudioLoader);
 EFFECTS.logger.info("Plugin multimedia version: " + version + ".");