From bf47b93b09571cb1d5f81499a5c537383c611459 Mon Sep 17 00:00:00 2001 From: yambenari24 Date: Tue, 28 Jan 2025 17:08:26 +0200 Subject: [PATCH 1/4] fix(SUP-46065): Player shows VR button based on "360" (or variations) tag --- src/kaltura-player.ts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/kaltura-player.ts b/src/kaltura-player.ts index 5b5c2a5b5..191c93e41 100644 --- a/src/kaltura-player.ts +++ b/src/kaltura-player.ts @@ -131,12 +131,16 @@ export class KalturaPlayer extends FakeEventTarget { }) ); this._cuepointManager = new CuePointManager(this); + + const vrTag = this.getVrTag(options.plugins); + this._provider = new Provider( Utils.Object.mergeDeep(options.provider, { logger: { getLogger, LogLevel }, referrer: getOriginalRequestReferrer() }), - __VERSION__ + __VERSION__, + vrTag ); this._playlistManager = new PlaylistManager(this, options); Object.values(CoreEventType).forEach((coreEvent) => this._eventManager.listen(this._localPlayer, coreEvent, (e) => this.dispatchEvent(e))); @@ -535,6 +539,14 @@ export class KalturaPlayer extends FakeEventTarget { return this._localPlayer.isVr(); } + public getVrTag(config: PluginsConfig): string | null { + const vrPlugin = config['vr']; + if (vrPlugin) { + return vrPlugin.tag ?? '360'; + } + return null; + } + public toggleVrStereoMode(): void { const vrPlugin: BasePlugin | undefined = this._pluginManager.get('vr'); // eslint-disable-next-line @typescript-eslint/ban-ts-comment From c1697a69ed8ad2edcf1a7e482f30cb5e566b8ce9 Mon Sep 17 00:00:00 2001 From: yambenari24 Date: Thu, 30 Jan 2025 18:51:09 +0200 Subject: [PATCH 2/4] fix(SUP-46065): Player shows VR button based on "360" (or variations) tag --- demo/player-ovp.html | 67 ++++++++++++++++++++++++++++++++----------- src/kaltura-player.ts | 6 ++++ 2 files changed, 57 insertions(+), 16 deletions(-) diff --git a/demo/player-ovp.html b/demo/player-ovp.html index 997d39b3d..54942a201 100644 --- a/demo/player-ovp.html +++ b/demo/player-ovp.html @@ -8,26 +8,61 @@ Player + + + + + + + + + + + + + + + + + + + + + + -
- diff --git a/src/kaltura-player.ts b/src/kaltura-player.ts index 191c93e41..803ed6a26 100644 --- a/src/kaltura-player.ts +++ b/src/kaltura-player.ts @@ -142,6 +142,7 @@ export class KalturaPlayer extends FakeEventTarget { __VERSION__, vrTag ); + this._playlistManager = new PlaylistManager(this, options); Object.values(CoreEventType).forEach((coreEvent) => this._eventManager.listen(this._localPlayer, coreEvent, (e) => this.dispatchEvent(e))); @@ -496,6 +497,11 @@ export class KalturaPlayer extends FakeEventTarget { return this._localPlayer.isInPictureInPicture(); } + public foo(playerConfig): void { + const sources = Utils.Object.mergeDeep({}, playerConfig.sources, this._localPlayer.sources); + this._provider.setSourcesObject(sources, ) + } + public isPictureInPictureSupported(): boolean { return this._localPlayer.isPictureInPictureSupported(); } From ab8941dd9bffe0b03447ef0e50c239b701a115ab Mon Sep 17 00:00:00 2001 From: yambenari24 Date: Sun, 2 Feb 2025 14:32:39 +0200 Subject: [PATCH 3/4] fix(SUP-46065): Player shows VR button based on "360" (or variations) tag --- src/kaltura-player.ts | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/kaltura-player.ts b/src/kaltura-player.ts index 803ed6a26..db160ae38 100644 --- a/src/kaltura-player.ts +++ b/src/kaltura-player.ts @@ -132,15 +132,12 @@ export class KalturaPlayer extends FakeEventTarget { ); this._cuepointManager = new CuePointManager(this); - const vrTag = this.getVrTag(options.plugins); - this._provider = new Provider( Utils.Object.mergeDeep(options.provider, { logger: { getLogger, LogLevel }, referrer: getOriginalRequestReferrer() }), - __VERSION__, - vrTag + __VERSION__ ); this._playlistManager = new PlaylistManager(this, options); @@ -497,9 +494,8 @@ export class KalturaPlayer extends FakeEventTarget { return this._localPlayer.isInPictureInPicture(); } - public foo(playerConfig): void { - const sources = Utils.Object.mergeDeep({}, playerConfig.sources, this._localPlayer.sources); - this._provider.setSourcesObject(sources, ) + public _updatePlayerVrPluginIsOn(vrTag: string): void { + this._provider._updatePlayerVrPluginIsOn(vrTag); } public isPictureInPictureSupported(): boolean { @@ -545,14 +541,6 @@ export class KalturaPlayer extends FakeEventTarget { return this._localPlayer.isVr(); } - public getVrTag(config: PluginsConfig): string | null { - const vrPlugin = config['vr']; - if (vrPlugin) { - return vrPlugin.tag ?? '360'; - } - return null; - } - public toggleVrStereoMode(): void { const vrPlugin: BasePlugin | undefined = this._pluginManager.get('vr'); // eslint-disable-next-line @typescript-eslint/ban-ts-comment From 957facbc1011b29a7c4ac16ef76181c5807acaea Mon Sep 17 00:00:00 2001 From: yambenari24 Date: Sun, 2 Feb 2025 14:54:29 +0200 Subject: [PATCH 4/4] Remove kaltura-ovp changes file from PR --- demo/player-ovp.html | 68 -------------------------------------------- 1 file changed, 68 deletions(-) delete mode 100644 demo/player-ovp.html diff --git a/demo/player-ovp.html b/demo/player-ovp.html deleted file mode 100644 index 54942a201..000000000 --- a/demo/player-ovp.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - Player - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - -