react-native-audio-browser 0.2.0-next.53 → 0.2.0-next.54
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/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +8 -10
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +96 -243
- package/android/src/main/java/com/audiobrowser/AudioBrowserLifecycleModule.kt +8 -12
- package/android/src/main/java/com/audiobrowser/AudioBrowserPackage.kt +1 -3
- package/android/src/main/java/com/audiobrowser/Callbacks.kt +1 -10
- package/android/src/main/java/com/audiobrowser/ForegroundStart.kt +13 -18
- package/android/src/main/java/com/audiobrowser/HeadlessTaskService.kt +3 -7
- package/android/src/main/java/com/audiobrowser/RemoteOutputs.kt +8 -10
- package/android/src/main/java/com/audiobrowser/Service.kt +20 -61
- package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +9 -17
- package/android/src/main/java/com/audiobrowser/browser/ArtworkResolutionRegistry.kt +10 -9
- package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +11 -8
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +117 -448
- package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +21 -60
- package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +20 -80
- package/android/src/main/java/com/audiobrowser/browser/JsonArtwork.kt +6 -10
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +7 -24
- package/android/src/main/java/com/audiobrowser/browser/RouteMatch.kt +2 -4
- package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +13 -31
- package/android/src/main/java/com/audiobrowser/browser/SimpleRouter.kt +12 -40
- package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +15 -26
- package/android/src/main/java/com/audiobrowser/browser/TrackLoadHandler.kt +5 -15
- package/android/src/main/java/com/audiobrowser/extension/EnumExtensions.kt +1 -0
- package/android/src/main/java/com/audiobrowser/extension/NumberExt.kt +2 -0
- package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +4 -8
- package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +4 -6
- package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +3 -7
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +13 -22
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +17 -38
- package/android/src/main/java/com/audiobrowser/model/IcyTitle.kt +5 -6
- package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt +4 -9
- package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +18 -29
- package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +6 -16
- package/android/src/main/java/com/audiobrowser/player/AutomaticBufferManager.kt +15 -45
- package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +23 -59
- package/android/src/main/java/com/audiobrowser/player/CrossOriginHeaderStripper.kt +14 -26
- package/android/src/main/java/com/audiobrowser/player/DynamicLoadControl.kt +15 -43
- package/android/src/main/java/com/audiobrowser/player/EnginePlayback.kt +4 -4
- package/android/src/main/java/com/audiobrowser/player/EqualizerController.kt +15 -21
- package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +14 -31
- package/android/src/main/java/com/audiobrowser/player/LocalEngine.kt +8 -8
- package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +16 -27
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +119 -237
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +48 -145
- package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +39 -100
- package/android/src/main/java/com/audiobrowser/player/PlaybackErrorClassifier.kt +16 -26
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +22 -28
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +28 -64
- package/android/src/main/java/com/audiobrowser/player/PlaybackTimer.kt +8 -4
- package/android/src/main/java/com/audiobrowser/player/Player.kt +117 -405
- package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +1 -1
- package/android/src/main/java/com/audiobrowser/player/PlayerEngineFactory.kt +11 -19
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +30 -96
- package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +39 -95
- package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +7 -13
- package/android/src/main/java/com/audiobrowser/player/SleepTimer.kt +13 -30
- package/android/src/main/java/com/audiobrowser/player/SleepTimerManager.kt +7 -11
- package/android/src/main/java/com/audiobrowser/player/StuckRecoveryPolicy.kt +9 -22
- package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +22 -54
- package/android/src/main/java/com/audiobrowser/player/VolumeFader.kt +8 -15
- package/android/src/main/java/com/audiobrowser/remote/RemoteItem.kt +9 -8
- package/android/src/main/java/com/audiobrowser/remote/RemoteOutputsController.kt +13 -10
- package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +8 -8
- package/android/src/main/java/com/audiobrowser/remote/RemoteQueue.kt +12 -5
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +28 -48
- package/android/src/main/java/com/audiobrowser/sonos/DeviceDescriptionParser.kt +11 -19
- package/android/src/main/java/com/audiobrowser/sonos/DidlLite.kt +2 -2
- package/android/src/main/java/com/audiobrowser/sonos/SoapClient.kt +6 -6
- package/android/src/main/java/com/audiobrowser/sonos/SoapEnvelopes.kt +8 -9
- package/android/src/main/java/com/audiobrowser/sonos/SoapResponseParser.kt +11 -18
- package/android/src/main/java/com/audiobrowser/sonos/SonosDiscoverer.kt +10 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosOutputs.kt +10 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosPlayer.kt +21 -33
- package/android/src/main/java/com/audiobrowser/sonos/SonosRemote.kt +4 -6
- package/android/src/main/java/com/audiobrowser/sonos/SonosRouteProviderService.kt +9 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosStreamUri.kt +7 -7
- package/android/src/main/java/com/audiobrowser/sonos/SonosTransport.kt +5 -4
- package/android/src/main/java/com/audiobrowser/sonos/SsdpDiscovery.kt +8 -3
- package/android/src/main/java/com/audiobrowser/sonos/SsdpMessages.kt +4 -6
- package/android/src/main/java/com/audiobrowser/sonos/ZoneGroupState.kt +13 -11
- package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +34 -71
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +20 -37
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +18 -27
- package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +14 -29
- package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +68 -133
- package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +10 -22
- package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +6 -6
- package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +4 -3
- package/android/src/main/java/com/audiobrowser/util/ArtworkVariant.kt +2 -13
- package/android/src/main/java/com/audiobrowser/util/Automotive.kt +2 -4
- package/android/src/main/java/com/audiobrowser/util/BatteryOptimizationHelper.kt +3 -9
- package/android/src/main/java/com/audiobrowser/util/BatteryWarningStore.kt +4 -14
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +21 -85
- package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoader.kt +7 -7
- package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoaderHolder.kt +5 -8
- package/android/src/main/java/com/audiobrowser/util/CoilBitmapLoader.kt +8 -24
- package/android/src/main/java/com/audiobrowser/util/EqualizerManager.kt +7 -39
- package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +10 -14
- package/android/src/main/java/com/audiobrowser/util/MetadataAdapter.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/NetworkConnectivityMonitor.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/OutputMonitor.kt +21 -50
- package/android/src/main/java/com/audiobrowser/util/OutputSwitcher.kt +7 -20
- package/android/src/main/java/com/audiobrowser/util/PlayingStateFactory.kt +3 -5
- package/android/src/main/java/com/audiobrowser/util/RatingFavorites.kt +4 -5
- package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +5 -5
- package/android/src/main/java/com/audiobrowser/util/SvgArtworkRenderer.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/SystemVolumeMonitor.kt +6 -9
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +25 -47
- package/android/src/nocast/java/com/audiobrowser/cast/CastSupport.kt +0 -2
- package/android/src/test/java/com/audiobrowser/ForegroundStartTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/LegacyRatingTest.kt +3 -3
- package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +0 -13
- package/android/src/test/java/com/audiobrowser/ServiceTaskRemovedTest.kt +2 -3
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +5 -14
- package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerBuildApiRequestTest.kt +2 -8
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +2 -12
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +5 -28
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +11 -43
- package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +4 -13
- package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +2 -11
- package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +0 -2
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +3 -8
- package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +2 -14
- package/android/src/test/java/com/audiobrowser/browser/SimpleRouterTest.kt +1 -5
- package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +2 -13
- package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +1 -7
- package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +8 -16
- package/android/src/test/java/com/audiobrowser/model/IcyTitleTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/player/BrowseTilesTest.kt +12 -29
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +3 -12
- package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +0 -7
- package/android/src/test/java/com/audiobrowser/player/DynamicLoadControlTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/player/EqualizerControllerTest.kt +0 -9
- package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/player/MediaSessionSlotMappingTest.kt +0 -9
- package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +15 -22
- package/android/src/test/java/com/audiobrowser/player/PlaybackErrorClassifierTest.kt +1 -24
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +0 -20
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +1 -6
- package/android/src/test/java/com/audiobrowser/player/PlaybackTimerTest.kt +2 -4
- package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +2 -2
- package/android/src/test/java/com/audiobrowser/player/PlayerEngineFactoryTest.kt +0 -3
- package/android/src/test/java/com/audiobrowser/player/PlayerInvalidTrackTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +3 -2
- package/android/src/test/java/com/audiobrowser/player/PlayerSonosTest.kt +5 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +5 -7
- package/android/src/test/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicyTest.kt +4 -35
- package/android/src/test/java/com/audiobrowser/player/SessionErrorMaskTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +1 -8
- package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +4 -6
- package/android/src/test/java/com/audiobrowser/player/StuckRecoveryPolicyTest.kt +11 -11
- package/android/src/test/java/com/audiobrowser/player/TransformingDataSourceTest.kt +2 -23
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +9 -10
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/DeviceDescriptionParserTest.kt +1 -3
- package/android/src/test/java/com/audiobrowser/sonos/DidlLiteTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SoapClientTest.kt +0 -3
- package/android/src/test/java/com/audiobrowser/sonos/SoapEnvelopesTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SoapResponseParserTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosDiscovererTest.kt +2 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosPlayerTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosRemoteTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosRoutesTest.kt +2 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosTransportTest.kt +2 -6
- package/android/src/test/java/com/audiobrowser/sonos/SsdpMessagesTest.kt +0 -2
- package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +13 -37
- package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +10 -24
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +15 -39
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherTest.kt +4 -10
- package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +2 -11
- package/android/src/test/java/com/audiobrowser/util/ArtworkUrisTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +0 -4
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderHolderTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/util/FakeImageLoader.kt +2 -2
- package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +4 -12
- package/android/src/test/java/com/audiobrowser/util/OutputMonitorTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/PlayingStateFactoryTest.kt +0 -4
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryBrowseTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +4 -6
- package/android/src/testCast/java/com/audiobrowser/cast/CastEndsTest.kt +1 -1
- package/android/src/testCast/java/com/audiobrowser/cast/SendingMediaItemConverterTest.kt +1 -0
- package/ios/AVPlayerEngine.swift +13 -21
- package/ios/AVPlayerEngineCallbacks.swift +2 -4
- package/ios/Browser/BrowseGate.swift +7 -8
- package/ios/Browser/BrowserConfig.swift +19 -34
- package/ios/Browser/BrowserError.swift +0 -1
- package/ios/Browser/BrowserManager.swift +29 -75
- package/ios/Browser/BrowserPathHelper.swift +13 -93
- package/ios/Browser/FavoriteSet.swift +7 -10
- package/ios/Browser/InertStyleDiagnostic.swift +17 -82
- package/ios/Browser/JsonModels.swift +11 -51
- package/ios/Browser/NavigationErrorState.swift +3 -2
- package/ios/Browser/PageResolver.swift +13 -23
- package/ios/Browser/RequestLayer.swift +16 -20
- package/ios/Browser/RequestPipeline.swift +33 -43
- package/ios/Browser/SearchDrillIn.swift +7 -13
- package/ios/Browser/SectionScope.swift +14 -26
- package/ios/Browser/SimpleRouter.swift +8 -15
- package/ios/Browser/StyleResolver.swift +12 -29
- package/ios/Browser/TabBarEntries.swift +6 -11
- package/ios/Browser/TrackIdTemplate.swift +6 -14
- package/ios/CarPlay/CPInterfaceController+Safe.swift +19 -28
- package/ios/CarPlay/CarPlayArtworkResolver.swift +5 -9
- package/ios/CarPlay/CarPlayController.swift +4 -4
- package/ios/CarPlay/CarPlayImageLoader.swift +11 -26
- package/ios/CarPlay/CarPlayListItemFactory.swift +30 -80
- package/ios/CarPlay/CarPlayNowPlayingManager.swift +19 -54
- package/ios/CarPlay/CarPlaySession+Navigator.swift +10 -10
- package/ios/CarPlay/CarPlaySession+PageLoader.swift +6 -5
- package/ios/CarPlay/CarPlaySession+Refresher.swift +2 -2
- package/ios/CarPlay/CarPlaySession+TabBar.swift +19 -26
- package/ios/CarPlay/CarPlaySession.swift +13 -17
- package/ios/CarPlay/CarPlayTemplates.swift +6 -7
- package/ios/CarPlay/IntentHandlers.swift +3 -5
- package/ios/CarPlay/MediaIntentCriteria.swift +15 -29
- package/ios/CarPlay/MediaIntentHandler.swift +4 -7
- package/ios/CarPlay/MediaIntentPlayback.swift +9 -8
- package/ios/CarPlay/NowPlayingButtonRules.swift +3 -4
- package/ios/CarPlay/SectionPresentation.swift +18 -28
- package/ios/CarPlay/TopTemplateReplacer.swift +8 -9
- package/ios/Extension/Capability+RemoteCommand.swift +3 -3
- package/ios/Extension/ChapterMetadata+AVFoundation.swift +2 -5
- package/ios/Extension/CxxVectorConformances.swift +4 -16
- package/ios/Extension/NavigationError+Conversion.swift +4 -7
- package/ios/Extension/PlayerCapabilities+Favorite.swift +0 -1
- package/ios/Extension/RequestConfig+Copying.swift +2 -6
- package/ios/Extension/ResolvedTrack+Copying.swift +2 -8
- package/ios/Extension/SearchParams+Query.swift +4 -4
- package/ios/Extension/Section+Copying.swift +3 -6
- package/ios/Extension/String+IcyCharset.swift +5 -5
- package/ios/Extension/TimedMetadata+AVFoundation.swift +6 -12
- package/ios/Extension/Track+AVPlayer.swift +1 -2
- package/ios/Extension/Track+Copying.swift +2 -8
- package/ios/Extension/Track+Identity.swift +4 -9
- package/ios/Extension/TrackMetadata+AVFoundation.swift +10 -13
- package/ios/Extension/UIApplication+ActiveScene.swift +6 -14
- package/ios/Extension/Variant+Artwork.swift +8 -22
- package/ios/Http/HttpClient.swift +3 -3
- package/ios/HybridAudioBrowser+Browser.swift +10 -16
- package/ios/HybridAudioBrowser+Options.swift +6 -9
- package/ios/HybridAudioBrowser+Player.swift +8 -16
- package/ios/HybridAudioBrowser+PlayerCallbacks.swift +4 -5
- package/ios/HybridAudioBrowser+Stubs.swift +5 -7
- package/ios/HybridAudioBrowser.swift +54 -79
- package/ios/Model/NitroTypeStubs.swift +15 -22
- package/ios/Model/PlayerUpdateOptions.swift +6 -21
- package/ios/Model/RemoteCommand.swift +2 -2
- package/ios/Model/TrackPlayerError.swift +9 -22
- package/ios/NowPlayingInfo/NowPlayingInfoController.swift +21 -40
- package/ios/NowPlayingInfo/SilentAudioPrimer.swift +10 -16
- package/ios/Observer/ItemObserver.swift +7 -5
- package/ios/Observer/PlayerObserver.swift +5 -5
- package/ios/PlaybackEvent.swift +2 -2
- package/ios/Player/AirPlayStallJudgement.swift +7 -9
- package/ios/Player/AudioSessionController.swift +14 -15
- package/ios/Player/DeferredSeek.swift +2 -2
- package/ios/Player/EndOfTrackJudgement.swift +6 -13
- package/ios/Player/ErrorStatus.swift +8 -7
- package/ios/Player/MediaLoader.swift +20 -24
- package/ios/Player/NowPlayingLines.swift +1 -4
- package/ios/Player/NowPlayingUpdater.swift +35 -61
- package/ios/Player/PersistedPlaybackState.swift +1 -2
- package/ios/Player/PlaybackFailure.swift +20 -24
- package/ios/Player/PlaybackPersistence.swift +5 -6
- package/ios/Player/PlaybackStateMachine.swift +8 -11
- package/ios/Player/PlaybackTimer.swift +8 -11
- package/ios/Player/Player.swift +6 -13
- package/ios/Player/PlayerEngine.swift +20 -20
- package/ios/Player/PlayerStatusTypes.swift +1 -2
- package/ios/Player/QueueManager.swift +23 -67
- package/ios/Player/RetryLoop.swift +39 -50
- package/ios/Player/ShuffleOrder.swift +17 -57
- package/ios/Player/SleepTimerManager.swift +13 -28
- package/ios/Player/VolumeFader.swift +16 -16
- package/ios/RemoteCommand/RemoteCommandCallbacks.swift +6 -16
- package/ios/RemoteCommand/RemoteCommandController.swift +8 -10
- package/ios/Tests/AirPlayStallJudgementTests.swift +4 -4
- package/ios/Tests/BrowserPathHelperTests.swift +3 -6
- package/ios/Tests/DeferredSeekTests.swift +1 -3
- package/ios/Tests/EmitterTests.swift +0 -1
- package/ios/Tests/EndOfTrackJudgementTests.swift +1 -6
- package/ios/Tests/FavoriteSetTests.swift +1 -0
- package/ios/Tests/GenerationMemoTests.swift +2 -2
- package/ios/Tests/InertStyleDiagnosticTests.swift +4 -10
- package/ios/Tests/JsonModelsTests.swift +5 -12
- package/ios/Tests/LRUCacheTests.swift +1 -5
- package/ios/Tests/MediaIntentCriteriaTests.swift +2 -7
- package/ios/Tests/MediaLoaderTests.swift +3 -12
- package/ios/Tests/ObserverTests.swift +3 -3
- package/ios/Tests/PlaybackErrorTests.swift +7 -9
- package/ios/Tests/PlaybackFailureTests.swift +9 -17
- package/ios/Tests/PlaybackPersistenceTests.swift +1 -0
- package/ios/Tests/PlaybackStateMachineTests.swift +1 -16
- package/ios/Tests/PlaybackTimerTests.swift +2 -3
- package/ios/Tests/PlayerPolicyTests.swift +10 -26
- package/ios/Tests/PlayerTests.swift +53 -88
- package/ios/Tests/PlayingStateTests.swift +0 -1
- package/ios/Tests/QueueManagerTests.swift +30 -80
- package/ios/Tests/RemoteCommandControllerTests.swift +5 -13
- package/ios/Tests/ResolvedTrackCopyingTests.swift +0 -2
- package/ios/Tests/RetryLoopTests.swift +12 -35
- package/ios/Tests/SearchDrillInTests.swift +4 -5
- package/ios/Tests/SectionPresentationTests.swift +3 -16
- package/ios/Tests/SectionScopeTests.swift +3 -6
- package/ios/Tests/SimpleRouterTests.swift +1 -5
- package/ios/Tests/SleepTimerManagerTests.swift +8 -11
- package/ios/Tests/StyleResolverTests.swift +4 -13
- package/ios/Tests/Support/ManualSleepTimerScheduler.swift +3 -8
- package/ios/Tests/Support/TestTypes.swift +5 -15
- package/ios/Tests/TabBarEntriesTests.swift +0 -2
- package/ios/Tests/TimedMetadataAVFoundationTests.swift +2 -3
- package/ios/Tests/TopTemplateReplacerTests.swift +1 -1
- package/ios/Tests/TrackIdTemplateTests.swift +2 -6
- package/ios/Tests/TrackMetadataAVFoundationTests.swift +1 -4
- package/ios/Tests/TrackSelectorTests.swift +3 -15
- package/ios/TrackSelector.swift +13 -25
- package/ios/Util/ArtworkFreshness.swift +6 -6
- package/ios/Util/ArtworkImageFetcher.swift +19 -20
- package/ios/Util/ConcurrentMap.swift +2 -2
- package/ios/Util/Emitter.swift +8 -13
- package/ios/Util/NetworkMonitor.swift +4 -6
- package/ios/Util/OutputPicker.swift +1 -1
- package/ios/Util/ReadyValue.swift +3 -2
- package/ios/Util/SFSymbolRenderer.swift +17 -30
- package/ios/Util/SVGProcessor.swift +5 -9
- package/package.json +1 -1
|
@@ -10,16 +10,6 @@ import androidx.media3.exoplayer.upstream.Allocator
|
|
|
10
10
|
import androidx.media3.exoplayer.upstream.DefaultAllocator
|
|
11
11
|
import timber.log.Timber
|
|
12
12
|
|
|
13
|
-
/**
|
|
14
|
-
* Buffer configuration for DynamicLoadControl.
|
|
15
|
-
*
|
|
16
|
-
* @property minBufferMs Minimum duration of media that the player will attempt to buffer.
|
|
17
|
-
* @property maxBufferMs Maximum duration of media that the player will attempt to buffer.
|
|
18
|
-
* @property bufferForPlaybackMs Duration of media that must be buffered for playback to start.
|
|
19
|
-
* @property bufferForPlaybackAfterRebufferMs Duration of media that must be buffered for playback
|
|
20
|
-
* to resume after a rebuffer.
|
|
21
|
-
* @property backBufferMs Duration of media to keep in the buffer behind the current position.
|
|
22
|
-
*/
|
|
23
13
|
data class BufferConfig(
|
|
24
14
|
val minBufferMs: Int = DefaultLoadControl.DEFAULT_MIN_BUFFER_MS,
|
|
25
15
|
val maxBufferMs: Int = DefaultLoadControl.DEFAULT_MAX_BUFFER_MS,
|
|
@@ -30,34 +20,28 @@ data class BufferConfig(
|
|
|
30
20
|
)
|
|
31
21
|
|
|
32
22
|
/**
|
|
33
|
-
* A LoadControl
|
|
23
|
+
* A LoadControl whose buffer thresholds change during playback through [updateBufferConfig], which
|
|
24
|
+
* DefaultLoadControl fixes at construction.
|
|
34
25
|
*
|
|
35
|
-
*
|
|
36
|
-
*
|
|
37
|
-
* AutomaticBufferManager) to take effect immediately.
|
|
38
|
-
*
|
|
39
|
-
* Thread safety: LoadControl methods are called from ExoPlayer's internal playback thread, while
|
|
40
|
-
* [updateBufferConfig] is typically called from the main thread. The @Volatile annotation ensures
|
|
41
|
-
* visibility across threads.
|
|
26
|
+
* ExoPlayer calls the LoadControl methods on its playback thread; the other methods may run on any
|
|
27
|
+
* thread, so shared state is @Volatile.
|
|
42
28
|
*/
|
|
43
29
|
class DynamicLoadControl(initialConfig: BufferConfig = BufferConfig()) : LoadControl {
|
|
44
30
|
|
|
45
31
|
private val allocator = DefaultAllocator(true, C.DEFAULT_BUFFER_SEGMENT_SIZE)
|
|
46
32
|
|
|
47
|
-
// Track startup timing
|
|
48
33
|
@Volatile private var prepareStartTimeMs: Long = 0
|
|
49
34
|
@Volatile private var playbackStarted: Boolean = false
|
|
50
35
|
|
|
51
|
-
// ExoPlayer's own rebuffering signal (buffer depletion mid-playback, as opposed to an initial
|
|
52
|
-
// connect, a seek, or a track transition). Mirrored from LoadControl.Parameters so consumers
|
|
53
|
-
// (e.g. the now-playing "Buffering…" subtitle) can tell a rebuffer apart from an initial connect.
|
|
54
36
|
@Volatile private var rebuffering: Boolean = false
|
|
55
37
|
|
|
56
|
-
/**
|
|
38
|
+
/**
|
|
39
|
+
* Whether ExoPlayer reports a stall after playback had started, as opposed to an initial connect,
|
|
40
|
+
* a seek or a track change.
|
|
41
|
+
*/
|
|
57
42
|
val isRebuffering: Boolean
|
|
58
43
|
get() = rebuffering
|
|
59
44
|
|
|
60
|
-
// Mutable buffer thresholds - can be updated at runtime
|
|
61
45
|
@Volatile private var minBufferUs: Long = initialConfig.minBufferMs * 1000L
|
|
62
46
|
|
|
63
47
|
@Volatile private var maxBufferUs: Long = initialConfig.maxBufferMs * 1000L
|
|
@@ -72,14 +56,7 @@ class DynamicLoadControl(initialConfig: BufferConfig = BufferConfig()) : LoadCon
|
|
|
72
56
|
|
|
73
57
|
@Volatile private var currentConfig: BufferConfig = initialConfig
|
|
74
58
|
|
|
75
|
-
/**
|
|
76
|
-
* Updates the buffer configuration at runtime.
|
|
77
|
-
*
|
|
78
|
-
* The new configuration takes effect immediately for future buffering decisions. Already-buffered
|
|
79
|
-
* data is not affected.
|
|
80
|
-
*
|
|
81
|
-
* @param config The new buffer configuration to apply.
|
|
82
|
-
*/
|
|
59
|
+
/** Applies from the next buffering decision; media already buffered stays. */
|
|
83
60
|
fun updateBufferConfig(config: BufferConfig) {
|
|
84
61
|
if (config == currentConfig) return
|
|
85
62
|
|
|
@@ -99,16 +76,14 @@ class DynamicLoadControl(initialConfig: BufferConfig = BufferConfig()) : LoadCon
|
|
|
99
76
|
backBufferUs = config.backBufferMs * 1000L
|
|
100
77
|
}
|
|
101
78
|
|
|
102
|
-
/** Gets the current buffer configuration. */
|
|
103
79
|
fun getBufferConfig(): BufferConfig = currentConfig
|
|
104
80
|
|
|
105
|
-
/** Resets
|
|
81
|
+
/** Resets to media3's DefaultLoadControl defaults, not to the config this was built with. */
|
|
106
82
|
fun resetToDefaults() {
|
|
107
83
|
updateBufferConfig(BufferConfig())
|
|
108
84
|
}
|
|
109
85
|
|
|
110
|
-
//
|
|
111
|
-
// only ever attached to a single ExoPlayer, so we return the same allocator regardless of player.
|
|
86
|
+
// Each instance serves a single ExoPlayer, so the one allocator is returned for any playerId.
|
|
112
87
|
override fun getAllocator(playerId: PlayerId): Allocator = allocator
|
|
113
88
|
|
|
114
89
|
override fun getBackBufferDurationUs(): Long = backBufferUs
|
|
@@ -116,8 +91,8 @@ class DynamicLoadControl(initialConfig: BufferConfig = BufferConfig()) : LoadCon
|
|
|
116
91
|
override fun retainBackBufferFromKeyframe(): Boolean = false
|
|
117
92
|
|
|
118
93
|
override fun shouldContinueLoading(parameters: LoadControl.Parameters): Boolean {
|
|
119
|
-
//
|
|
120
|
-
//
|
|
94
|
+
// ExoPlayer polls this in every playback state, unlike shouldStartPlayback, so this is where
|
|
95
|
+
// the flag clears once a rebuffer recovers.
|
|
121
96
|
rebuffering = parameters.rebuffering
|
|
122
97
|
return parameters.bufferedDurationUs < maxBufferUs
|
|
123
98
|
}
|
|
@@ -165,15 +140,12 @@ class DynamicLoadControl(initialConfig: BufferConfig = BufferConfig()) : LoadCon
|
|
|
165
140
|
trackGroups: TrackGroupArray,
|
|
166
141
|
trackSelections: Array<out ExoTrackSelection?>,
|
|
167
142
|
) {
|
|
168
|
-
//
|
|
143
|
+
// No byte target from the selected tracks: loading is bounded by maxBufferUs alone.
|
|
169
144
|
}
|
|
170
145
|
|
|
171
|
-
override fun onStopped() {
|
|
172
|
-
// Required by LoadControl interface
|
|
173
|
-
}
|
|
146
|
+
override fun onStopped() {}
|
|
174
147
|
|
|
175
148
|
override fun onReleased() {
|
|
176
|
-
// Reset allocator when released
|
|
177
149
|
allocator.reset()
|
|
178
150
|
}
|
|
179
151
|
}
|
|
@@ -8,15 +8,15 @@ import androidx.media3.exoplayer.ExoPlayer
|
|
|
8
8
|
import androidx.media3.exoplayer.source.ShuffleOrder
|
|
9
9
|
|
|
10
10
|
/**
|
|
11
|
-
*
|
|
12
|
-
* the one it builds
|
|
11
|
+
* An engine's queue, position and playback settings, which [Player.setup] carries from the engine
|
|
12
|
+
* it releases to the one it builds so that new setup options don't interrupt playback.
|
|
13
13
|
*/
|
|
14
14
|
internal data class EnginePlayback(
|
|
15
15
|
val mediaItems: List<MediaItem>,
|
|
16
16
|
val index: Int,
|
|
17
17
|
/**
|
|
18
|
-
* [C.TIME_UNSET] for a live item,
|
|
19
|
-
* live item
|
|
18
|
+
* [C.TIME_UNSET] for a live item, so it resumes at the live edge, and for 0, which is also what a
|
|
19
|
+
* live item reports before it has loaded.
|
|
20
20
|
*/
|
|
21
21
|
val positionMs: Long,
|
|
22
22
|
val prepared: Boolean,
|
|
@@ -5,7 +5,6 @@ import com.audiobrowser.util.EqualizerManager
|
|
|
5
5
|
import com.margelo.nitro.audiobrowser.EqualizerSettings
|
|
6
6
|
import timber.log.Timber
|
|
7
7
|
|
|
8
|
-
/** The equalizer operations [EqualizerController] drives, so tests can stand in for the effect. */
|
|
9
8
|
internal interface EqualizerEffect {
|
|
10
9
|
val audioSessionId: Int
|
|
11
10
|
|
|
@@ -23,11 +22,10 @@ internal interface EqualizerEffect {
|
|
|
23
22
|
}
|
|
24
23
|
|
|
25
24
|
/**
|
|
26
|
-
*
|
|
27
|
-
*
|
|
28
|
-
*
|
|
29
|
-
*
|
|
30
|
-
* new effect announces itself through [onSettingsChanged].
|
|
25
|
+
* Keeps one equalizer effect on the player's current audio session. An effect binds to a single
|
|
26
|
+
* session, so there is none before the first audio output and a fresh one after a session change;
|
|
27
|
+
* settings asked for meanwhile apply to the next effect, and each new effect reports its settings
|
|
28
|
+
* through [onSettingsChanged].
|
|
31
29
|
*/
|
|
32
30
|
internal class EqualizerController(
|
|
33
31
|
private val onSettingsChanged: (EqualizerSettings) -> Unit,
|
|
@@ -36,14 +34,13 @@ internal class EqualizerController(
|
|
|
36
34
|
|
|
37
35
|
private var effect: EqualizerEffect? = null
|
|
38
36
|
|
|
39
|
-
//
|
|
40
|
-
//
|
|
41
|
-
// last one asked for wins, matching how the two setters behave on a live effect.
|
|
37
|
+
// For the next effect. A preset and custom levels exclude each other: the last one set wins, as
|
|
38
|
+
// on a live effect.
|
|
42
39
|
private var pendingPreset: String? = null
|
|
43
40
|
private var pendingLevels: DoubleArray? = null
|
|
44
41
|
private var pendingEnabled: Boolean? = null
|
|
45
42
|
|
|
46
|
-
/**
|
|
43
|
+
/** An unset session defers the effect to the first [onAudioSessionChanged]. */
|
|
47
44
|
fun initialize(audioSessionId: Int) {
|
|
48
45
|
if (audioSessionId == C.AUDIO_SESSION_ID_UNSET) {
|
|
49
46
|
Timber.d("Skipping equalizer init - no audio session yet, will init on first playback")
|
|
@@ -53,10 +50,9 @@ internal class EqualizerController(
|
|
|
53
50
|
}
|
|
54
51
|
|
|
55
52
|
/**
|
|
56
|
-
*
|
|
57
|
-
*
|
|
58
|
-
*
|
|
59
|
-
* session 0 would equalize the whole device's output instead.
|
|
53
|
+
* Moves the settings to a fresh effect on [newAudioSessionId]; the same session is a no-op. An
|
|
54
|
+
* unset session (playback on a remote output) keeps the effect on the local session, which it
|
|
55
|
+
* equalizes again on the way back: an effect on session 0 would equalize the whole device.
|
|
60
56
|
*/
|
|
61
57
|
fun onAudioSessionChanged(newAudioSessionId: Int) {
|
|
62
58
|
if (newAudioSessionId == C.AUDIO_SESSION_ID_UNSET) return
|
|
@@ -76,6 +72,7 @@ internal class EqualizerController(
|
|
|
76
72
|
effect = null
|
|
77
73
|
}
|
|
78
74
|
|
|
75
|
+
/** Null while there is no effect, even when settings are pending. */
|
|
79
76
|
fun getSettings(): EqualizerSettings? = effect?.getSettings()
|
|
80
77
|
|
|
81
78
|
fun setEnabled(enabled: Boolean) {
|
|
@@ -105,17 +102,13 @@ internal class EqualizerController(
|
|
|
105
102
|
effect.setLevels(levels)
|
|
106
103
|
}
|
|
107
104
|
|
|
108
|
-
/**
|
|
109
|
-
* Creates the effect for [audioSessionId] and hands it the pending settings before wiring the
|
|
110
|
-
* callback, so the restore stays silent and the caller gets one event describing the result. A
|
|
111
|
-
* failed create keeps the pending settings for the next attempt.
|
|
112
|
-
*/
|
|
113
105
|
private fun install(audioSessionId: Int) {
|
|
114
106
|
val created =
|
|
115
107
|
try {
|
|
116
108
|
createEffect(audioSessionId)
|
|
117
109
|
} catch (e: Exception) {
|
|
118
110
|
Timber.e(e, "Failed to initialize equalizer")
|
|
111
|
+
// The pending settings stay for the next attempt.
|
|
119
112
|
return
|
|
120
113
|
}
|
|
121
114
|
effect = created
|
|
@@ -128,9 +121,10 @@ internal class EqualizerController(
|
|
|
128
121
|
pendingLevels = null
|
|
129
122
|
pendingEnabled = null
|
|
130
123
|
|
|
124
|
+
// Wired after the restore, so its intermediate steps never reach the caller.
|
|
131
125
|
created.setOnSettingsChanged(onSettingsChanged)
|
|
132
|
-
//
|
|
133
|
-
//
|
|
126
|
+
// Always announced: the caller reads the settings once at startup, often before any effect
|
|
127
|
+
// exists, and nothing else tells it one does now.
|
|
134
128
|
created.getSettings()?.let(onSettingsChanged)
|
|
135
129
|
}
|
|
136
130
|
|
|
@@ -9,10 +9,9 @@ import com.margelo.nitro.audiobrowser.RemoteJumpForwardEvent
|
|
|
9
9
|
import com.margelo.nitro.audiobrowser.RemoteSeekEvent
|
|
10
10
|
|
|
11
11
|
/**
|
|
12
|
-
*
|
|
13
|
-
*
|
|
14
|
-
*
|
|
15
|
-
* "nothing playing" and tears down the now-playing screen, losing the next/previous buttons.
|
|
12
|
+
* With `keepAlive`, a terminal error (idle with an error) reads as paused and ready to the platform
|
|
13
|
+
* session rather than STATE_NONE, which Android Auto takes for "nothing playing": it closes the
|
|
14
|
+
* now-playing screen and its next/previous buttons with it.
|
|
16
15
|
*/
|
|
17
16
|
internal object SessionErrorMask {
|
|
18
17
|
fun playbackState(state: Int, hasError: Boolean, keepAlive: Boolean): Int =
|
|
@@ -23,12 +22,10 @@ internal object SessionErrorMask {
|
|
|
23
22
|
}
|
|
24
23
|
|
|
25
24
|
/**
|
|
26
|
-
* The
|
|
27
|
-
* screen, notification, Bluetooth, Android Auto
|
|
28
|
-
*
|
|
29
|
-
*
|
|
30
|
-
* platform session (see [SessionErrorMask]) so the session stays alive and skippable; the error
|
|
31
|
-
* still surfaces via `onPlaybackError` and `playbackState`.
|
|
25
|
+
* The player the MediaSession sees. Offers each transport command from an external surface (lock
|
|
26
|
+
* screen, notification, Bluetooth, Android Auto) to the app's `handleRemote*` callback first: true
|
|
27
|
+
* consumes it, anything else runs the default. Masks a terminal error from the session (see
|
|
28
|
+
* [SessionErrorMask]); the error still reaches JS through `onPlaybackError` and `playbackState`.
|
|
32
29
|
*/
|
|
33
30
|
internal class InterceptingPlayer(
|
|
34
31
|
player: MediaPlayer,
|
|
@@ -37,14 +34,11 @@ internal class InterceptingPlayer(
|
|
|
37
34
|
private val keepSessionAliveOnError: Boolean,
|
|
38
35
|
) : ForwardingPlayer(player) {
|
|
39
36
|
|
|
40
|
-
//
|
|
41
|
-
//
|
|
42
|
-
// as a disruptive error. The error still surfaces via the onPlaybackError JS callback and
|
|
43
|
-
// `playbackState`, so a now-playing formatter can render it; playback context is preserved.
|
|
37
|
+
// Media3 maps a player error to the legacy STATE_ERROR, which Android Auto and the notification
|
|
38
|
+
// show as a disruptive error. Hidden whatever keepSessionAliveOnError says.
|
|
44
39
|
override fun getPlayerError(): androidx.media3.common.PlaybackException? = null
|
|
45
40
|
|
|
46
|
-
//
|
|
47
|
-
// state-change listeners.
|
|
41
|
+
// The masks read super's error: this player's getPlayerError() is always null.
|
|
48
42
|
override fun getPlaybackState(): Int =
|
|
49
43
|
SessionErrorMask.playbackState(
|
|
50
44
|
super.getPlaybackState(),
|
|
@@ -60,24 +54,14 @@ internal class InterceptingPlayer(
|
|
|
60
54
|
keepAlive = keepSessionAliveOnError,
|
|
61
55
|
)
|
|
62
56
|
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
* super.seekToNext()) then flip playWhenReady or move the queue index but never restart a stopped
|
|
66
|
-
* player. prepare() recovers it (and early-returns when not idle, so it's a no-op during normal
|
|
67
|
-
* playback) — so next/previous/play resume on the selected station from the masked error state
|
|
68
|
-
* instead of doing nothing.
|
|
69
|
-
*/
|
|
57
|
+
// After a terminal error the player is idle, and the default play/skip only move playWhenReady or
|
|
58
|
+
// the index; prepare() restarts it. prepare() is a no-op unless idle.
|
|
70
59
|
private fun recoverFromErrorIfNeeded() {
|
|
71
60
|
if (keepSessionAliveOnError && super.getPlayerError() != null) {
|
|
72
|
-
// Through the forwarding chain (no override exists), reaching the wrapped player.
|
|
73
61
|
prepare()
|
|
74
62
|
}
|
|
75
63
|
}
|
|
76
64
|
|
|
77
|
-
/**
|
|
78
|
-
* One definition of the dispatch: offer the command to the app's handler; true consumes it,
|
|
79
|
-
* anything else runs the default (and, for the resuming commands, the idle-error recovery).
|
|
80
|
-
*/
|
|
81
65
|
private inline fun intercept(
|
|
82
66
|
handler: (Callbacks) -> Boolean,
|
|
83
67
|
recover: Boolean = false,
|
|
@@ -92,9 +76,8 @@ internal class InterceptingPlayer(
|
|
|
92
76
|
|
|
93
77
|
override fun pause() = intercept({ it.handleRemotePause() }) { super.pause() }
|
|
94
78
|
|
|
95
|
-
// Media3 controllers
|
|
96
|
-
//
|
|
97
|
-
// remote handlers and the idle-error recovery aren't bypassed.
|
|
79
|
+
// Media3 controllers can send play/pause as setPlayWhenReady, which would bypass the handlers and
|
|
80
|
+
// the recovery.
|
|
98
81
|
override fun setPlayWhenReady(playWhenReady: Boolean) = if (playWhenReady) play() else pause()
|
|
99
82
|
|
|
100
83
|
override fun stop() = intercept({ it.handleRemoteStop() }) { super.stop() }
|
|
@@ -4,8 +4,8 @@ import androidx.media3.exoplayer.ExoPlayer
|
|
|
4
4
|
import androidx.media3.exoplayer.source.ShuffleOrder
|
|
5
5
|
|
|
6
6
|
/**
|
|
7
|
-
* The phone's
|
|
8
|
-
* remote output plays,
|
|
7
|
+
* The phone's ExoPlayer, for the work only it does: retries, reconnects and its shuffle order.
|
|
8
|
+
* While a remote output plays, each call does nothing.
|
|
9
9
|
*/
|
|
10
10
|
internal class LocalEngine(
|
|
11
11
|
private val engine: () -> ExoPlayer,
|
|
@@ -14,11 +14,11 @@ internal class LocalEngine(
|
|
|
14
14
|
private val playing: ExoPlayer?
|
|
15
15
|
get() = engine().takeIf { !isRemote() }
|
|
16
16
|
|
|
17
|
-
/** Whether the
|
|
17
|
+
/** Whether the phone's ExoPlayer is what plays, rather than a remote output. */
|
|
18
18
|
val isActive: Boolean
|
|
19
19
|
get() = playing != null
|
|
20
20
|
|
|
21
|
-
/**
|
|
21
|
+
/** Prepares again what failed or stalled, from the live edge when [toLiveEdge]. */
|
|
22
22
|
fun retry(toLiveEdge: Boolean = false) {
|
|
23
23
|
val engine = playing ?: return
|
|
24
24
|
if (toLiveEdge) engine.seekToDefaultPosition()
|
|
@@ -26,8 +26,8 @@ internal class LocalEngine(
|
|
|
26
26
|
}
|
|
27
27
|
|
|
28
28
|
/**
|
|
29
|
-
* Reconnects
|
|
30
|
-
*
|
|
29
|
+
* Reconnects at the live edge: a stream with a live window seeks there; anything else connects
|
|
30
|
+
* again, which for a stream that can't seek is the edge. False while remote.
|
|
31
31
|
*/
|
|
32
32
|
fun reconnectAtLiveEdge(): Boolean {
|
|
33
33
|
val engine = playing ?: return false
|
|
@@ -35,8 +35,8 @@ internal class LocalEngine(
|
|
|
35
35
|
engine.seekToDefaultPosition()
|
|
36
36
|
return true
|
|
37
37
|
}
|
|
38
|
-
//
|
|
39
|
-
// Player.stop
|
|
38
|
+
// prepare() only re-prepares from STATE_IDLE, hence ExoPlayer's own stop(), not
|
|
39
|
+
// [Player.stop], which drops the play intent this reconnect keeps.
|
|
40
40
|
engine.stop()
|
|
41
41
|
engine.seekToDefaultPosition()
|
|
42
42
|
engine.prepare()
|
|
@@ -37,10 +37,10 @@ class MediaFactory(
|
|
|
37
37
|
private const val DEFAULT_USER_AGENT = "react-native-audio-browser"
|
|
38
38
|
|
|
39
39
|
/**
|
|
40
|
-
* The client media requests go out on
|
|
40
|
+
* The client media requests go out on, one per process so connections are reused. Not
|
|
41
41
|
* `HttpClient`'s browse client, whose read timeout is sized for JSON and would cut a long media
|
|
42
|
-
* read short. The timeouts are media3's own defaults,
|
|
43
|
-
* [RetryLoadErrorHandlingPolicy]
|
|
42
|
+
* read short. The timeouts are media3's own defaults, which stall detection and
|
|
43
|
+
* [RetryLoadErrorHandlingPolicy] are tuned to.
|
|
44
44
|
*/
|
|
45
45
|
private val mediaHttpClient: OkHttpClient by lazy {
|
|
46
46
|
OkHttpClient.Builder()
|
|
@@ -51,12 +51,8 @@ class MediaFactory(
|
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
|
|
54
|
-
private val extractorsFactory =
|
|
55
|
-
DefaultExtractorsFactory()
|
|
56
|
-
// TODO: reconsider whether this should be enabled by default:
|
|
57
|
-
.setConstantBitrateSeekingEnabled(true)
|
|
54
|
+
private val extractorsFactory = DefaultExtractorsFactory().setConstantBitrateSeekingEnabled(true)
|
|
58
55
|
|
|
59
|
-
// Store reference to custom retry policy so we can reset it on track changes
|
|
60
56
|
private val customRetryPolicy: RetryLoadErrorHandlingPolicy? =
|
|
61
57
|
when (retryPolicy) {
|
|
62
58
|
is RetryPolicy.Default -> null
|
|
@@ -87,7 +83,7 @@ class MediaFactory(
|
|
|
87
83
|
customRetryPolicy?.let { setLoadErrorHandlingPolicy(it) }
|
|
88
84
|
}
|
|
89
85
|
|
|
90
|
-
/**
|
|
86
|
+
/** Restarts the retry policy's time budget; call when the track changes. */
|
|
91
87
|
fun resetRetryTimer() {
|
|
92
88
|
customRetryPolicy?.reset()
|
|
93
89
|
}
|
|
@@ -109,34 +105,28 @@ class MediaFactory(
|
|
|
109
105
|
}
|
|
110
106
|
|
|
111
107
|
override fun createMediaSource(mediaItem: MediaItem): MediaSource {
|
|
112
|
-
// URL
|
|
113
|
-
//
|
|
114
|
-
//
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
//
|
|
118
|
-
//
|
|
119
|
-
// an Authorization header to whatever host the first one named. OkHttp drops
|
|
120
|
-
// that one header itself, and [CrossOriginHeaderStripper] drops the rest.
|
|
108
|
+
// The URL is resolved in TransformingDataSource.open(), on ExoPlayer's IO thread, not here:
|
|
109
|
+
// the request config callback needs the JS thread, which a synchronous Nitro call (seekTo)
|
|
110
|
+
// can be blocking while it waits on the player, a deadlock.
|
|
111
|
+
|
|
112
|
+
// OkHttp rather than DefaultHttpDataSource, for redirects: DefaultHttpDataSource re-applies the
|
|
113
|
+
// request headers on every hop, handing an Authorization header to whatever host the first one
|
|
114
|
+
// names. OkHttp drops that header itself, and [CrossOriginHeaderStripper] drops the rest.
|
|
121
115
|
val httpFactory =
|
|
122
116
|
OkHttpDataSource.Factory(mediaHttpClient).apply {
|
|
123
|
-
//
|
|
124
|
-
//
|
|
125
|
-
//
|
|
126
|
-
//
|
|
127
|
-
// override win.
|
|
117
|
+
// Not setUserAgent(): it is applied last with addHeader(), which appends, so a request
|
|
118
|
+
// already carrying one would send two. As a default request property it is merged under
|
|
119
|
+
// dataSpec.httpRequestHeaders and applied with header(), so TransformingDataSource's
|
|
120
|
+
// per-request override wins.
|
|
128
121
|
setDefaultRequestProperties(mapOf("User-Agent" to DEFAULT_USER_AGENT))
|
|
129
|
-
// Connect transfer listener for bandwidth measurement
|
|
130
122
|
transferListener?.let { setTransferListener(it) }
|
|
131
123
|
}
|
|
132
124
|
val baseFactory: DataSource.Factory = DefaultDataSource.Factory(context, httpFactory)
|
|
133
125
|
|
|
134
|
-
// Wrap with TransformingDataSource to resolve URLs on the IO thread
|
|
135
126
|
val track = TrackFactory.fromMedia3(mediaItem)
|
|
136
127
|
val transformingFactory =
|
|
137
128
|
TransformingDataSource.Factory(baseFactory) { url -> getRequestConfig(url, track) }
|
|
138
129
|
|
|
139
|
-
// Configure data source factory with optional caching
|
|
140
130
|
val dataSourceFactory =
|
|
141
131
|
cache?.let {
|
|
142
132
|
CacheDataSource.Factory()
|
|
@@ -145,7 +135,6 @@ class MediaFactory(
|
|
|
145
135
|
.setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
|
|
146
136
|
} ?: transformingFactory
|
|
147
137
|
|
|
148
|
-
// Use DefaultMediaSourceFactory which supports HLS, DASH, and progressive media
|
|
149
138
|
return mediaFactory.setDataSourceFactory(dataSourceFactory).createMediaSource(mediaItem)
|
|
150
139
|
}
|
|
151
140
|
}
|