senza-sdk 4.2.51-c1ae854.0 → 4.2.51-c4000e6.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "senza-sdk",
-    "version": "4.2.51-c1ae854.0",
+    "version": "4.2.51-c4000e6.0",
     "main": "./src/api.js",
     "description": "API for Senza application",
     "license": "MIT",

package/src/remotePlayer.js

@@ -10,7 +10,8 @@ import {
     TargetPlayingState,
     isSubtitlesTranslationAllowed,
     isSubtitlesTranslationPattern,
-    SetAudioLanguageState
+    SetAudioLanguageState,
+    SetSubtitleLanguageState
 } from "./utils";
 import { lifecycle } from "./lifecycle";
 import { writeLicenseResponse } from "./api";
@@ -892,6 +893,7 @@ class RemotePlayer extends EventTarget {
                 throw new RemotePlayerError(6501, "Cannot call load() while previous load/unload is still in progress");
             }
             this._abortSetAudioLanguage = true;
+            this._abortSetSubtitleLanguage = true;
             this._abortSeeking = true;
             if (reset) {
                 this._reset();
@@ -1065,6 +1067,18 @@ class RemotePlayer extends EventTarget {
             }
         }
 
+        if (this._isSetAudioByApplication) {
+            sdkLogger.info("application requesting play during setAudioLanguage");
+            this._targetSetAudioPlayingState = TargetPlayingState.PLAYING_UI;
+            return Promise.resolve(true);
+        }
+
+        if (this._isSetSubtitleByApplication) {
+            sdkLogger.info("application requesting play during setSubtitleLanguage");
+            this._targetSetSubtitlePlayingState = TargetPlayingState.PLAYING_UI;
+            return Promise.resolve(true);
+        }
+
         // If seeking in progress, wait for seek to complete before playing
         if (this._isSeekingByApplication) {
             sdkLogger.info("application requesting play during seek");
@@ -1104,6 +1118,16 @@ class RemotePlayer extends EventTarget {
             this._targetSeekPlayingState = TargetPlayingState.PAUSED;
             return Promise.resolve(true);
         }
+        if (this._isSetAudioByApplication) {
+            sdkLogger.info("application requesting pause during setAudioLanguage");
+            this._targetSetAudioPlayingState = TargetPlayingState.PAUSED;
+            return Promise.resolve(true);
+        }
+        if (this._isSetSubtitleByApplication) {
+            sdkLogger.info("application requesting pause during setSubtitleLanguage");
+            this._targetSetSubtitlePlayingState = TargetPlayingState.PAUSED;
+            return Promise.resolve(true);
+        }
         return this._pause();
     }
 
@@ -1349,7 +1373,8 @@ class RemotePlayer extends EventTarget {
         case 2:
             return this._selectTextTrackV2(textTrackId, prevSelectedTextTrack);
         default:
-            return this._selectTextTrackV3(textTrackId, prevSelectedTextTrack);
+            this._pendingSubtitleLanguage = textTrackId;
+            return this._atomicSetSubtitleLanguage();
         }
     }
 
@@ -1676,9 +1701,65 @@ class RemotePlayer extends EventTarget {
         sdkLogger.info("Seeking: local video element seeking end");
     }
 
+    async _atomicSetSubtitleLanguage() {
+        sdkLogger.info("SetSubtitleLanguage: local video element set start while isPLaying=", this._isPlaying);
+
+        this._targetSetSubtitlePlayingState = this._isPlaying ? TargetPlayingState.PLAYING_UI : TargetPlayingState.PAUSED;
+        this._abortSetSubtitleLanguage = false;
+        this._isSetSubtitleByApplication = true;
+
+        let state = SetSubtitleLanguageState.INIT;
+
+        let previousPendingSubtitleLanguage = this._pendingSubtitleLanguage;
+        let initialSubtitleLanguage = this._pendingSubtitleLanguage;
+        let res;
+
+        while (!this._abortSetSubtitleLanguage && state !== SetSubtitleLanguageState.DONE) {
+            try {
+                switch(state) {
+                case SetSubtitleLanguageState.INIT:
+                    state = this._isPlaying ? SetSubtitleLanguageState.STOPPED : SetSubtitleLanguageState.SET;
+                    break;
+                case SetSubtitleLanguageState.STOPPED:
+                    //sdkLogger.error("BEFORE STOP BEFORE SET SUBTITLE");
+                    await lifecycle.moveToForeground();
+                    //sdkLogger.error("AFTER STOP BEFORE SET SUBTITLE");
+                    state = SetSubtitleLanguageState.SET;
+                    break;
+                case SetSubtitleLanguageState.SET:
+                    initialSubtitleLanguage = this._pendingSubtitleLanguage;
+                    previousPendingSubtitleLanguage = this._selectedSubtitleTrack;
+                    res = await this._selectTextTrackV3(initialSubtitleLanguage, previousPendingSubtitleLanguage);
+                    //sdkLogger.error("BEFORE PLAY AFTER SET SUBTITLE 1");
+                    state = SetSubtitleLanguageState.DONE;
+                    break;
+                }
+            } catch (error) {
+                sdkLogger.error(`Error during set subtitle process: ${error.message}`);
+                state = SetSubtitleLanguageState.DONE;
+                res = Promise.reject(error);
+            }
+        }
+
+        if (!this._abortSetSubtitleLanguage) {
+            //sdkLogger.error("TARGET PLAYING STATE", this._targetSetSubtitlePlayingState);
+            if (this._targetSetSubtitlePlayingState === TargetPlayingState.PLAYING_UI) {
+                //sdkLogger.error("BEFORE PLAY AFTER SET SUBTITLE 2");
+                this._play();
+            } else if (this._targetSetSubtitlePlayingState === TargetPlayingState.PLAYING_ABR) {
+                //sdkLogger.error("BEFORE MOVE_TO_BACKGROUND AFTER SET SUBTITLE");
+                lifecycle._moveToBackground();
+            }
+        }
+        this._isSetSubtitleByApplication = false;
+        sdkLogger.info("SetSubtitleLanguage: local video element set subtitle end");
+        return res
+    }
+
     async _atomicSetAudioLanguage() {
-        sdkLogger.info("Seeking: local video element seeking start while isPLaying=", this._isPlaying);
+        sdkLogger.info("SetAudioLanguage: local video element set start while isPLaying=", this._isPlaying);
 
+        this._targetSetAudioPlayingState = this._isPlaying ? TargetPlayingState.PLAYING_UI : TargetPlayingState.PAUSED;
         this._abortSetAudioLanguage = false;
         this._isSetAudioByApplication = true;
 
@@ -1703,21 +1784,30 @@ class RemotePlayer extends EventTarget {
                     initialAudioLanguage = this._pendingAudioLanguage;
                     previousPendingAudioLanguage = this._selectedAudioTrack;
                     res = await this._selectAudioTrackV3(initialAudioLanguage, previousPendingAudioLanguage);
+                    //sdkLogger.error("BEFORE PLAY AFTER SET AUDIO 1");
                     state = SetAudioLanguageState.DONE;
                     break;
                 }
             } catch (error) {
-                sdkLogger.error(`Error during seeking process: ${error.message}`);
-                state = SeekState.DONE;
+                sdkLogger.error(`Error during set audio process: ${error.message}`);
+                state = SetAudioLanguageState.DONE;
                 res = Promise.reject(error);
-            } finally {
-                if (!this._abortSetAudioLanguage) {
-                    this._play();
-                }
-                this._isSetAudioByApplication = false;
-                sdkLogger.info("Seeking: local video element seeking end");
             }
-        } 
+        }
+
+        if (!this._abortSetAudioLanguage) {
+            //sdkLogger.error("TARGET PLAYING STATE", this._targetSetAudioPlayingState);
+            if (this._targetSetAudioPlayingState === TargetPlayingState.PLAYING_UI) {
+                //sdkLogger.error("BEFORE PLAY AFTER SET AUDIO 2");
+                this._play();
+            } else if (this._targetSetAudioPlayingState === TargetPlayingState.PLAYING_ABR) {
+                //sdkLogger.error("BEFORE MOVE_TO_BACKGROUND AFTER SET AUDIO");
+                lifecycle._moveToBackground();
+            }
+        }
+
+        this._isSetAudioByApplication = false;
+        sdkLogger.info("SetAudioLanguage: local video element set audio end");
         return res
     }
 }

package/src/utils.js

@@ -164,6 +164,15 @@ export const SetAudioLanguageState = Object.freeze({
     DONE: "done"
 });
 
+export const SetSubtitleLanguageState = Object.freeze({
+    INIT: "init",
+    STOPPED: "stopped",
+    SET: "set",
+    MULTI_SET: "multiSet",
+    WAITING: "waiting",
+    DONE: "done"
+});
+
 export const iso6393to1 = {
     "aar": "aa",
     "abk": "ab",