react-native-theoplayer 11.5.0 → 11.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +32 -1
- package/README.md +70 -0
- package/android/build.gradle +1 -0
- package/android/src/main/java/com/theoplayer/PlayerConfigAdapter.kt +6 -0
- package/android/src/main/java/com/theoplayer/PlayerEventEmitter.kt +11 -2
- package/android/src/main/java/com/theoplayer/ReactTHEOplayerContext.kt +95 -93
- package/android/src/main/java/com/theoplayer/ReactTHEOplayerPackage.kt +6 -0
- package/android/src/main/java/com/theoplayer/ReactTHEOplayerView.kt +51 -3
- package/android/src/main/java/com/theoplayer/ads/AdEventAdapter.kt +4 -0
- package/android/src/main/java/com/theoplayer/ads/AdsModule.kt +6 -6
- package/android/src/main/java/com/theoplayer/integration/Integration.kt +72 -0
- package/android/src/main/java/com/theoplayer/integration/IntegrationRegistration.kt +68 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacade.kt +187 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacadeAdState.kt +19 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacadeAds.kt +73 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacadeAdsBridge.kt +112 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacadeEventSubscription.kt +11 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacadeEvents.kt +139 -0
- package/android/src/main/java/com/theoplayer/media/MediaControlModule.kt +102 -0
- package/android/src/main/java/com/theoplayer/media/MediaControlProxy.kt +376 -0
- package/android/src/main/java/com/theoplayer/media/MediaNotificationBuilder.kt +78 -34
- package/android/src/main/java/com/theoplayer/media/MediaPlaybackService.kt +53 -20
- package/android/src/main/java/com/theoplayer/media/MediaSessionConfig.kt +6 -6
- package/android/src/main/java/com/theoplayer/media/MediaSessionConfigAdapter.kt +23 -20
- package/android/src/main/java/com/theoplayer/metrics/MetricsModule.kt +37 -0
- package/android/src/main/java/com/theoplayer/player/PlayerModule.kt +0 -1
- package/android/src/main/java/com/theoplayer/presentation/PipUtils.kt +98 -93
- package/android/src/main/java/com/theoplayer/theoads/THEOadsModule.kt +1 -1
- package/android/src/main/java/com/theoplayer/util/ReadableExtension.kt +14 -0
- package/android/src/main/res/drawable/ic_next.xml +9 -0
- package/android/src/main/res/drawable/ic_prev.xml +9 -0
- package/android/src/main/res/values/strings.xml +4 -0
- package/android/src/test/java/com/theoplayer/integration/PlayerFacadeAdsBridgeTest.kt +250 -0
- package/android/src/test/java/com/theoplayer/integration/PlayerFacadeConfigurationTest.kt +30 -0
- package/android/src/test/java/com/theoplayer/integration/PlayerFacadeTest.kt +507 -0
- package/android/src/test/java/com/theoplayer/integration/PlayerFacadeTestHost.kt +104 -0
- package/ios/THEOplayerRCTBridge.m +35 -0
- package/ios/THEOplayerRCTDebug.swift +3 -0
- package/ios/THEOplayerRCTMainEventHandler.swift +17 -0
- package/ios/THEOplayerRCTPlayerAPI.swift +31 -0
- package/ios/THEOplayerRCTTypeUtils.swift +30 -0
- package/ios/THEOplayerRCTView.swift +15 -5
- package/ios/Theoplayer-Bridging-Header.h +0 -1
- package/ios/backgroundAudio/THEOplayerRCTBackgroundAudioManager.swift +1 -1
- package/ios/backgroundAudio/THEOplayerRCTNowPlayingManager.swift +49 -3
- package/ios/backgroundAudio/THEOplayerRCTRemoteCommandsManager.swift +151 -68
- package/ios/backgroundAudio/THEOplayerRCTView+MediaControlConfig.swift +25 -11
- package/ios/mediaControl/THEOplayerRCTMediaControlAPI.swift +79 -0
- package/ios/mediaControl/THEOplayerRCTMediaControlManager.swift +38 -0
- package/ios/metrics/THEOplayerRCTMetricsAPI.swift +31 -0
- package/ios/pip/THEOplayerRCTPipControlsManager.swift +9 -12
- package/lib/commonjs/api/barrel.js +31 -20
- package/lib/commonjs/api/barrel.js.map +1 -1
- package/lib/commonjs/api/event/PlayerEvent.js +8 -0
- package/lib/commonjs/api/event/PlayerEvent.js.map +1 -1
- package/lib/commonjs/api/media/MediaControlAPI.js +14 -0
- package/lib/commonjs/api/media/MediaControlAPI.js.map +1 -0
- package/lib/commonjs/api/media/barrel.js +11 -0
- package/lib/commonjs/api/media/barrel.js.map +1 -1
- package/lib/commonjs/api/metrics/MetricsAPI.js +2 -0
- package/lib/commonjs/api/metrics/MetricsAPI.js.map +1 -0
- package/lib/commonjs/api/metrics/barrel.js +17 -0
- package/lib/commonjs/api/metrics/barrel.js.map +1 -0
- package/lib/commonjs/api/player/Integration.js +2 -0
- package/lib/commonjs/api/player/Integration.js.map +1 -0
- package/lib/commonjs/api/player/PlayerEventMap.js +1 -0
- package/lib/commonjs/api/player/PlayerEventMap.js.map +1 -1
- package/lib/commonjs/api/player/THEOplayer.js.map +1 -1
- package/lib/commonjs/api/player/barrel.js +11 -0
- package/lib/commonjs/api/player/barrel.js.map +1 -1
- package/lib/commonjs/api/track/MediaTrack.js +16 -0
- package/lib/commonjs/api/track/MediaTrack.js.map +1 -1
- package/lib/commonjs/internal/THEOplayerView.js +6 -0
- package/lib/commonjs/internal/THEOplayerView.js.map +1 -1
- package/lib/commonjs/internal/THEOplayerView.web.js +3 -1
- package/lib/commonjs/internal/THEOplayerView.web.js.map +1 -1
- package/lib/commonjs/internal/adapter/DefaultNativePlayerState.js +1 -0
- package/lib/commonjs/internal/adapter/DefaultNativePlayerState.js.map +1 -1
- package/lib/commonjs/internal/adapter/THEOplayerAdapter.js +24 -0
- package/lib/commonjs/internal/adapter/THEOplayerAdapter.js.map +1 -1
- package/lib/commonjs/internal/adapter/THEOplayerWebAdapter.js +29 -12
- package/lib/commonjs/internal/adapter/THEOplayerWebAdapter.js.map +1 -1
- package/lib/commonjs/internal/adapter/WebEventForwarder.js +6 -1
- package/lib/commonjs/internal/adapter/WebEventForwarder.js.map +1 -1
- package/lib/commonjs/internal/adapter/event/PlayerEvents.js +7 -1
- package/lib/commonjs/internal/adapter/event/PlayerEvents.js.map +1 -1
- package/lib/commonjs/internal/adapter/media/MediaControlNativeAdapter.js +42 -0
- package/lib/commonjs/internal/adapter/media/MediaControlNativeAdapter.js.map +1 -0
- package/lib/commonjs/internal/adapter/media/MediaControlWebAdapter.js +32 -0
- package/lib/commonjs/internal/adapter/media/MediaControlWebAdapter.js.map +1 -0
- package/lib/commonjs/internal/adapter/metrics/MetricsNativeAdapter.js +18 -0
- package/lib/commonjs/internal/adapter/metrics/MetricsNativeAdapter.js.map +1 -0
- package/lib/commonjs/internal/adapter/metrics/MetricsWebAdapter.js +16 -0
- package/lib/commonjs/internal/adapter/metrics/MetricsWebAdapter.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/IntegrationRegistration.js +6 -0
- package/lib/commonjs/internal/adapter/web/IntegrationRegistration.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacade.js +258 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacade.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeAPI.js +6 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeAPI.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeAdsEvents.js +114 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeAdsEvents.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeIntegration.js +6 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeIntegration.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeTypes.js +6 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeTypes.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/WebMediaSession.js +78 -16
- package/lib/commonjs/internal/adapter/web/WebMediaSession.js.map +1 -1
- package/lib/commonjs/manifest.json +1 -1
- package/lib/module/api/barrel.js +1 -0
- package/lib/module/api/barrel.js.map +1 -1
- package/lib/module/api/event/PlayerEvent.js +9 -0
- package/lib/module/api/event/PlayerEvent.js.map +1 -1
- package/lib/module/api/media/MediaControlAPI.js +10 -0
- package/lib/module/api/media/MediaControlAPI.js.map +1 -0
- package/lib/module/api/media/barrel.js +1 -0
- package/lib/module/api/media/barrel.js.map +1 -1
- package/lib/module/api/metrics/MetricsAPI.js +2 -0
- package/lib/module/api/metrics/MetricsAPI.js.map +1 -0
- package/lib/module/api/metrics/barrel.js +4 -0
- package/lib/module/api/metrics/barrel.js.map +1 -0
- package/lib/module/api/player/Integration.js +2 -0
- package/lib/module/api/player/Integration.js.map +1 -0
- package/lib/module/api/player/PlayerEventMap.js +1 -0
- package/lib/module/api/player/PlayerEventMap.js.map +1 -1
- package/lib/module/api/player/THEOplayer.js.map +1 -1
- package/lib/module/api/player/barrel.js +1 -0
- package/lib/module/api/player/barrel.js.map +1 -1
- package/lib/module/api/track/MediaTrack.js +16 -0
- package/lib/module/api/track/MediaTrack.js.map +1 -1
- package/lib/module/internal/THEOplayerView.js +7 -1
- package/lib/module/internal/THEOplayerView.js.map +1 -1
- package/lib/module/internal/THEOplayerView.web.js +3 -1
- package/lib/module/internal/THEOplayerView.web.js.map +1 -1
- package/lib/module/internal/adapter/DefaultNativePlayerState.js +1 -0
- package/lib/module/internal/adapter/DefaultNativePlayerState.js.map +1 -1
- package/lib/module/internal/adapter/THEOplayerAdapter.js +24 -0
- package/lib/module/internal/adapter/THEOplayerAdapter.js.map +1 -1
- package/lib/module/internal/adapter/THEOplayerWebAdapter.js +29 -12
- package/lib/module/internal/adapter/THEOplayerWebAdapter.js.map +1 -1
- package/lib/module/internal/adapter/WebEventForwarder.js +7 -2
- package/lib/module/internal/adapter/WebEventForwarder.js.map +1 -1
- package/lib/module/internal/adapter/event/PlayerEvents.js +5 -0
- package/lib/module/internal/adapter/event/PlayerEvents.js.map +1 -1
- package/lib/module/internal/adapter/media/MediaControlNativeAdapter.js +37 -0
- package/lib/module/internal/adapter/media/MediaControlNativeAdapter.js.map +1 -0
- package/lib/module/internal/adapter/media/MediaControlWebAdapter.js +27 -0
- package/lib/module/internal/adapter/media/MediaControlWebAdapter.js.map +1 -0
- package/lib/module/internal/adapter/metrics/MetricsNativeAdapter.js +13 -0
- package/lib/module/internal/adapter/metrics/MetricsNativeAdapter.js.map +1 -0
- package/lib/module/internal/adapter/metrics/MetricsWebAdapter.js +11 -0
- package/lib/module/internal/adapter/metrics/MetricsWebAdapter.js.map +1 -0
- package/lib/module/internal/adapter/web/IntegrationRegistration.js +4 -0
- package/lib/module/internal/adapter/web/IntegrationRegistration.js.map +1 -0
- package/lib/module/internal/adapter/web/PlayerFacade.js +253 -0
- package/lib/module/internal/adapter/web/PlayerFacade.js.map +1 -0
- package/lib/module/internal/adapter/web/PlayerFacadeAPI.js +4 -0
- package/lib/module/internal/adapter/web/PlayerFacadeAPI.js.map +1 -0
- package/lib/module/internal/adapter/web/PlayerFacadeAdsEvents.js +109 -0
- package/lib/module/internal/adapter/web/PlayerFacadeAdsEvents.js.map +1 -0
- package/lib/module/internal/adapter/web/PlayerFacadeIntegration.js +4 -0
- package/lib/module/internal/adapter/web/PlayerFacadeIntegration.js.map +1 -0
- package/lib/module/internal/adapter/web/PlayerFacadeTypes.js +4 -0
- package/lib/module/internal/adapter/web/PlayerFacadeTypes.js.map +1 -0
- package/lib/module/internal/adapter/web/WebMediaSession.js +78 -16
- package/lib/module/internal/adapter/web/WebMediaSession.js.map +1 -1
- package/lib/module/manifest.json +1 -1
- package/lib/typescript/__tests__/PlayerFacade.test.d.ts +2 -0
- package/lib/typescript/__tests__/PlayerFacade.test.d.ts.map +1 -0
- package/lib/typescript/__tests__/PlayerFacadeWebAdapter.test.d.ts +2 -0
- package/lib/typescript/__tests__/PlayerFacadeWebAdapter.test.d.ts.map +1 -0
- package/lib/typescript/__tests__/index.test.d.ts +13 -0
- package/lib/typescript/__tests__/index.test.d.ts.map +1 -1
- package/lib/typescript/api/THEOplayerView.d.ts +4 -0
- package/lib/typescript/api/THEOplayerView.d.ts.map +1 -1
- package/lib/typescript/api/barrel.d.ts +1 -0
- package/lib/typescript/api/barrel.d.ts.map +1 -1
- package/lib/typescript/api/config/PlayerConfiguration.d.ts +15 -0
- package/lib/typescript/api/config/PlayerConfiguration.d.ts.map +1 -1
- package/lib/typescript/api/event/AdEvent.d.ts +1 -1
- package/lib/typescript/api/event/PlayerEvent.d.ts +9 -0
- package/lib/typescript/api/event/PlayerEvent.d.ts.map +1 -1
- package/lib/typescript/api/media/MediaControlAPI.d.ts +30 -0
- package/lib/typescript/api/media/MediaControlAPI.d.ts.map +1 -0
- package/lib/typescript/api/media/MediaControlConfiguration.d.ts +5 -1
- package/lib/typescript/api/media/MediaControlConfiguration.d.ts.map +1 -1
- package/lib/typescript/api/media/barrel.d.ts +1 -0
- package/lib/typescript/api/media/barrel.d.ts.map +1 -1
- package/lib/typescript/api/metrics/MetricsAPI.d.ts +21 -0
- package/lib/typescript/api/metrics/MetricsAPI.d.ts.map +1 -0
- package/lib/typescript/api/metrics/barrel.d.ts +2 -0
- package/lib/typescript/api/metrics/barrel.d.ts.map +1 -0
- package/lib/typescript/api/player/Integration.d.ts +88 -0
- package/lib/typescript/api/player/Integration.d.ts.map +1 -0
- package/lib/typescript/api/player/PlayerEventMap.d.ts +7 -2
- package/lib/typescript/api/player/PlayerEventMap.d.ts.map +1 -1
- package/lib/typescript/api/player/THEOplayer.d.ts +24 -0
- package/lib/typescript/api/player/THEOplayer.d.ts.map +1 -1
- package/lib/typescript/api/player/barrel.d.ts +1 -0
- package/lib/typescript/api/player/barrel.d.ts.map +1 -1
- package/lib/typescript/api/track/MediaTrack.d.ts +21 -4
- package/lib/typescript/api/track/MediaTrack.d.ts.map +1 -1
- package/lib/typescript/internal/THEOplayerView.d.ts +1 -0
- package/lib/typescript/internal/THEOplayerView.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/DefaultNativePlayerState.d.ts +1 -0
- package/lib/typescript/internal/adapter/DefaultNativePlayerState.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/NativePlayerState.d.ts +1 -0
- package/lib/typescript/internal/adapter/NativePlayerState.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/THEOplayerAdapter.d.ts +8 -1
- package/lib/typescript/internal/adapter/THEOplayerAdapter.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/THEOplayerWebAdapter.d.ts +8 -2
- package/lib/typescript/internal/adapter/THEOplayerWebAdapter.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/WebEventForwarder.d.ts +1 -0
- package/lib/typescript/internal/adapter/WebEventForwarder.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/event/PlayerEvents.d.ts +4 -1
- package/lib/typescript/internal/adapter/event/PlayerEvents.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/event/native/NativePlayerEvent.d.ts +1 -0
- package/lib/typescript/internal/adapter/event/native/NativePlayerEvent.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/media/MediaControlNativeAdapter.d.ts +12 -0
- package/lib/typescript/internal/adapter/media/MediaControlNativeAdapter.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/media/MediaControlWebAdapter.d.ts +14 -0
- package/lib/typescript/internal/adapter/media/MediaControlWebAdapter.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/metrics/MetricsNativeAdapter.d.ts +7 -0
- package/lib/typescript/internal/adapter/metrics/MetricsNativeAdapter.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/metrics/MetricsWebAdapter.d.ts +8 -0
- package/lib/typescript/internal/adapter/metrics/MetricsWebAdapter.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/IntegrationRegistration.d.ts +53 -0
- package/lib/typescript/internal/adapter/web/IntegrationRegistration.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/PlayerFacade.d.ts +26 -0
- package/lib/typescript/internal/adapter/web/PlayerFacade.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeAPI.d.ts +33 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeAPI.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeAdsEvents.d.ts +21 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeAdsEvents.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeIntegration.d.ts +43 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeIntegration.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeTypes.d.ts +13 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeTypes.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/WebMediaSession.d.ts +10 -3
- package/lib/typescript/internal/adapter/web/WebMediaSession.d.ts.map +1 -1
- package/package.json +3 -3
- package/react-native-theoplayer.podspec +7 -7
- package/src/__tests__/PlayerFacade.test.ts +579 -0
- package/src/__tests__/PlayerFacadeWebAdapter.test.ts +193 -0
- package/src/__tests__/index.test.tsx +15 -1
- package/src/api/THEOplayerView.ts +5 -0
- package/src/api/barrel.ts +1 -0
- package/src/api/config/PlayerConfiguration.ts +16 -0
- package/src/api/event/AdEvent.ts +1 -1
- package/src/api/event/PlayerEvent.ts +10 -0
- package/src/api/media/MediaControlAPI.ts +33 -0
- package/src/api/media/MediaControlConfiguration.ts +5 -1
- package/src/api/media/barrel.ts +1 -0
- package/src/api/metrics/MetricsAPI.ts +20 -0
- package/src/api/metrics/barrel.ts +1 -0
- package/src/api/player/Integration.ts +97 -0
- package/src/api/player/PlayerEventMap.ts +7 -0
- package/src/api/player/THEOplayer.ts +27 -0
- package/src/api/player/barrel.ts +1 -0
- package/src/api/track/MediaTrack.ts +21 -4
- package/src/internal/THEOplayerView.tsx +10 -2
- package/src/internal/THEOplayerView.web.tsx +2 -2
- package/src/internal/adapter/DefaultNativePlayerState.ts +1 -0
- package/src/internal/adapter/NativePlayerState.ts +1 -0
- package/src/internal/adapter/THEOplayerAdapter.ts +33 -0
- package/src/internal/adapter/THEOplayerWebAdapter.ts +38 -12
- package/src/internal/adapter/WebEventForwarder.ts +12 -3
- package/src/internal/adapter/event/PlayerEvents.ts +10 -0
- package/src/internal/adapter/event/native/NativePlayerEvent.ts +2 -0
- package/src/internal/adapter/media/MediaControlNativeAdapter.ts +38 -0
- package/src/internal/adapter/media/MediaControlWebAdapter.ts +28 -0
- package/src/internal/adapter/metrics/MetricsNativeAdapter.ts +12 -0
- package/src/internal/adapter/metrics/MetricsWebAdapter.ts +14 -0
- package/src/internal/adapter/web/IntegrationRegistration.ts +57 -0
- package/src/internal/adapter/web/PlayerFacade.ts +281 -0
- package/src/internal/adapter/web/PlayerFacadeAPI.ts +35 -0
- package/src/internal/adapter/web/PlayerFacadeAdsEvents.ts +119 -0
- package/src/internal/adapter/web/PlayerFacadeIntegration.ts +45 -0
- package/src/internal/adapter/web/PlayerFacadeTypes.ts +14 -0
- package/src/internal/adapter/web/WebMediaSession.ts +85 -21
- package/src/manifest.json +1 -1
- package/android/src/main/java/com/theoplayer/media/MediaQueueNavigator.kt +0 -33
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
package com.theoplayer.media
|
|
2
2
|
|
|
3
3
|
import com.facebook.react.bridge.ReadableMap
|
|
4
|
+
import com.theoplayer.util.getBooleanOr
|
|
5
|
+
import com.theoplayer.util.getDoubleOr
|
|
4
6
|
|
|
5
7
|
object MediaSessionConfigAdapter {
|
|
6
8
|
private const val PROP_ENABLED = "mediaSessionEnabled"
|
|
@@ -11,25 +13,26 @@ object MediaSessionConfigAdapter {
|
|
|
11
13
|
private const val PROP_SEEK_TO_LIVE_RESUME = "seekToLiveOnResume"
|
|
12
14
|
|
|
13
15
|
fun fromProps(props: ReadableMap?): MediaSessionConfig {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
skipForwardInterval
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
allowLivePlayPause
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
16
|
+
val defaults = MediaSessionConfig()
|
|
17
|
+
return MediaSessionConfig(
|
|
18
|
+
mediaSessionEnabled = props.getBooleanOr(PROP_ENABLED, defaults.mediaSessionEnabled),
|
|
19
|
+
skipForwardInterval = props.getDoubleOr(
|
|
20
|
+
PROP_SKIP_FORWARD_INTERVAL,
|
|
21
|
+
defaults.skipForwardInterval
|
|
22
|
+
),
|
|
23
|
+
skipBackwardInterval = props.getDoubleOr(
|
|
24
|
+
PROP_SKIP_BACKWARD_INTERVAL,
|
|
25
|
+
defaults.skipBackwardInterval
|
|
26
|
+
),
|
|
27
|
+
convertSkipToSeek = props.getBooleanOr(PROP_CONVERT_SKIP, defaults.convertSkipToSeek),
|
|
28
|
+
allowLivePlayPause = props.getBooleanOr(
|
|
29
|
+
PROP_ALLOW_LIVE_PLAY_PAUSE,
|
|
30
|
+
defaults.allowLivePlayPause
|
|
31
|
+
),
|
|
32
|
+
seekToLiveOnResume = props.getBooleanOr(
|
|
33
|
+
PROP_SEEK_TO_LIVE_RESUME,
|
|
34
|
+
defaults.seekToLiveOnResume
|
|
35
|
+
)
|
|
36
|
+
)
|
|
34
37
|
}
|
|
35
38
|
}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
package com.theoplayer.metrics
|
|
2
|
+
|
|
3
|
+
import com.facebook.react.bridge.*
|
|
4
|
+
import com.facebook.react.module.annotations.ReactModule
|
|
5
|
+
import com.facebook.react.module.model.ReactModuleInfo
|
|
6
|
+
import com.theoplayer.ReactTHEOplayerView
|
|
7
|
+
import com.theoplayer.util.ViewResolver
|
|
8
|
+
|
|
9
|
+
@Suppress("unused")
|
|
10
|
+
@ReactModule(name = MetricsModule.NAME)
|
|
11
|
+
class MetricsModule(context: ReactApplicationContext) : ReactContextBaseJavaModule(context) {
|
|
12
|
+
companion object {
|
|
13
|
+
const val NAME = "THEORCTMetricsModule"
|
|
14
|
+
val INFO = ReactModuleInfo(
|
|
15
|
+
name = NAME,
|
|
16
|
+
className = NAME,
|
|
17
|
+
canOverrideExistingModule = false,
|
|
18
|
+
needsEagerInit = false,
|
|
19
|
+
isCxxModule = false,
|
|
20
|
+
isTurboModule = false,
|
|
21
|
+
)
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
private val viewResolver: ViewResolver = ViewResolver(context)
|
|
25
|
+
|
|
26
|
+
override fun getName(): String {
|
|
27
|
+
return NAME
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
// The bandwidth, in bits per second, that the player estimates is currently available.
|
|
31
|
+
@ReactMethod
|
|
32
|
+
fun currentBandwidthEstimate(tag: Int, promise: Promise) {
|
|
33
|
+
viewResolver.resolveViewByTag(tag) { view: ReactTHEOplayerView? ->
|
|
34
|
+
promise.resolve(view?.player?.metrics?.currentBandwidthEstimate ?: 0.0)
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
@@ -20,7 +20,6 @@ import com.theoplayer.presentation.PipConfigAdapter
|
|
|
20
20
|
import com.theoplayer.track.TextTrackStyleAdapter
|
|
21
21
|
import com.theoplayer.util.ViewResolver
|
|
22
22
|
import com.theoplayer.util.findReactRootView
|
|
23
|
-
import com.theoplayer.util.getClosestParentOfType
|
|
24
23
|
|
|
25
24
|
@Suppress("unused")
|
|
26
25
|
@ReactModule(name = PlayerModule.NAME)
|
|
@@ -15,15 +15,16 @@ import android.util.Rational
|
|
|
15
15
|
import android.view.ViewGroup
|
|
16
16
|
import androidx.annotation.RequiresApi
|
|
17
17
|
import com.facebook.react.uimanager.ThemedReactContext
|
|
18
|
-
import com.theoplayer.BuildConfig
|
|
19
18
|
import com.theoplayer.R
|
|
20
19
|
import com.theoplayer.ReactTHEOplayerContext
|
|
21
|
-
import com.theoplayer.android.api.ads.ima.GoogleImaAdEvent
|
|
22
|
-
import com.theoplayer.android.api.ads.ima.GoogleImaAdEventType
|
|
23
20
|
import com.theoplayer.android.api.event.EventListener
|
|
24
21
|
import com.theoplayer.android.api.event.player.PlayerEvent
|
|
25
22
|
import com.theoplayer.android.api.event.player.PlayerEventTypes
|
|
26
23
|
import com.theoplayer.android.api.player.Player
|
|
24
|
+
import com.theoplayer.media.AvailableActionsListener
|
|
25
|
+
import com.theoplayer.media.MediaControlProxy
|
|
26
|
+
import com.theoplayer.media.MediaControlSlot
|
|
27
|
+
import com.theoplayer.media.MediaControlSlots
|
|
27
28
|
|
|
28
29
|
private const val EXTRA_ACTION = "EXTRA_ACTION"
|
|
29
30
|
private const val ACTION_MEDIA_CONTROL = "pip_media_control"
|
|
@@ -31,8 +32,9 @@ private const val ACTION_PLAY = 0
|
|
|
31
32
|
private const val ACTION_PAUSE = ACTION_PLAY + 1
|
|
32
33
|
private const val ACTION_RWD = ACTION_PLAY + 2
|
|
33
34
|
private const val ACTION_FFD = ACTION_PLAY + 3
|
|
35
|
+
private const val ACTION_SKIP_TO_PREV = ACTION_PLAY + 4
|
|
36
|
+
private const val ACTION_SKIP_TO_NEXT = ACTION_PLAY + 5
|
|
34
37
|
private const val ACTION_IGNORE = ACTION_PLAY + 999
|
|
35
|
-
private const val SKIP_TIME = 15
|
|
36
38
|
private const val NO_ICON = -1
|
|
37
39
|
|
|
38
40
|
private val PIP_ASPECT_RATIO_DEFAULT = Rational(16, 9)
|
|
@@ -45,38 +47,37 @@ class PipUtils(
|
|
|
45
47
|
) {
|
|
46
48
|
|
|
47
49
|
private var enabled: Boolean = false
|
|
48
|
-
|
|
49
|
-
|
|
50
|
+
|
|
51
|
+
// The play/pause button reflects the playback state.
|
|
52
|
+
private val onPlayerAction = EventListener<PlayerEvent<*>> { updatePipParams() }
|
|
50
53
|
private val playerEvents = listOf(PlayerEventTypes.PLAY, PlayerEventTypes.PAUSE)
|
|
51
|
-
|
|
54
|
+
|
|
55
|
+
// Which actions are available is decided by the MediaControlProxy, which notifies us whenever that
|
|
56
|
+
// changes, for example when switching between content and ads, or when the stream turns out to be live.
|
|
57
|
+
private val onAvailableActionsChanged = AvailableActionsListener { updatePipParams() }
|
|
58
|
+
|
|
52
59
|
private val broadcastReceiver: BroadcastReceiver = buildBroadcastReceiver()
|
|
53
60
|
|
|
61
|
+
// The player the listeners are registered on, so they are removed from that same instance.
|
|
62
|
+
private var listeningPlayer: Player? = null
|
|
63
|
+
|
|
54
64
|
private val player: Player
|
|
55
65
|
get() = viewCtx.player
|
|
56
66
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
updatePipParams()
|
|
60
|
-
}
|
|
61
|
-
onAdAction = EventListener {
|
|
62
|
-
updatePipParams()
|
|
63
|
-
}
|
|
64
|
-
if (BuildConfig.EXTENSION_GOOGLE_IMA) {
|
|
65
|
-
adEvents = listOf(GoogleImaAdEventType.STARTED, GoogleImaAdEventType.CONTENT_RESUME_REQUESTED)
|
|
66
|
-
}
|
|
67
|
-
}
|
|
67
|
+
private val mediaControlProxy: MediaControlProxy
|
|
68
|
+
get() = viewCtx.mediaControlProxy
|
|
68
69
|
|
|
69
70
|
@SuppressLint("UnspecifiedRegisterReceiverFlag")
|
|
70
71
|
fun enable() {
|
|
71
72
|
if (enabled) {
|
|
72
73
|
return
|
|
73
74
|
}
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
player.ads.addEventListener(action, onAdAction)
|
|
75
|
+
listeningPlayer = player.also { player ->
|
|
76
|
+
playerEvents.forEach { action ->
|
|
77
|
+
player.addEventListener(action, onPlayerAction)
|
|
78
|
+
}
|
|
79
79
|
}
|
|
80
|
+
mediaControlProxy.addAvailableActionsListener(onAvailableActionsChanged)
|
|
80
81
|
|
|
81
82
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
|
82
83
|
reactContext.currentActivity?.registerReceiver(
|
|
@@ -97,12 +98,13 @@ class PipUtils(
|
|
|
97
98
|
if (!enabled) {
|
|
98
99
|
return
|
|
99
100
|
}
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
player.ads.removeEventListener(action, onAdAction)
|
|
101
|
+
listeningPlayer?.let { player ->
|
|
102
|
+
playerEvents.forEach { action ->
|
|
103
|
+
player.removeEventListener(action, onPlayerAction)
|
|
104
|
+
}
|
|
105
105
|
}
|
|
106
|
+
listeningPlayer = null
|
|
107
|
+
mediaControlProxy.removeAvailableActionsListener(onAvailableActionsChanged)
|
|
106
108
|
try {
|
|
107
109
|
reactContext.currentActivity?.unregisterReceiver(broadcastReceiver)
|
|
108
110
|
} catch (ignore: IllegalArgumentException) { /*ignore*/
|
|
@@ -114,60 +116,66 @@ class PipUtils(
|
|
|
114
116
|
disable()
|
|
115
117
|
}
|
|
116
118
|
|
|
119
|
+
/**
|
|
120
|
+
* Builds the PiP actions for the media controls that the proxy reports as available.
|
|
121
|
+
*/
|
|
117
122
|
@RequiresApi(Build.VERSION_CODES.O)
|
|
118
|
-
fun buildPipActions(
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
R.drawable.ic_rewind,
|
|
131
|
-
R.string.rewind,
|
|
132
|
-
R.string.rewind_description
|
|
133
|
-
)
|
|
123
|
+
private fun buildPipActions(paused: Boolean, slots: MediaControlSlots): List<RemoteAction> {
|
|
124
|
+
return listOfNotNull(
|
|
125
|
+
slots.leading?.let { remoteAction(it) },
|
|
126
|
+
// Always add the play/pause button, but send an ACTION_IGNORE and make it invisible if disabled.
|
|
127
|
+
// If no RemoteActions are added, MediaSession takes over the UI.
|
|
128
|
+
if (paused) {
|
|
129
|
+
buildRemoteAction(
|
|
130
|
+
ACTION_PLAY,
|
|
131
|
+
R.drawable.ic_play,
|
|
132
|
+
R.string.play,
|
|
133
|
+
R.string.play_description,
|
|
134
|
+
slots.playPauseEnabled
|
|
134
135
|
)
|
|
135
|
-
}
|
|
136
|
+
} else {
|
|
137
|
+
buildRemoteAction(
|
|
138
|
+
ACTION_PAUSE,
|
|
139
|
+
R.drawable.ic_pause,
|
|
140
|
+
R.string.play,
|
|
141
|
+
R.string.pause_description,
|
|
142
|
+
slots.playPauseEnabled
|
|
143
|
+
)
|
|
144
|
+
},
|
|
145
|
+
slots.trailing?.let { remoteAction(it) }
|
|
146
|
+
)
|
|
147
|
+
}
|
|
136
148
|
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
R.string.play,
|
|
146
|
-
R.string.play_description,
|
|
147
|
-
enablePlayPause
|
|
148
|
-
)
|
|
149
|
-
} else {
|
|
150
|
-
buildRemoteAction(
|
|
151
|
-
ACTION_PAUSE,
|
|
152
|
-
R.drawable.ic_pause,
|
|
153
|
-
R.string.play,
|
|
154
|
-
R.string.pause_description,
|
|
155
|
-
enablePlayPause
|
|
156
|
-
)
|
|
157
|
-
}
|
|
149
|
+
@RequiresApi(Build.VERSION_CODES.O)
|
|
150
|
+
private fun remoteAction(slot: MediaControlSlot): RemoteAction {
|
|
151
|
+
return when (slot) {
|
|
152
|
+
MediaControlSlot.SKIP_TO_PREVIOUS -> buildRemoteAction(
|
|
153
|
+
ACTION_SKIP_TO_PREV,
|
|
154
|
+
R.drawable.ic_prev,
|
|
155
|
+
R.string.skip_to_previous,
|
|
156
|
+
R.string.skip_to_previous_description
|
|
158
157
|
)
|
|
159
158
|
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
159
|
+
MediaControlSlot.SKIP_TO_NEXT -> buildRemoteAction(
|
|
160
|
+
ACTION_SKIP_TO_NEXT,
|
|
161
|
+
R.drawable.ic_next,
|
|
162
|
+
R.string.skip_to_next,
|
|
163
|
+
R.string.skip_to_next_description
|
|
164
|
+
)
|
|
165
|
+
|
|
166
|
+
MediaControlSlot.REWIND -> buildRemoteAction(
|
|
167
|
+
ACTION_RWD,
|
|
168
|
+
R.drawable.ic_rewind,
|
|
169
|
+
R.string.rewind,
|
|
170
|
+
R.string.rewind_description
|
|
171
|
+
)
|
|
172
|
+
|
|
173
|
+
MediaControlSlot.FAST_FORWARD -> buildRemoteAction(
|
|
174
|
+
ACTION_FFD,
|
|
175
|
+
R.drawable.ic_fast_forward,
|
|
176
|
+
R.string.fast_forward,
|
|
177
|
+
R.string.fast_forward_description
|
|
178
|
+
)
|
|
171
179
|
}
|
|
172
180
|
}
|
|
173
181
|
|
|
@@ -198,21 +206,13 @@ class PipUtils(
|
|
|
198
206
|
|
|
199
207
|
@RequiresApi(Build.VERSION_CODES.O)
|
|
200
208
|
fun getPipParams(): PictureInPictureParams {
|
|
201
|
-
val
|
|
202
|
-
val player = view.player
|
|
203
|
-
val visibleRect = getContentViewRect(view)
|
|
204
|
-
val isAd = player.ads.isPlaying
|
|
205
|
-
val isLive = player.duration.isInfinite()
|
|
206
|
-
val enablePlayPause = !isAd
|
|
207
|
-
val enableTrickPlay = !isAd && !isLive
|
|
209
|
+
val visibleRect = getContentViewRect(viewCtx.playerView)
|
|
208
210
|
|
|
209
211
|
return PictureInPictureParams.Builder()
|
|
210
212
|
.setSourceRectHint(visibleRect)
|
|
211
213
|
// Must be between 2.39:1 and 1:2.39 (inclusive)
|
|
212
|
-
.setAspectRatio(getSafeAspectRatio(
|
|
213
|
-
.setActions(
|
|
214
|
-
buildPipActions(player.isPaused, enablePlayPause, enableTrickPlay)
|
|
215
|
-
)
|
|
214
|
+
.setAspectRatio(getSafeAspectRatio(player.videoWidth, player.videoHeight))
|
|
215
|
+
.setActions(buildPipActions(player.isPaused, mediaControlProxy.controlSlots))
|
|
216
216
|
.build()
|
|
217
217
|
}
|
|
218
218
|
|
|
@@ -227,11 +227,15 @@ class PipUtils(
|
|
|
227
227
|
@RequiresApi(Build.VERSION_CODES.O)
|
|
228
228
|
override fun onReceive(context: Context?, intent: Intent?) {
|
|
229
229
|
intent?.getIntExtra(EXTRA_ACTION, -1)?.let { action ->
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
230
|
+
viewCtx.mediaControlProxy.apply {
|
|
231
|
+
when (action) {
|
|
232
|
+
ACTION_PLAY -> onPlay()
|
|
233
|
+
ACTION_PAUSE -> onPause()
|
|
234
|
+
ACTION_FFD -> onFastForward()
|
|
235
|
+
ACTION_RWD -> onRewind()
|
|
236
|
+
ACTION_SKIP_TO_NEXT -> onSkipToNext(player)
|
|
237
|
+
ACTION_SKIP_TO_PREV -> onSkipToPrevious(player)
|
|
238
|
+
}
|
|
235
239
|
}
|
|
236
240
|
reactContext.currentActivity?.setPictureInPictureParams(getPipParams())
|
|
237
241
|
}
|
|
@@ -260,6 +264,7 @@ class PipUtils(
|
|
|
260
264
|
// the NO_ICON causes a System UI crash.
|
|
261
265
|
Build.VERSION.SDK_INT in Build.VERSION_CODES.O..Build.VERSION_CODES.R ->
|
|
262
266
|
android.R.drawable.screen_background_light_transparent
|
|
267
|
+
|
|
263
268
|
else -> NO_ICON
|
|
264
269
|
}
|
|
265
270
|
)
|
|
@@ -4,7 +4,7 @@ import com.facebook.react.bridge.*
|
|
|
4
4
|
import com.facebook.react.module.annotations.ReactModule
|
|
5
5
|
import com.facebook.react.module.model.ReactModuleInfo
|
|
6
6
|
import com.theoplayer.*
|
|
7
|
-
import com.theoplayer.
|
|
7
|
+
import com.theoplayer.integration.theoAds
|
|
8
8
|
import com.theoplayer.theoads.THEOadsAdapter.fromInterstitialList
|
|
9
9
|
import com.theoplayer.util.ViewResolver
|
|
10
10
|
|
|
@@ -8,3 +8,17 @@ import com.facebook.react.bridge.ReadableMap
|
|
|
8
8
|
fun ReadableMap.getBooleanOrNull(name: String): Boolean? {
|
|
9
9
|
return if (hasKey(name)) getBoolean(name) else null
|
|
10
10
|
}
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* Gets a boolean value from the map, or [default] if the map or the key does not exist.
|
|
14
|
+
*/
|
|
15
|
+
fun ReadableMap?.getBooleanOr(name: String, default: Boolean): Boolean {
|
|
16
|
+
return if (this?.hasKey(name) == true) getBoolean(name) else default
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
/**
|
|
20
|
+
* Gets a double value from the map, or [default] if the map or the key does not exist.
|
|
21
|
+
*/
|
|
22
|
+
fun ReadableMap?.getDoubleOr(name: String, default: Double): Double {
|
|
23
|
+
return if (this?.hasKey(name) == true) getDouble(name) else default
|
|
24
|
+
}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
2
|
+
android:width="24dp"
|
|
3
|
+
android:height="24dp"
|
|
4
|
+
android:viewportWidth="960"
|
|
5
|
+
android:viewportHeight="960">
|
|
6
|
+
<path
|
|
7
|
+
android:pathData="M660,720v-480h80v480h-80ZM220,720v-480l360,240 -360,240Z"
|
|
8
|
+
android:fillColor="#000000"/>
|
|
9
|
+
</vector>
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
2
|
+
android:width="24dp"
|
|
3
|
+
android:height="24dp"
|
|
4
|
+
android:viewportWidth="960"
|
|
5
|
+
android:viewportHeight="960">
|
|
6
|
+
<path
|
|
7
|
+
android:pathData="M220,720v-480h80v480h-80ZM740,720L380,480l360,-240v480Z"
|
|
8
|
+
android:fillColor="#000000"/>
|
|
9
|
+
</vector>
|
|
@@ -8,6 +8,10 @@
|
|
|
8
8
|
<string name="fast_forward_description">Fast Forward video</string>
|
|
9
9
|
<string name="rewind">Rewind</string>
|
|
10
10
|
<string name="rewind_description">Rewind video</string>
|
|
11
|
+
<string name="skip_to_previous">Skip to Previous</string>
|
|
12
|
+
<string name="skip_to_previous_description">Skip to previous playlist item</string>
|
|
13
|
+
<string name="skip_to_next">Skip to Next</string>
|
|
14
|
+
<string name="skip_to_next_description">Skip to next playlist item</string>
|
|
11
15
|
|
|
12
16
|
<string name="background_playback_service_description">THEOplayer service providing background playback.</string>
|
|
13
17
|
<string name="notification_channel_id">theoplayer_default_channel</string>
|