From aae5002b2cc9bae26fc2f4ce0164b7a53be99183 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Wed, 24 Apr 2024 12:26:25 +0200 Subject: [PATCH 1/2] MOBILE-4566 media: Use VideoJS for some formats in Android too --- src/core/singletons/media.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/singletons/media.ts b/src/core/singletons/media.ts index cdf487cac9c..eebca879358 100644 --- a/src/core/singletons/media.ts +++ b/src/core/singletons/media.ts @@ -54,7 +54,7 @@ export class CoreMedia { * @returns Whether needs conversion. */ static sourceNeedsConversion(source: CoreMediaSource): boolean { - if (!CorePlatform.isIOS()) { + if (!CorePlatform.isMobile()) { return false; } @@ -84,7 +84,7 @@ export class CoreMedia { * @returns Whether JS player should be used. */ static mediaUsesJavascriptPlayer(mediaElement: HTMLVideoElement | HTMLAudioElement): boolean { - if (!CorePlatform.isIOS()) { + if (!CorePlatform.isMobile()) { return false; } From 1808d9adfc82ce7922b3c2eba9f99aacb16afa0e Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Wed, 24 Apr 2024 12:51:09 +0200 Subject: [PATCH 2/2] MOBILE-4566 media: Fix videojs videos wider than viewport --- src/addons/filter/mediaplugin/services/videojs.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/addons/filter/mediaplugin/services/videojs.ts b/src/addons/filter/mediaplugin/services/videojs.ts index 2bfb87f8fb1..2b5ea07e77b 100644 --- a/src/addons/filter/mediaplugin/services/videojs.ts +++ b/src/addons/filter/mediaplugin/services/videojs.ts @@ -165,6 +165,14 @@ export class AddonFilterMediaPluginVideoJSService { const videoWidth = player.videoWidth(); const videoHeight = player.videoHeight(); const playerDimensions = player.currentDimensions(); + const offsetParentWidth = player.el().offsetParent?.clientWidth; + + if (offsetParentWidth && playerDimensions.width > offsetParentWidth) { + // The player is bigger than the container. Resize it. + player.dimension('width', offsetParentWidth); + playerDimensions.width = offsetParentWidth; + } + if (!videoWidth || !videoHeight || !playerDimensions.width || videoWidth === playerDimensions.width) { return; }