react-native-audio-browser 0.2.0-next.52 → 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 +35 -49
- 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 +16 -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 +26 -4
- 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 +15 -11
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +112 -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
|
@@ -35,7 +35,7 @@ class PlaybackTimerTest {
|
|
|
35
35
|
var callCount = 0
|
|
36
36
|
val timer = playingTimer { callCount++ }
|
|
37
37
|
|
|
38
|
-
timer.setInterval(0.1)
|
|
38
|
+
timer.setInterval(0.1)
|
|
39
39
|
|
|
40
40
|
advanceTimeBy(500)
|
|
41
41
|
assertEquals(0, callCount)
|
|
@@ -81,7 +81,7 @@ class PlaybackTimerTest {
|
|
|
81
81
|
assertTrue("Expected events while running, got $callCount", callCount > 0)
|
|
82
82
|
|
|
83
83
|
val before = callCount
|
|
84
|
-
timer.setInterval(0.2)
|
|
84
|
+
timer.setInterval(0.2)
|
|
85
85
|
advanceTimeBy(500)
|
|
86
86
|
assertTrue("Expected more events after interval change", callCount > before)
|
|
87
87
|
|
|
@@ -107,7 +107,6 @@ class PlaybackTimerTest {
|
|
|
107
107
|
|
|
108
108
|
@Test
|
|
109
109
|
fun `isActive predicate gates which states run`() = runTest {
|
|
110
|
-
// playing-only timer must NOT tick while buffering...
|
|
111
110
|
var playingOnly = 0
|
|
112
111
|
val strict = playingTimer { playingOnly++ }
|
|
113
112
|
strict.setInterval(0.1)
|
|
@@ -116,7 +115,6 @@ class PlaybackTimerTest {
|
|
|
116
115
|
assertEquals(0, playingOnly)
|
|
117
116
|
strict.setInterval(null)
|
|
118
117
|
|
|
119
|
-
// ...while a progress-style predicate that includes buffering does.
|
|
120
118
|
var progress = 0
|
|
121
119
|
val lenient =
|
|
122
120
|
PlaybackTimer(
|
|
@@ -15,6 +15,7 @@ import java.time.Duration
|
|
|
15
15
|
import org.junit.After
|
|
16
16
|
import org.junit.Assert.assertEquals
|
|
17
17
|
import org.junit.Assert.assertFalse
|
|
18
|
+
import org.junit.Assert.assertNotEquals
|
|
18
19
|
import org.junit.Assert.assertTrue
|
|
19
20
|
import org.junit.Assert.fail
|
|
20
21
|
import org.junit.Before
|
|
@@ -27,7 +28,6 @@ import org.robolectric.RuntimeEnvironment
|
|
|
27
28
|
import org.robolectric.Shadows.shadowOf
|
|
28
29
|
import org.robolectric.annotation.Config
|
|
29
30
|
|
|
30
|
-
/** What the player leaves to a remote receiver while one plays: the local-only work steps aside. */
|
|
31
31
|
@RunWith(RobolectricTestRunner::class)
|
|
32
32
|
@Config(sdk = [28])
|
|
33
33
|
class PlayerCastTest {
|
|
@@ -85,6 +85,19 @@ class PlayerCastTest {
|
|
|
85
85
|
assertEquals(MediaPlayer.STATE_IDLE, player.exoPlayer.playbackState)
|
|
86
86
|
}
|
|
87
87
|
|
|
88
|
+
@Test
|
|
89
|
+
fun `stopping a cast after the receiver failed plays on the phone`() {
|
|
90
|
+
remote.fail()
|
|
91
|
+
idle()
|
|
92
|
+
assertEquals(PlaybackState.ERROR, player.playbackState)
|
|
93
|
+
|
|
94
|
+
remote.endSession()
|
|
95
|
+
|
|
96
|
+
idleUntil("the phone playing") { player.exoPlayer.playbackState != MediaPlayer.STATE_IDLE }
|
|
97
|
+
assertTrue(player.exoPlayer.playWhenReady)
|
|
98
|
+
assertNotEquals(PlaybackState.ERROR, player.playbackState)
|
|
99
|
+
}
|
|
100
|
+
|
|
88
101
|
@Test
|
|
89
102
|
fun `a new queue while remote plays its start item on the receiver`() {
|
|
90
103
|
player.setQueue(
|
|
@@ -116,6 +129,7 @@ class PlayerCastTest {
|
|
|
116
129
|
shadowOf(looper).idleFor(Duration.ofSeconds(3))
|
|
117
130
|
|
|
118
131
|
assertFalse(receiver.playWhenReady)
|
|
132
|
+
// The receiver's starting volume: the fade never touched it.
|
|
119
133
|
assertEquals(10, receiver.volume)
|
|
120
134
|
}
|
|
121
135
|
|
|
@@ -124,11 +138,11 @@ class PlayerCastTest {
|
|
|
124
138
|
|
|
125
139
|
private fun idle() = shadowOf(looper).idle()
|
|
126
140
|
|
|
127
|
-
/** Casting starts after a resolution on a background thread. */
|
|
128
141
|
private fun idleUntil(what: String, condition: () -> Boolean) {
|
|
129
142
|
repeat(200) {
|
|
130
143
|
idle()
|
|
131
144
|
if (condition()) return
|
|
145
|
+
// Casting starts after a resolution on a background thread.
|
|
132
146
|
Thread.sleep(10)
|
|
133
147
|
}
|
|
134
148
|
fail("never $what")
|
|
@@ -4,7 +4,6 @@ import com.audiobrowser.model.PlayerSetupOptions
|
|
|
4
4
|
import org.junit.Assert.assertEquals
|
|
5
5
|
import org.junit.Test
|
|
6
6
|
|
|
7
|
-
/** Pins the buffer-config mapping — the one decision inside engine construction. */
|
|
8
7
|
class PlayerEngineFactoryTest {
|
|
9
8
|
|
|
10
9
|
@Test
|
|
@@ -28,8 +27,6 @@ class PlayerEngineFactoryTest {
|
|
|
28
27
|
|
|
29
28
|
@Test
|
|
30
29
|
fun `automatic rebuffer falls back to playBuffer`() {
|
|
31
|
-
// rebufferBuffer unset = automatic: start post-rebuffer playback at playBuffer and let
|
|
32
|
-
// AutomaticBufferManager adjust from there.
|
|
33
30
|
val config = bufferConfig(PlayerSetupOptions(playBuffer = 1500.0, rebufferBuffer = null))
|
|
34
31
|
assertEquals(1500, config.bufferForPlaybackAfterRebufferMs)
|
|
35
32
|
}
|
|
@@ -11,7 +11,6 @@ import org.junit.runner.RunWith
|
|
|
11
11
|
import org.robolectric.RobolectricTestRunner
|
|
12
12
|
import org.robolectric.RuntimeEnvironment
|
|
13
13
|
|
|
14
|
-
// Robolectric: Player builds a real ExoPlayer, which needs the framework and a main looper.
|
|
15
14
|
@RunWith(RobolectricTestRunner::class)
|
|
16
15
|
class PlayerInvalidTrackTest {
|
|
17
16
|
|
|
@@ -18,7 +18,6 @@ import org.mockito.Mockito.mockingDetails
|
|
|
18
18
|
import org.robolectric.RobolectricTestRunner
|
|
19
19
|
import org.robolectric.RuntimeEnvironment
|
|
20
20
|
|
|
21
|
-
// Robolectric: Player builds a real ExoPlayer, which needs the framework and a main looper.
|
|
22
21
|
@RunWith(RobolectricTestRunner::class)
|
|
23
22
|
class PlayerSetupTest {
|
|
24
23
|
|
|
@@ -26,13 +25,14 @@ class PlayerSetupTest {
|
|
|
26
25
|
|
|
27
26
|
@After fun release() = player.exoPlayer.release()
|
|
28
27
|
|
|
29
|
-
/** Service.onCreate and AudioBrowser.onServiceConnected set up with the same options. */
|
|
30
28
|
@Test
|
|
31
29
|
fun setupWithTheSameOptionsKeepsTheEngine() {
|
|
32
30
|
player.setup(PlayerSetupOptions())
|
|
33
31
|
val engine = player.exoPlayer
|
|
34
32
|
|
|
33
|
+
// The service and the module each set up with the same options.
|
|
35
34
|
player.setup(PlayerSetupOptions())
|
|
35
|
+
// An option the engine is not built from.
|
|
36
36
|
player.setup(PlayerSetupOptions(autoUpdateNowPlayingMetadata = false))
|
|
37
37
|
|
|
38
38
|
assertSame(engine, player.exoPlayer)
|
|
@@ -65,6 +65,7 @@ class PlayerSetupTest {
|
|
|
65
65
|
assertTrue(rebuilt.playbackState != MediaPlayer.STATE_IDLE)
|
|
66
66
|
assertTrue(rebuilt.playWhenReady)
|
|
67
67
|
assertTrue(player.playWhenReadyCache)
|
|
68
|
+
// The new engine buffers again from the kept position.
|
|
68
69
|
assertEquals(PlaybackState.BUFFERING, player.playbackState)
|
|
69
70
|
assertEquals(
|
|
70
71
|
emptyList<String>(),
|
|
@@ -12,12 +12,14 @@ import com.audiobrowser.sonos.SonosPosition
|
|
|
12
12
|
import com.audiobrowser.sonos.SonosRemote
|
|
13
13
|
import com.audiobrowser.sonos.SonosRoom
|
|
14
14
|
import com.audiobrowser.util.TrackFactory
|
|
15
|
+
import com.margelo.nitro.audiobrowser.PlaybackState
|
|
15
16
|
import com.margelo.nitro.audiobrowser.RemoteOutputsOptions
|
|
16
17
|
import com.margelo.nitro.audiobrowser.TimedMetadata
|
|
17
18
|
import java.time.Duration
|
|
18
19
|
import java.util.concurrent.CopyOnWriteArrayList
|
|
19
20
|
import org.junit.After
|
|
20
21
|
import org.junit.Assert.assertEquals
|
|
22
|
+
import org.junit.Assert.assertNotEquals
|
|
21
23
|
import org.junit.Assert.fail
|
|
22
24
|
import org.junit.Before
|
|
23
25
|
import org.junit.Test
|
|
@@ -45,9 +47,12 @@ class PlayerSonosTest {
|
|
|
45
47
|
artworkUri: String?,
|
|
46
48
|
live: Boolean,
|
|
47
49
|
) {
|
|
50
|
+
check(!refuses) { "refused" }
|
|
48
51
|
calls += "setUri $streamUrl"
|
|
49
52
|
}
|
|
50
53
|
|
|
54
|
+
@Volatile var refuses = false
|
|
55
|
+
|
|
51
56
|
override fun play() {
|
|
52
57
|
calls += "play"
|
|
53
58
|
}
|
|
@@ -125,9 +130,23 @@ class PlayerSonosTest {
|
|
|
125
130
|
|
|
126
131
|
player.playWhenReady = true
|
|
127
132
|
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
133
|
+
// Past the switch's 30 s start timeout.
|
|
134
|
+
idleUntil("the start timed out", steps = 500) { player.playbackState == PlaybackState.ERROR }
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
@Test
|
|
138
|
+
fun `unselecting a room that refused the item plays on the phone`() {
|
|
139
|
+
room.refuses = true
|
|
140
|
+
player.sessionPlayer.setMediaItem(
|
|
141
|
+
TrackFactory.toMedia3(TestFixtures.track(title = "b", src = "https://s/b.mp3"))
|
|
142
|
+
)
|
|
143
|
+
idleUntil("the refusal") { player.playbackState == PlaybackState.ERROR }
|
|
144
|
+
|
|
145
|
+
SonosOutputs.unselect(ROOM)
|
|
146
|
+
|
|
147
|
+
idleUntil("the phone playing") { player.exoPlayer.playbackState != MediaPlayer.STATE_IDLE }
|
|
148
|
+
assertEquals(true, player.exoPlayer.playWhenReady)
|
|
149
|
+
assertNotEquals(PlaybackState.ERROR, player.playbackState)
|
|
131
150
|
}
|
|
132
151
|
|
|
133
152
|
@Test
|
|
@@ -183,7 +202,10 @@ class PlayerSonosTest {
|
|
|
183
202
|
.filter { it.method.name == "onTimedMetadata" }
|
|
184
203
|
.map { it.arguments[0] as TimedMetadata }
|
|
185
204
|
|
|
186
|
-
/**
|
|
205
|
+
/**
|
|
206
|
+
* Advances the main looper 100 ms a step, and sleeps so the background thread the speaker's
|
|
207
|
+
* commands run on can catch up; the speaker is polled every two seconds.
|
|
208
|
+
*/
|
|
187
209
|
private fun idleUntil(what: String, steps: Int = 300, condition: () -> Boolean) {
|
|
188
210
|
repeat(steps) {
|
|
189
211
|
shadowOf(looper).idleFor(Duration.ofMillis(100))
|
|
@@ -35,11 +35,10 @@ import org.robolectric.RuntimeEnvironment
|
|
|
35
35
|
import org.robolectric.Shadows.shadowOf
|
|
36
36
|
import org.robolectric.annotation.Config
|
|
37
37
|
|
|
38
|
-
// Robolectric
|
|
39
|
-
//
|
|
40
|
-
//
|
|
41
|
-
//
|
|
42
|
-
// which Robolectric 4.11 answers with null.
|
|
38
|
+
// Robolectric's clock stands still, so a delayed message on ExoPlayer's playback thread never
|
|
39
|
+
// runs: the audio track is disabled because an audio renderer can wait in BUFFERING on one.
|
|
40
|
+
// SDK 28: from 33, media3 asks AudioManager.getAudioDevicesForAttributes, which Robolectric 4.11
|
|
41
|
+
// answers with null.
|
|
43
42
|
@RunWith(RobolectricTestRunner::class)
|
|
44
43
|
@Config(sdk = [28])
|
|
45
44
|
class PlayerSuppressionTest {
|
|
@@ -120,7 +119,7 @@ class PlayerSuppressionTest {
|
|
|
120
119
|
fun `toggling during a transient focus loss keeps the intent`() {
|
|
121
120
|
focus(AudioManager.AUDIOFOCUS_LOSS_TRANSIENT)
|
|
122
121
|
|
|
123
|
-
// As during a call: a request for focus
|
|
122
|
+
// As during a call: a request for focus is refused.
|
|
124
123
|
audioManager.setNextFocusRequestResponse(AudioManager.AUDIOFOCUS_REQUEST_FAILED)
|
|
125
124
|
|
|
126
125
|
player.togglePlayback()
|
|
@@ -144,7 +143,6 @@ class PlayerSuppressionTest {
|
|
|
144
143
|
assertEquals(PlayingState(false, false), player.getPlayingState())
|
|
145
144
|
}
|
|
146
145
|
|
|
147
|
-
/** Delivers [change] and waits for ExoPlayer's playback thread to report the suppression. */
|
|
148
146
|
private fun focus(change: Int) {
|
|
149
147
|
audioManager.lastAudioFocusRequest.listener.onAudioFocusChange(change)
|
|
150
148
|
val suppressed = change == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT
|
|
@@ -21,16 +21,14 @@ import org.junit.Test
|
|
|
21
21
|
import org.mockito.Mockito.mock
|
|
22
22
|
|
|
23
23
|
class RetryLoadErrorHandlingPolicyTest {
|
|
24
|
-
// LoadEventInfo
|
|
25
|
-
//
|
|
26
|
-
// LoadErrorInfo.exception and LoadErrorInfo.errorCount.
|
|
24
|
+
// LoadEventInfo needs an Android Uri to construct; the policy reads only the exception and the
|
|
25
|
+
// error count.
|
|
27
26
|
private val loadEventInfo = mock(LoadEventInfo::class.java)
|
|
28
27
|
private val mediaLoadData = MediaLoadData(C.DATA_TYPE_MEDIA)
|
|
29
28
|
|
|
30
29
|
private fun errorInfo(exception: IOException, errorCount: Int = 1) =
|
|
31
30
|
LoadErrorHandlingPolicy.LoadErrorInfo(loadEventInfo, mediaLoadData, exception, errorCount)
|
|
32
31
|
|
|
33
|
-
/** Builds an [HttpDataSource.InvalidResponseCodeException] for the given HTTP status code. */
|
|
34
32
|
private fun httpError(responseCode: Int): HttpDataSource.InvalidResponseCodeException =
|
|
35
33
|
HttpDataSource.InvalidResponseCodeException(
|
|
36
34
|
responseCode,
|
|
@@ -41,10 +39,6 @@ class RetryLoadErrorHandlingPolicyTest {
|
|
|
41
39
|
ByteArray(0),
|
|
42
40
|
)
|
|
43
41
|
|
|
44
|
-
/**
|
|
45
|
-
* Asserts the given error is classified non-recoverable: the default policy gives up (no retry is
|
|
46
|
-
* scheduled) and the network-retry callback is never armed.
|
|
47
|
-
*/
|
|
48
42
|
private fun assertNonRecoverable(exception: IOException) {
|
|
49
43
|
var pendingNetwork: Boolean? = null
|
|
50
44
|
val policy =
|
|
@@ -66,16 +60,11 @@ class RetryLoadErrorHandlingPolicyTest {
|
|
|
66
60
|
onRetryPending = { _, isNetworkError -> pendingNetwork = isNetworkError },
|
|
67
61
|
)
|
|
68
62
|
|
|
69
|
-
// A wifi drop surfaces as a raw IOException from the socket/DNS layer, NOT a
|
|
70
|
-
// PlaybackException. This must still be treated as a recoverable network error.
|
|
71
63
|
val delay = policy.getRetryDelayMsFor(errorInfo(UnknownHostException("Unable to resolve host")))
|
|
72
64
|
|
|
73
|
-
// Recoverable -> a real (non-TIME_UNSET) retry delay is scheduled.
|
|
74
65
|
assertNotEquals(C.TIME_UNSET, delay)
|
|
75
|
-
//
|
|
66
|
+
// The offline delay.
|
|
76
67
|
assertEquals(1000L, delay)
|
|
77
|
-
// The network-retry callback must be armed so connectivity restoration can
|
|
78
|
-
// trigger an immediate exoPlayer.prepare().
|
|
79
68
|
assertEquals(true, pendingNetwork)
|
|
80
69
|
}
|
|
81
70
|
|
|
@@ -135,8 +124,6 @@ class RetryLoadErrorHandlingPolicyTest {
|
|
|
135
124
|
|
|
136
125
|
val delay = policy.getRetryDelayMsFor(errorInfo(httpError(404)))
|
|
137
126
|
|
|
138
|
-
// A 404 will never succeed on retry: stop immediately rather than spinning until the
|
|
139
|
-
// max-retry-duration timeout, and never arm the connectivity-restoration path.
|
|
140
127
|
assertEquals(C.TIME_UNSET, delay)
|
|
141
128
|
assertNull(pendingNetwork)
|
|
142
129
|
}
|
|
@@ -163,11 +150,7 @@ class RetryLoadErrorHandlingPolicyTest {
|
|
|
163
150
|
}
|
|
164
151
|
}
|
|
165
152
|
|
|
166
|
-
/**
|
|
167
|
-
* The two duration budgets: a never-played load gives up fast while online; a load that produced
|
|
168
|
-
* audio — or a device that is offline — keeps the full recovery budget. Clock-based: budgets are
|
|
169
|
-
* 100ms and the tests sleep 150ms between errors, comfortable margins in both directions.
|
|
170
|
-
*/
|
|
153
|
+
/** Clock-based: 100ms budgets and 150ms sleeps between errors leave margin both ways. */
|
|
171
154
|
class RetryLoadErrorHandlingPolicyBudgetTest {
|
|
172
155
|
private val loadEventInfo = org.mockito.Mockito.mock(LoadEventInfo::class.java)
|
|
173
156
|
private val mediaLoadData = MediaLoadData(C.DATA_TYPE_MEDIA)
|
|
@@ -200,11 +183,6 @@ class RetryLoadErrorHandlingPolicyBudgetTest {
|
|
|
200
183
|
assertNotEquals(C.TIME_UNSET, policy.getRetryDelayMsFor(errorInfo(errorCount = 2)))
|
|
201
184
|
}
|
|
202
185
|
|
|
203
|
-
/**
|
|
204
|
-
* Offline failures must not burn the first-connect budget (a station tapped in a tunnel parks for
|
|
205
|
-
* connectivity); the budget's clock starts at the first error observed online, so a dead station
|
|
206
|
-
* still gets a fast verdict after restoration.
|
|
207
|
-
*/
|
|
208
186
|
@Test
|
|
209
187
|
fun `offline time does not burn the first-connect budget`() {
|
|
210
188
|
var online = false
|
|
@@ -215,23 +193,16 @@ class RetryLoadErrorHandlingPolicyBudgetTest {
|
|
|
215
193
|
hasPlayed = { false },
|
|
216
194
|
)
|
|
217
195
|
|
|
218
|
-
// Offline: the short budget never engages.
|
|
219
196
|
assertNotEquals(C.TIME_UNSET, policy.getRetryDelayMsFor(errorInfo()))
|
|
220
197
|
Thread.sleep(150)
|
|
221
198
|
assertNotEquals(C.TIME_UNSET, policy.getRetryDelayMsFor(errorInfo(errorCount = 2)))
|
|
222
199
|
|
|
223
|
-
// Connectivity returns: the short clock starts now — one more error is
|
|
224
|
-
// retried, then the budget is spent.
|
|
225
200
|
online = true
|
|
226
201
|
assertNotEquals(C.TIME_UNSET, policy.getRetryDelayMsFor(errorInfo(errorCount = 3)))
|
|
227
202
|
Thread.sleep(150)
|
|
228
203
|
assertEquals(C.TIME_UNSET, policy.getRetryDelayMsFor(errorInfo(errorCount = 4)))
|
|
229
204
|
}
|
|
230
205
|
|
|
231
|
-
/**
|
|
232
|
-
* An offline stretch in the middle of the budget must not count against it: any offline
|
|
233
|
-
* observation wipes the clock, which restarts at the next error observed online.
|
|
234
|
-
*/
|
|
235
206
|
@Test
|
|
236
207
|
fun `offline stretch mid-budget restarts the first-connect clock`() {
|
|
237
208
|
var online = true
|
|
@@ -242,13 +213,11 @@ class RetryLoadErrorHandlingPolicyBudgetTest {
|
|
|
242
213
|
hasPlayed = { false },
|
|
243
214
|
)
|
|
244
215
|
|
|
245
|
-
// Online failure starts the clock, then the budget elapses while offline.
|
|
246
216
|
assertNotEquals(C.TIME_UNSET, policy.getRetryDelayMsFor(errorInfo()))
|
|
247
217
|
Thread.sleep(150)
|
|
248
218
|
online = false
|
|
249
219
|
assertNotEquals(C.TIME_UNSET, policy.getRetryDelayMsFor(errorInfo(errorCount = 2)))
|
|
250
220
|
|
|
251
|
-
// Back online: the clock restarted — a full budget remains.
|
|
252
221
|
online = true
|
|
253
222
|
assertNotEquals(C.TIME_UNSET, policy.getRetryDelayMsFor(errorInfo(errorCount = 3)))
|
|
254
223
|
Thread.sleep(150)
|
|
@@ -4,11 +4,6 @@ import androidx.media3.common.Player as MediaPlayer
|
|
|
4
4
|
import org.junit.Assert.assertEquals
|
|
5
5
|
import org.junit.Test
|
|
6
6
|
|
|
7
|
-
/**
|
|
8
|
-
* Truth table for the session-error masking that keeps the platform session alive through a
|
|
9
|
-
* terminal load error (Android Auto reads STATE_NONE as "nothing playing" and tears down the
|
|
10
|
-
* now-playing screen): idle+error masks to paused-but-ready, everything else passes through.
|
|
11
|
-
*/
|
|
12
7
|
class SessionErrorMaskTest {
|
|
13
8
|
|
|
14
9
|
@Test
|
|
@@ -6,12 +6,6 @@ import org.junit.Assert.assertNotEquals
|
|
|
6
6
|
import org.junit.Assert.assertTrue
|
|
7
7
|
import org.junit.Test
|
|
8
8
|
|
|
9
|
-
/**
|
|
10
|
-
* Media3's `ShuffleOrder.cloneAndSet(insertionCount, startIndex)` discards the start index (the
|
|
11
|
-
* interface default clears and re-inserts from 0, and `DefaultShuffleOrder` does not override it),
|
|
12
|
-
* so `setMediaItems(items, startIndex, …)` leaves the starting track at a random shuffle position —
|
|
13
|
-
* last, for a 1-in-N share of queues, which reads as end-of-queue from the very first track.
|
|
14
|
-
*/
|
|
15
9
|
class ShuffleOrderLedByTest {
|
|
16
10
|
@Test
|
|
17
11
|
fun `the start index leads the order`() {
|
|
@@ -59,8 +53,7 @@ class ShuffleOrderLedByTest {
|
|
|
59
53
|
|
|
60
54
|
@Test
|
|
61
55
|
fun `the tail is actually shuffled`() {
|
|
62
|
-
//
|
|
63
|
-
// unshuffled tail would be impossible to miss.
|
|
56
|
+
// Draws may repeat a tail; 50 identical draws out of 7! tails all but prove it is unshuffled.
|
|
64
57
|
val tails =
|
|
65
58
|
(0 until 50)
|
|
66
59
|
.map { shuffleOrderLedBy(startIndex = 0, count = 8) }
|
|
@@ -18,12 +18,10 @@ import org.junit.runner.RunWith
|
|
|
18
18
|
import org.robolectric.RobolectricTestRunner
|
|
19
19
|
import org.robolectric.RuntimeEnvironment
|
|
20
20
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
* player commands behind the standard actions.
|
|
26
|
-
*/
|
|
21
|
+
// Media3 turns a button in the back or forward slot into a custom action and drops the matching
|
|
22
|
+
// standard skip action from the platform PlaybackState; with the slot empty, the standard action
|
|
23
|
+
// stays. Robolectric's MediaController cannot read that state, so these check the buttons and the
|
|
24
|
+
// player commands behind the standard actions.
|
|
27
25
|
@RunWith(RobolectricTestRunner::class)
|
|
28
26
|
class StandardSkipTest {
|
|
29
27
|
|
|
@@ -13,28 +13,28 @@ class StuckRecoveryPolicyTest {
|
|
|
13
13
|
@Test
|
|
14
14
|
fun `recovers up to max then gives up`() {
|
|
15
15
|
val p = StuckRecoveryPolicy(maxRecoveries = 3)
|
|
16
|
-
assertEquals(StuckRecoveryPolicy.Decision.RECOVER, p.onStuck())
|
|
17
|
-
assertEquals(StuckRecoveryPolicy.Decision.RECOVER, p.onStuck())
|
|
18
|
-
assertEquals(StuckRecoveryPolicy.Decision.RECOVER, p.onStuck())
|
|
19
|
-
assertEquals(StuckRecoveryPolicy.Decision.GIVE_UP, p.onStuck())
|
|
16
|
+
assertEquals(StuckRecoveryPolicy.Decision.RECOVER, p.onStuck())
|
|
17
|
+
assertEquals(StuckRecoveryPolicy.Decision.RECOVER, p.onStuck())
|
|
18
|
+
assertEquals(StuckRecoveryPolicy.Decision.RECOVER, p.onStuck())
|
|
19
|
+
assertEquals(StuckRecoveryPolicy.Decision.GIVE_UP, p.onStuck())
|
|
20
20
|
}
|
|
21
21
|
|
|
22
22
|
@Test
|
|
23
23
|
fun `give up is sticky and does not self-refill`() {
|
|
24
24
|
val p = StuckRecoveryPolicy(maxRecoveries = 3)
|
|
25
25
|
repeat(3) { p.onStuck() }
|
|
26
|
-
assertEquals(StuckRecoveryPolicy.Decision.GIVE_UP, p.onStuck())
|
|
27
|
-
assertEquals(StuckRecoveryPolicy.Decision.GIVE_UP, p.onStuck())
|
|
26
|
+
assertEquals(StuckRecoveryPolicy.Decision.GIVE_UP, p.onStuck())
|
|
27
|
+
assertEquals(StuckRecoveryPolicy.Decision.GIVE_UP, p.onStuck())
|
|
28
28
|
}
|
|
29
29
|
|
|
30
30
|
@Test
|
|
31
31
|
fun `reset refills the budget`() {
|
|
32
32
|
val p = StuckRecoveryPolicy(maxRecoveries = 3)
|
|
33
|
-
repeat(4) { p.onStuck() }
|
|
33
|
+
repeat(4) { p.onStuck() }
|
|
34
34
|
p.reset()
|
|
35
|
-
assertEquals(StuckRecoveryPolicy.Decision.RECOVER, p.onStuck())
|
|
36
|
-
assertEquals(StuckRecoveryPolicy.Decision.RECOVER, p.onStuck())
|
|
37
|
-
assertEquals(StuckRecoveryPolicy.Decision.RECOVER, p.onStuck())
|
|
38
|
-
assertEquals(StuckRecoveryPolicy.Decision.GIVE_UP, p.onStuck())
|
|
35
|
+
assertEquals(StuckRecoveryPolicy.Decision.RECOVER, p.onStuck())
|
|
36
|
+
assertEquals(StuckRecoveryPolicy.Decision.RECOVER, p.onStuck())
|
|
37
|
+
assertEquals(StuckRecoveryPolicy.Decision.RECOVER, p.onStuck())
|
|
38
|
+
assertEquals(StuckRecoveryPolicy.Decision.GIVE_UP, p.onStuck())
|
|
39
39
|
}
|
|
40
40
|
}
|
|
@@ -17,10 +17,8 @@ import org.robolectric.RobolectricTestRunner
|
|
|
17
17
|
@RunWith(RobolectricTestRunner::class)
|
|
18
18
|
class TransformingDataSourceTest {
|
|
19
19
|
|
|
20
|
-
// Records the URL each upstream DataSource is actually opened with.
|
|
21
20
|
private val openedUrls = mutableListOf<String>()
|
|
22
21
|
|
|
23
|
-
// When set, the next upstream open() records its URL and then throws (simulating a failed load).
|
|
24
22
|
private var failNextOpen = false
|
|
25
23
|
|
|
26
24
|
private inner class RecordingDataSource(
|
|
@@ -82,21 +80,15 @@ class TransformingDataSourceTest {
|
|
|
82
80
|
|
|
83
81
|
@Test
|
|
84
82
|
fun `a failed media-url load re-resolves the url on the retry (fresh token)`() {
|
|
85
|
-
// A consumer whose transform mints a short-lived token: each resolve yields a new token. If the
|
|
86
|
-
// media-URL load fails (e.g. the token expired during a network outage), ExoPlayer's retry must
|
|
87
|
-
// re-resolve to a fresh token rather than replay the stale cached URL.
|
|
88
83
|
var resolves = 0
|
|
89
84
|
val factory = TransformingDataSource.Factory(upstreamFactory) { tokenConfig(++resolves) }
|
|
90
85
|
val spec = DataSpec("/listen/abc/channel.mp3".toUri())
|
|
91
86
|
|
|
92
|
-
// First open records token=1, then fails (simulating an expired URL).
|
|
93
87
|
failNextOpen = true
|
|
94
88
|
try {
|
|
95
89
|
factory.createDataSource().open(spec)
|
|
96
90
|
} catch (_: IOException) {}
|
|
97
|
-
// The retry re-opens the same media URL — it must re-resolve to a fresh token.
|
|
98
91
|
factory.createDataSource().open(spec)
|
|
99
|
-
// A further re-open without a failure reuses token=2 (the flag is single-shot).
|
|
100
92
|
factory.createDataSource().open(spec)
|
|
101
93
|
|
|
102
94
|
assertEquals(3, openedUrls.size)
|
|
@@ -113,18 +105,15 @@ class TransformingDataSourceTest {
|
|
|
113
105
|
|
|
114
106
|
@Test
|
|
115
107
|
fun `a failed segment load does not trigger a media re-resolve`() {
|
|
116
|
-
// A segment/key failure (a different, already-absolute URL) must not refresh the media URL: the
|
|
117
|
-
// media URL is fine, only a segment hiccuped.
|
|
118
108
|
var resolves = 0
|
|
119
109
|
val factory = TransformingDataSource.Factory(upstreamFactory) { tokenConfig(++resolves) }
|
|
120
110
|
|
|
121
111
|
val mediaUrl = "/listen/abc/playlist.m3u8".toUri()
|
|
122
|
-
factory.createDataSource().open(DataSpec(mediaUrl))
|
|
112
|
+
factory.createDataSource().open(DataSpec(mediaUrl))
|
|
123
113
|
failNextOpen = true
|
|
124
114
|
try {
|
|
125
115
|
factory.createDataSource().open(DataSpec("https://cdn.example.com/seg-1.ts".toUri()))
|
|
126
116
|
} catch (_: IOException) {}
|
|
127
|
-
// Re-open the media URL: it must still reuse token=1 (the segment failure left it valid).
|
|
128
117
|
factory.createDataSource().open(DataSpec(mediaUrl))
|
|
129
118
|
|
|
130
119
|
assertTrue(
|
|
@@ -135,8 +124,6 @@ class TransformingDataSourceTest {
|
|
|
135
124
|
|
|
136
125
|
@Test
|
|
137
126
|
fun `re-open of the media url reuses the resolved url, not the relative original`() {
|
|
138
|
-
// radio.garden's MediaItem URI is a relative path; the transform resolves it to an absolute
|
|
139
|
-
// URL.
|
|
140
127
|
val relative = "/listen/abc/channel.mp3"
|
|
141
128
|
val factory =
|
|
142
129
|
TransformingDataSource.Factory(upstreamFactory) {
|
|
@@ -144,13 +131,11 @@ class TransformingDataSourceTest {
|
|
|
144
131
|
}
|
|
145
132
|
val spec = DataSpec(relative.toUri())
|
|
146
133
|
|
|
147
|
-
// First open resolves + caches; a re-open (e.g. a retry after a network drop) opens again.
|
|
148
134
|
factory.createDataSource().open(spec)
|
|
149
135
|
factory.createDataSource().open(spec)
|
|
150
136
|
|
|
151
137
|
assertEquals(2, openedUrls.size)
|
|
152
|
-
//
|
|
153
|
-
// route to FileDataSource -> FileNotFoundException). Both opens hit the resolved absolute URL.
|
|
138
|
+
// A schemeless URL would reach the file data source and fail.
|
|
154
139
|
assertTrue(
|
|
155
140
|
"expected absolute urls, got $openedUrls",
|
|
156
141
|
openedUrls.all { it.startsWith("https://") },
|
|
@@ -160,10 +145,6 @@ class TransformingDataSourceTest {
|
|
|
160
145
|
|
|
161
146
|
@Test
|
|
162
147
|
fun `response headers are forwarded from the upstream source`() {
|
|
163
|
-
// ICY (Shoutcast) song metadata only works if ExoPlayer's ProgressiveMediaPeriod can read the
|
|
164
|
-
// `icy-metaint` response header back through the data-source chain. A transparent wrapper that
|
|
165
|
-
// swallows getResponseHeaders() (returning the DataSource default empty map) silently disables
|
|
166
|
-
// ICY metadata — playback still works, but onMetadata never fires.
|
|
167
148
|
val icyHeaders = mapOf("icy-metaint" to listOf("16000"), "icy-name" to listOf("Example FM"))
|
|
168
149
|
val factory =
|
|
169
150
|
TransformingDataSource.Factory({ RecordingDataSource(icyHeaders) }) {
|
|
@@ -182,9 +163,7 @@ class TransformingDataSourceTest {
|
|
|
182
163
|
config("https://cdn.example.com", "/playlist.m3u8")
|
|
183
164
|
}
|
|
184
165
|
|
|
185
|
-
// Resolve the (relative) media/playlist URL first…
|
|
186
166
|
factory.createDataSource().open(DataSpec("/listen/abc/playlist.m3u8".toUri()))
|
|
187
|
-
// …then an already-absolute segment URL must pass through untouched (only headers are reused).
|
|
188
167
|
val segment = "https://cdn.example.com/segment-1.ts"
|
|
189
168
|
factory.createDataSource().open(DataSpec(segment.toUri()))
|
|
190
169
|
|
|
@@ -12,7 +12,6 @@ import androidx.media3.common.TrackSelectionParameters
|
|
|
12
12
|
import com.google.common.util.concurrent.Futures
|
|
13
13
|
import com.google.common.util.concurrent.ListenableFuture
|
|
14
14
|
|
|
15
|
-
/** A local player that keeps the queue it is told. */
|
|
16
15
|
internal class FakeLocalPlayer(looper: Looper) : SimpleBasePlayer(looper) {
|
|
17
16
|
val items = mutableListOf<MediaItem>()
|
|
18
17
|
var index = C.INDEX_UNSET
|
|
@@ -29,7 +28,12 @@ internal class FakeLocalPlayer(looper: Looper) : SimpleBasePlayer(looper) {
|
|
|
29
28
|
State.Builder()
|
|
30
29
|
.setAvailableCommands(MediaPlayer.Commands.Builder().addAllCommands().build())
|
|
31
30
|
.setPlaylist(
|
|
32
|
-
items.mapIndexed { i, item ->
|
|
31
|
+
items.mapIndexed { i, item ->
|
|
32
|
+
MediaItemData.Builder(uids[i])
|
|
33
|
+
.setMediaItem(item)
|
|
34
|
+
.setLiveConfiguration(item.liveConfiguration.takeIf { item.isRemoteLive })
|
|
35
|
+
.build()
|
|
36
|
+
}
|
|
33
37
|
)
|
|
34
38
|
.setCurrentMediaItemIndex(if (items.isEmpty()) C.INDEX_UNSET else index)
|
|
35
39
|
.setContentPositionMs(positionMs)
|
|
@@ -39,7 +43,7 @@ internal class FakeLocalPlayer(looper: Looper) : SimpleBasePlayer(looper) {
|
|
|
39
43
|
.setShuffleModeEnabled(shuffle)
|
|
40
44
|
.build()
|
|
41
45
|
|
|
42
|
-
/** Moves to [index] as the
|
|
46
|
+
/** Moves to [index] without a seek, as the player does at an item's end. */
|
|
43
47
|
fun moveTo(index: Int) {
|
|
44
48
|
this.index = index
|
|
45
49
|
invalidateState()
|
|
@@ -114,10 +118,10 @@ internal class FakeLocalPlayer(looper: Looper) : SimpleBasePlayer(looper) {
|
|
|
114
118
|
override fun handleRelease(): ListenableFuture<*> = done()
|
|
115
119
|
}
|
|
116
120
|
|
|
117
|
-
/**
|
|
121
|
+
/** [autoplay] is the receiver's playWhenReady when the load arrived. */
|
|
118
122
|
internal data class SentLoad(val item: MediaItem, val positionMs: Long, val autoplay: Boolean)
|
|
119
123
|
|
|
120
|
-
/**
|
|
124
|
+
/** Holds one item at a time, as [RemotePlayback.player] does; a load of any other count throws. */
|
|
121
125
|
internal class FakeReceiver(looper: Looper) : SimpleBasePlayer(looper) {
|
|
122
126
|
var item: MediaItem? = null
|
|
123
127
|
var positionMs = 0L
|
|
@@ -141,7 +145,7 @@ internal class FakeReceiver(looper: Looper) : SimpleBasePlayer(looper) {
|
|
|
141
145
|
invalidateState()
|
|
142
146
|
}
|
|
143
147
|
|
|
144
|
-
/**
|
|
148
|
+
/** Changes playWhenReady as another sender would, unrecorded in [intents]. */
|
|
145
149
|
fun setIntentFromElsewhere(playWhenReady: Boolean) {
|
|
146
150
|
intent = playWhenReady
|
|
147
151
|
invalidateState()
|
|
@@ -168,6 +172,7 @@ internal class FakeReceiver(looper: Looper) : SimpleBasePlayer(looper) {
|
|
|
168
172
|
): ListenableFuture<*> {
|
|
169
173
|
val loaded = mediaItems.single()
|
|
170
174
|
loads += SentLoad(loaded, startPositionMs, intent)
|
|
175
|
+
// A fresh uid makes a reload of the same item a new playlist entry to listeners.
|
|
171
176
|
uid = Any()
|
|
172
177
|
positionMs = if (startPositionMs == C.TIME_UNSET) 0 else startPositionMs
|
|
173
178
|
readiness = STATE_READY
|
|
@@ -216,7 +221,6 @@ internal class FakeReceiver(looper: Looper) : SimpleBasePlayer(looper) {
|
|
|
216
221
|
}
|
|
217
222
|
}
|
|
218
223
|
|
|
219
|
-
/** A remote whose sessions the test starts and ends, each with a receiver of its own. */
|
|
220
224
|
internal class FakeRemote(private val looper: Looper) : RemotePlayback {
|
|
221
225
|
private var receiver: FakeReceiver? = null
|
|
222
226
|
private var listener: RemotePlayback.Listener? = null
|
|
@@ -237,7 +241,10 @@ internal class FakeRemote(private val looper: Looper) : RemotePlayback {
|
|
|
237
241
|
receiver = FakeReceiver(looper)
|
|
238
242
|
}
|
|
239
243
|
|
|
240
|
-
/**
|
|
244
|
+
/**
|
|
245
|
+
* Starts a session, or another in place of the one up, as selecting another room does. [player]
|
|
246
|
+
* is then a new receiver; the old one is released.
|
|
247
|
+
*/
|
|
241
248
|
fun startSession() {
|
|
242
249
|
val ended = receiver
|
|
243
250
|
receiver = FakeReceiver(looper)
|
|
@@ -250,19 +257,16 @@ internal class FakeRemote(private val looper: Looper) : RemotePlayback {
|
|
|
250
257
|
listener?.onSessionChanged()
|
|
251
258
|
}
|
|
252
259
|
|
|
253
|
-
/** The receiver reports its item playing. */
|
|
254
260
|
fun playing() {
|
|
255
261
|
listener?.onPlaying()
|
|
256
262
|
}
|
|
257
263
|
|
|
258
|
-
/** The receiver played its item to the end. */
|
|
259
264
|
fun end() {
|
|
260
265
|
player.readiness = MediaPlayer.STATE_ENDED
|
|
261
266
|
player.update()
|
|
262
267
|
listener?.onEnded()
|
|
263
268
|
}
|
|
264
269
|
|
|
265
|
-
/** The receiver failed to play its item. */
|
|
266
270
|
fun fail(code: Int = PlaybackException.ERROR_CODE_REMOTE_ERROR) {
|
|
267
271
|
listener?.onFailed(PlaybackException("receiver failed", null, code))
|
|
268
272
|
}
|