@galacean/effects-plugin-multimedia 2.7.0-alpha.2 → 2.7.0-beta.0

package/dist/audio/audio-component.d.ts

@@ -1,8 +1,5 @@
 import { RendererComponent, spec } from '@galacean/effects';
 import { AudioPlayer } from './audio-player';
-/**
- * Audio component class
- */
 export declare class AudioComponent extends RendererComponent {
     audioPlayer: AudioPlayer;
     private isPlaying;

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects player multimedia plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 云垣
- * Version: v2.7.0-alpha.2
+ * Version: v2.7.0-beta.0
  */
 
 'use strict';
@@ -507,11 +507,11 @@ exports.VideoComponent = /*#__PURE__*/ function(MaskableGraphic) {
     function VideoComponent(engine) {
         var _this;
         _this = MaskableGraphic.call(this, engine) || this;
-        _this.threshold = 0.03;
         /**
    * 播放标志位
    */ _this.played = false;
         _this.pendingPause = false;
+        _this.threshold = 0.03;
         /**
    * 解决 video 暂停报错问题
    *
@@ -581,7 +581,7 @@ exports.VideoComponent = /*#__PURE__*/ function(MaskableGraphic) {
     };
     _proto.onAwake = function onAwake() {
         var _this = this;
-        var _this_item_composition, _this_item_composition1;
+        var _this_item_composition, _this_item_composition1, _this_item_composition2;
         MaskableGraphic.prototype.onAwake.call(this);
         (_this_item_composition = this.item.composition) == null ? void 0 : _this_item_composition.on("goto", function(option) {
             _this.setCurrentTime(_this.item.time);
@@ -589,6 +589,12 @@ exports.VideoComponent = /*#__PURE__*/ function(MaskableGraphic) {
         (_this_item_composition1 = this.item.composition) == null ? void 0 : _this_item_composition1.on("pause", function() {
             _this.pauseVideo();
         });
+        (_this_item_composition2 = this.item.composition) == null ? void 0 : _this_item_composition2.on("play", function(option) {
+            if (_this.item.time < 0) {
+                return;
+            }
+            _this.playVideo();
+        });
     };
     _proto.fromData = function fromData(data) {
         MaskableGraphic.prototype.fromData.call(this, data);
@@ -629,32 +635,39 @@ exports.VideoComponent = /*#__PURE__*/ function(MaskableGraphic) {
     };
     _proto.onUpdate = function onUpdate(dt) {
         MaskableGraphic.prototype.onUpdate.call(this, dt);
-        var _this_item = this.item, time = _this_item.time, duration = _this_item.duration, endBehavior = _this_item.endBehavior, composition = _this_item.composition;
+        var _this_item = this.item, videoTime = _this_item.time, videoDuration = _this_item.duration, videoEndBehavior = _this_item.endBehavior, composition = _this_item.composition;
         EFFECTS.assertExist(composition);
         var _composition_rootItem = composition.rootItem, rootEndBehavior = _composition_rootItem.endBehavior, rootDuration = _composition_rootItem.duration;
-        var isEnd = time === 0 || time === rootDuration || Math.abs(rootDuration - duration - time) < 1e-10 || Math.abs(time - duration) < this.threshold;
-        if (time > 0 && !isEnd) {
-            this.setVisible(true);
+        // 判断是否处于“结束状态”：
+        // - 视频时间为 0（未开始）
+        // - 合成时间已达最大时长（播放完毕）
+        // - 视频时间接近或等于其总时长（考虑容差阈值）
+        var isEnd = videoTime === 0 || composition.time === rootDuration || Math.abs(videoTime - videoDuration) <= this.threshold;
+        // 如果视频时间大于 0，且未到结束状态，并且尚未触发播放，则开始播放视频
+        if (videoTime > 0 && !isEnd && !this.played) {
             this.playVideo();
         }
-        this.renderer.texture.uploadCurrentVideoFrame();
-        if (time === 0 || time === rootDuration || Math.abs(rootDuration - duration - time) < 1e-10) {
-            if (rootEndBehavior === EFFECTS.spec.EndBehavior.freeze) {
+        // 当视频播放时间接近或超过其总时长时，根据其结束行为进行处理
+        if (videoTime + this.threshold >= videoDuration) {
+            if (videoEndBehavior === EFFECTS.spec.EndBehavior.freeze) {
                 var _this_video;
                 if (!((_this_video = this.video) == null ? void 0 : _this_video.paused)) {
                     this.pauseVideo();
-                    this.setCurrentTime(time);
                 }
-            } else {
-                this.setCurrentTime(time);
+            } else if (videoEndBehavior === EFFECTS.spec.EndBehavior.destroy || videoEndBehavior === EFFECTS.spec.EndBehavior.restart) {
+                // 销毁由Composition管理，此处仅重置时间
+                this.setCurrentTime(0);
             }
         }
-        if (Math.abs(time - duration) < this.threshold) {
-            if (endBehavior === EFFECTS.spec.EndBehavior.freeze) {
-                this.pauseVideo();
-            } else if (endBehavior === EFFECTS.spec.EndBehavior.restart) {
-                // 重播
-                this.pauseVideo();
+        // 判断整个合成是否接近播放完成
+        // composition.time + threshold >= rootDuration 表示即将结束
+        if (composition.time + this.threshold >= rootDuration) {
+            if (rootEndBehavior === EFFECTS.spec.EndBehavior.freeze) {
+                var _this_video1;
+                if (!((_this_video1 = this.video) == null ? void 0 : _this_video1.paused)) {
+                    this.pauseVideo();
+                }
+            } else if (rootEndBehavior === EFFECTS.spec.EndBehavior.restart) {
                 this.setCurrentTime(0);
             }
         }
@@ -672,12 +685,6 @@ exports.VideoComponent = /*#__PURE__*/ function(MaskableGraphic) {
         return this.video ? this.video.currentTime : 0;
     };
     /**
-   * 设置阈值（由于视频是单独的 update，有时并不能完全对其 GE 的 update）
-   * @param threshold 阈值
-   */ _proto.setThreshold = function setThreshold(threshold) {
-        this.threshold = threshold;
-    };
-    /**
    * 设置当前视频播放时刻
    * @param time 视频播放时刻
    */ _proto.setCurrentTime = function setCurrentTime(time) {
@@ -778,14 +785,9 @@ exports.VideoComponent = /*#__PURE__*/ function(MaskableGraphic) {
         }
     };
     _proto.onDisable = function onDisable() {
-        var _this_item;
         MaskableGraphic.prototype.onDisable.call(this);
         this.isVideoActive = false;
         this.pauseVideo();
-        var endBehavior = (_this_item = this.item) == null ? void 0 : _this_item.endBehavior;
-        if (endBehavior === EFFECTS.spec.EndBehavior.restart) {
-            this.setCurrentTime(0);
-        }
     };
     _proto.onEnable = function onEnable() {
         MaskableGraphic.prototype.onEnable.call(this);
@@ -1041,6 +1043,7 @@ exports.AudioComponent = /*#__PURE__*/ function(RendererComponent) {
         var _this_item_composition, _this_item_composition1, _this_item_composition2;
         RendererComponent.prototype.onAwake.call(this);
         (_this_item_composition = this.item.composition) == null ? void 0 : _this_item_composition.on("play", function(option) {
+            _this.audioPlayer.setMuted(false);
             if (_this.item.time <= 0) {
                 return;
             }
@@ -1049,10 +1052,12 @@ exports.AudioComponent = /*#__PURE__*/ function(RendererComponent) {
             _this.isPlaying = true;
         });
         (_this_item_composition1 = this.item.composition) == null ? void 0 : _this_item_composition1.on("pause", function() {
+            _this.audioPlayer.setMuted(true);
             _this.audioPlayer.pause();
             _this.isPlaying = false;
         });
         (_this_item_composition2 = this.item.composition) == null ? void 0 : _this_item_composition2.on("goto", function(option) {
+            _this.audioPlayer.setMuted(true);
             _this.audioPlayer.setCurrentTime(_this.item.time);
         });
     };
@@ -1134,7 +1139,7 @@ exports.AudioComponent = __decorate([
 
 /**
  * 插件版本号
- */ var version = "2.7.0-alpha.2";
+ */ var version = "2.7.0-beta.0";
 EFFECTS.registerPlugin("video", VideoLoader, EFFECTS.VFXItem);
 EFFECTS.registerPlugin("audio", AudioLoader, EFFECTS.VFXItem);
 EFFECTS.logger.info("Plugin multimedia version: " + version + ".");