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
|
@@ -9,27 +9,27 @@ import com.margelo.nitro.audiobrowser.RemoteOutputsOptions
|
|
|
9
9
|
import com.margelo.nitro.audiobrowser.Variant_Boolean_AndroidAudioOffloadSettings
|
|
10
10
|
import com.margelo.nitro.audiobrowser.Variant_Boolean_RetryConfig
|
|
11
11
|
|
|
12
|
-
/**
|
|
13
|
-
* Audio offload preferences for power-efficient playback. When this object exists, offload is
|
|
14
|
-
* considered enabled.
|
|
15
|
-
*/
|
|
12
|
+
/** Offload preferences; [PlayerSetupOptions.audioOffload] being null turns offload off. */
|
|
16
13
|
data class AudioOffloadOptions(
|
|
17
14
|
val gaplessSupportRequired: Boolean = true,
|
|
18
15
|
val rateChangeSupportRequired: Boolean = true,
|
|
19
16
|
)
|
|
20
17
|
|
|
21
|
-
/**
|
|
18
|
+
/** How the player retries a load error (network failure, timeout). */
|
|
22
19
|
sealed class RetryPolicy {
|
|
23
|
-
/**
|
|
20
|
+
/** ExoPlayer's default: a few retries, then the error surfaces. */
|
|
24
21
|
data object Default : RetryPolicy()
|
|
25
22
|
|
|
26
|
-
/**
|
|
23
|
+
/**
|
|
24
|
+
* Retries with exponential backoff, with no attempt cap, until a duration bound runs out; a null
|
|
25
|
+
* bound takes RetryLoadErrorHandlingPolicy's default.
|
|
26
|
+
*/
|
|
27
27
|
data class Infinite(
|
|
28
28
|
val maxRetryDurationMs: Long? = null,
|
|
29
29
|
val firstConnectMaxRetryDurationMs: Long? = null,
|
|
30
30
|
) : RetryPolicy()
|
|
31
31
|
|
|
32
|
-
/**
|
|
32
|
+
/** Retries up to [maxRetries] times with exponential backoff. */
|
|
33
33
|
data class Limited(
|
|
34
34
|
val maxRetries: Int,
|
|
35
35
|
val maxRetryDurationMs: Long? = null,
|
|
@@ -37,46 +37,36 @@ sealed class RetryPolicy {
|
|
|
37
37
|
) : RetryPolicy()
|
|
38
38
|
}
|
|
39
39
|
|
|
40
|
-
/**
|
|
41
|
-
* Setup options for the AudioBrowser that are applied once during player initialization. These
|
|
42
|
-
* options configure the audio engine and system-level behavior.
|
|
43
|
-
*/
|
|
40
|
+
/** The options [Player.setup] builds the engine from; see [engineOptions] for what rebuilds it. */
|
|
44
41
|
data class PlayerSetupOptions(
|
|
45
|
-
//
|
|
42
|
+
// The buffer fields are durations in milliseconds.
|
|
46
43
|
var minBuffer: Double = DefaultLoadControl.DEFAULT_MIN_BUFFER_MS.toDouble(),
|
|
47
44
|
var audioContentType: AndroidAudioContentType = AndroidAudioContentType.MUSIC,
|
|
48
45
|
var maxBuffer: Double = DefaultLoadControl.DEFAULT_MAX_BUFFER_MS.toDouble(),
|
|
49
46
|
var playBuffer: Double = DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_MS.toDouble(),
|
|
47
|
+
// null lets AutomaticBufferManager tune it.
|
|
50
48
|
var rebufferBuffer: Double? = null,
|
|
51
49
|
var backBuffer: Double = DefaultLoadControl.DEFAULT_BACK_BUFFER_DURATION_MS.toDouble(),
|
|
50
|
+
// In megabytes; 0 disables the cache.
|
|
52
51
|
var maxCacheSize: Double = 0.0,
|
|
53
52
|
var handleAudioBecomingNoisy: Boolean = true,
|
|
54
53
|
var wakeMode: AndroidPlayerWakeMode = AndroidPlayerWakeMode.NONE,
|
|
55
54
|
var audioOffload: AudioOffloadOptions? = null,
|
|
56
55
|
var retryPolicy: RetryPolicy = RetryPolicy.Default,
|
|
57
|
-
//
|
|
58
|
-
//
|
|
59
|
-
// Default on: matches iOS, where the session always survives errors.
|
|
56
|
+
// Keeps the media session through a terminal error so external controllers (Android Auto) keep
|
|
57
|
+
// their transport controls. On by default to match iOS, where the session always survives.
|
|
60
58
|
var keepSessionAliveOnError: Boolean = true,
|
|
61
|
-
// Whether the player publishes/refreshes track metadata on the now-playing surface.
|
|
62
59
|
var autoUpdateNowPlayingMetadata: Boolean = true,
|
|
63
|
-
// Optional JS formatter that customizes the now-playing title/subtitle from the track + live
|
|
64
|
-
// timed metadata. When null, the default mapping is used.
|
|
65
60
|
var nowPlayingMetadataFormatter: NowPlayingFormatter? = null,
|
|
66
|
-
// The remote outputs offered in the Output Switcher, or null for none: each setup sets it.
|
|
67
61
|
var remoteOutputs: RemoteOutputsOptions? = null,
|
|
68
62
|
) {
|
|
69
|
-
/**
|
|
70
|
-
* Whether automatic buffer management is enabled. True when rebufferBuffer is not explicitly set
|
|
71
|
-
* (null).
|
|
72
|
-
*/
|
|
73
63
|
val automaticBuffer: Boolean
|
|
74
64
|
get() = rebufferBuffer == null
|
|
75
65
|
|
|
76
66
|
/**
|
|
77
67
|
* A copy that equals another's when both build the same engine: without the now-playing options
|
|
78
68
|
* and the remote outputs, which apply without a rebuild. A formatter is a new object on every
|
|
79
|
-
* setup call.
|
|
69
|
+
* setup call, so leaving it in would rebuild every time.
|
|
80
70
|
*/
|
|
81
71
|
fun engineOptions() =
|
|
82
72
|
copy(
|
|
@@ -86,7 +76,6 @@ data class PlayerSetupOptions(
|
|
|
86
76
|
)
|
|
87
77
|
|
|
88
78
|
fun update(options: NativeSetupPlayerOptions) {
|
|
89
|
-
// Android-specific options
|
|
90
79
|
options.android?.let { android ->
|
|
91
80
|
android.minBuffer?.let { minBuffer = it }
|
|
92
81
|
android.maxBuffer?.let { maxBuffer = it }
|
|
@@ -114,7 +103,6 @@ data class PlayerSetupOptions(
|
|
|
114
103
|
}
|
|
115
104
|
}
|
|
116
105
|
|
|
117
|
-
// Top-level cross-platform options
|
|
118
106
|
options.retry?.let {
|
|
119
107
|
retryPolicy =
|
|
120
108
|
when (it) {
|
|
@@ -125,9 +113,9 @@ data class PlayerSetupOptions(
|
|
|
125
113
|
val maxRetries = it.value.maxRetries?.toInt()
|
|
126
114
|
val maxDurationMs = it.value.maxRetryDurationMs?.toLong()
|
|
127
115
|
val firstConnectMs = it.value.firstConnectMaxRetryDurationMs?.toLong()
|
|
128
|
-
// No attempt cap = retry indefinitely, bounded only by the durations.
|
|
129
116
|
if (maxRetries == null)
|
|
130
|
-
|
|
117
|
+
// No attempt cap: retry until a duration bound runs out.
|
|
118
|
+
RetryPolicy.Infinite(
|
|
131
119
|
maxRetryDurationMs = maxDurationMs,
|
|
132
120
|
firstConnectMaxRetryDurationMs = firstConnectMs,
|
|
133
121
|
)
|
|
@@ -144,6 +132,7 @@ data class PlayerSetupOptions(
|
|
|
144
132
|
options.keepSessionAliveOnError?.let { keepSessionAliveOnError = it }
|
|
145
133
|
options.autoUpdateNowPlayingMetadata?.let { autoUpdateNowPlayingMetadata = it }
|
|
146
134
|
options.nowPlayingMetadataFormatter?.let { nowPlayingMetadataFormatter = it }
|
|
135
|
+
// Unlike the fields above, an absent value turns remote outputs off.
|
|
147
136
|
remoteOutputs = options.remoteOutputs
|
|
148
137
|
}
|
|
149
138
|
}
|
|
@@ -9,18 +9,13 @@ import com.margelo.nitro.audiobrowser.RemoteButtonLayout
|
|
|
9
9
|
import com.margelo.nitro.audiobrowser.Variant_NullType_Double
|
|
10
10
|
import com.margelo.nitro.audiobrowser.Variant_NullType_RemoteButtonLayout
|
|
11
11
|
|
|
12
|
-
/**
|
|
13
|
-
* Update options for the AudioBrowser that can be changed at runtime. These options control player
|
|
14
|
-
* behavior and capabilities that can be modified during playback.
|
|
15
|
-
*/
|
|
16
12
|
data class PlayerUpdateOptions(
|
|
17
|
-
//
|
|
13
|
+
// The intervals are in seconds.
|
|
18
14
|
var forwardJumpInterval: Double = 15.0,
|
|
19
15
|
var backwardJumpInterval: Double = 15.0,
|
|
20
16
|
var progressUpdateEventInterval: Double? = null,
|
|
21
17
|
|
|
22
|
-
//
|
|
23
|
-
// Exceptions: jumpForward, jumpBackward default to false
|
|
18
|
+
// A null capability is enabled; only false disables. Jumps are off until enabled.
|
|
24
19
|
var capabilities: PlayerCapabilities =
|
|
25
20
|
PlayerCapabilities(
|
|
26
21
|
play = null,
|
|
@@ -37,10 +32,8 @@ data class PlayerUpdateOptions(
|
|
|
37
32
|
playbackRate = null,
|
|
38
33
|
),
|
|
39
34
|
|
|
40
|
-
//
|
|
35
|
+
// null: the layout follows the capabilities.
|
|
41
36
|
var remoteButtonLayout: RemoteButtonLayout? = null,
|
|
42
|
-
|
|
43
|
-
// Android-specific runtime options (all under android.* in JS)
|
|
44
37
|
var appKilledPlaybackBehavior: AppKilledPlaybackBehavior =
|
|
45
38
|
AppKilledPlaybackBehavior.STOP_PLAYBACK_AND_REMOVE_NOTIFICATION,
|
|
46
39
|
var skipSilence: Boolean = false,
|
|
@@ -49,6 +42,7 @@ data class PlayerUpdateOptions(
|
|
|
49
42
|
options.forwardJumpInterval?.let { forwardJumpInterval = it }
|
|
50
43
|
options.backwardJumpInterval?.let { backwardJumpInterval = it }
|
|
51
44
|
|
|
45
|
+
// The variants tell an explicit null (First), which clears, from an absent value, which keeps.
|
|
52
46
|
options.progressUpdateEventInterval?.let { variant ->
|
|
53
47
|
progressUpdateEventInterval =
|
|
54
48
|
when (variant) {
|
|
@@ -59,14 +53,11 @@ data class PlayerUpdateOptions(
|
|
|
59
53
|
|
|
60
54
|
options.capabilities?.let { newCaps -> capabilities = mergeCapabilities(capabilities, newCaps) }
|
|
61
55
|
|
|
62
|
-
// Update Android-specific options
|
|
63
56
|
options.android?.let { androidOptions ->
|
|
64
57
|
androidOptions.appKilledPlaybackBehavior?.let { appKilledPlaybackBehavior = it }
|
|
65
58
|
|
|
66
|
-
// Update boolean options
|
|
67
59
|
androidOptions.skipSilence?.let { skipSilence = it }
|
|
68
60
|
|
|
69
|
-
// Handle remoteButtonLayout - variant allows distinguishing undefined from null
|
|
70
61
|
androidOptions.remoteButtonLayout?.let { variant ->
|
|
71
62
|
remoteButtonLayout =
|
|
72
63
|
when (variant) {
|
|
@@ -77,7 +68,7 @@ data class PlayerUpdateOptions(
|
|
|
77
68
|
}
|
|
78
69
|
}
|
|
79
70
|
|
|
80
|
-
/** The resolved options in their wire shape
|
|
71
|
+
/** The resolved options in their wire shape, as getOptions and onOptionsChanged report them. */
|
|
81
72
|
fun toNitro(): Options {
|
|
82
73
|
return Options(
|
|
83
74
|
android =
|
|
@@ -92,11 +83,10 @@ data class PlayerUpdateOptions(
|
|
|
92
83
|
progressUpdateEventInterval =
|
|
93
84
|
progressUpdateEventInterval?.let { Variant_NullType_Double.create(it) },
|
|
94
85
|
capabilities = capabilities,
|
|
95
|
-
ios = null,
|
|
86
|
+
ios = null,
|
|
96
87
|
)
|
|
97
88
|
}
|
|
98
89
|
|
|
99
|
-
/** Merge incoming capabilities with existing - only explicitly set values override */
|
|
100
90
|
private fun mergeCapabilities(
|
|
101
91
|
existing: PlayerCapabilities,
|
|
102
92
|
incoming: PlayerCapabilities,
|
|
@@ -6,20 +6,10 @@ import androidx.media3.exoplayer.analytics.AnalyticsListener
|
|
|
6
6
|
import timber.log.Timber
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
* drain rate.
|
|
14
|
-
*
|
|
15
|
-
* Algorithm:
|
|
16
|
-
* 1. Track when playback becomes ready (buffer filled)
|
|
17
|
-
* 2. Track how long until rebuffer occurs
|
|
18
|
-
* 3. Calculate drain rate: initialBuffer / timeUntilRebuffer
|
|
19
|
-
* 4. Calculate needed buffer to sustain 60s: drainRate × 60
|
|
20
|
-
* 5. Reset to defaults when loading new media (station change)
|
|
21
|
-
*
|
|
22
|
-
* Target: Sustain 60 seconds of playback without rebuffering.
|
|
9
|
+
* Raises [DynamicLoadControl]'s `bufferForPlaybackAfterRebufferMs` after each rebuffer, to what the
|
|
10
|
+
* measured drain rate says would last [targetPlaybackDurationMs]. The threshold only rises, up to
|
|
11
|
+
* [maxRebufferBufferMs], until a playlist change or a seek to another item resets it to
|
|
12
|
+
* [defaultConfig].
|
|
23
13
|
*/
|
|
24
14
|
class AutomaticBufferManager(
|
|
25
15
|
private val loadControl: DynamicLoadControl,
|
|
@@ -28,20 +18,17 @@ class AutomaticBufferManager(
|
|
|
28
18
|
|
|
29
19
|
private var exoPlayer: ExoPlayer? = null
|
|
30
20
|
|
|
31
|
-
// State tracking for rebuffer detection
|
|
32
21
|
private var wasReady = false
|
|
33
22
|
private var rebufferCount = 0
|
|
34
23
|
|
|
35
|
-
// Timing tracking for drain rate calculation
|
|
36
24
|
private var playbackStartTimeMs: Long = 0
|
|
37
25
|
private var bufferAtPlaybackStartMs: Long = 0
|
|
38
26
|
private var bufferingStartTimeMs: Long = 0
|
|
39
27
|
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
private val targetPlaybackDurationMs = 60_000L
|
|
28
|
+
private val maxRebufferBufferMs = 8_000
|
|
29
|
+
// How long playback should run without stalling once the raised threshold is met.
|
|
30
|
+
private val targetPlaybackDurationMs = 60_000L
|
|
43
31
|
|
|
44
|
-
/** Attaches this manager to an ExoPlayer instance. Call this after creating the player. */
|
|
45
32
|
fun attach(player: ExoPlayer) {
|
|
46
33
|
exoPlayer = player
|
|
47
34
|
player.addAnalyticsListener(this)
|
|
@@ -49,7 +36,7 @@ class AutomaticBufferManager(
|
|
|
49
36
|
Timber.d("AutomaticBufferManager attached to player")
|
|
50
37
|
}
|
|
51
38
|
|
|
52
|
-
/**
|
|
39
|
+
/** Call before releasing the player. */
|
|
53
40
|
fun detach() {
|
|
54
41
|
stopBufferMonitoring()
|
|
55
42
|
bufferMonitorHandler = null
|
|
@@ -60,13 +47,10 @@ class AutomaticBufferManager(
|
|
|
60
47
|
}
|
|
61
48
|
|
|
62
49
|
/**
|
|
63
|
-
*
|
|
64
|
-
*
|
|
50
|
+
* Restores [defaultConfig] — the setup's buffer tuning, not Media3's defaults, which would wipe a
|
|
51
|
+
* fast-start configuration — and clears the rebuffer tracking.
|
|
65
52
|
*/
|
|
66
53
|
fun reset() {
|
|
67
|
-
// The setup-provided defaults, not the media3 library defaults —
|
|
68
|
-
// resetToDefaults() silently wiped an app's fast-start buffer tuning on
|
|
69
|
-
// every queue set, station change, and seek.
|
|
70
54
|
loadControl.updateBufferConfig(defaultConfig)
|
|
71
55
|
wasReady = false
|
|
72
56
|
rebufferCount = 0
|
|
@@ -77,18 +61,15 @@ class AutomaticBufferManager(
|
|
|
77
61
|
|
|
78
62
|
// region Player.Listener
|
|
79
63
|
|
|
80
|
-
// For periodic buffer logging during playback
|
|
81
64
|
private var lastBufferLogTimeMs: Long = 0
|
|
82
|
-
private val bufferLogIntervalMs = 2_000L
|
|
65
|
+
private val bufferLogIntervalMs = 2_000L
|
|
83
66
|
|
|
84
67
|
override fun onPlaybackStateChanged(playbackState: Int) {
|
|
85
68
|
when (playbackState) {
|
|
86
69
|
Player.STATE_BUFFERING -> {
|
|
87
70
|
if (wasReady) {
|
|
88
|
-
// This is a rebuffer - buffer ran out during playback
|
|
89
71
|
onRebuffer()
|
|
90
72
|
}
|
|
91
|
-
// Track when buffering started
|
|
92
73
|
if (bufferingStartTimeMs == 0L) {
|
|
93
74
|
bufferingStartTimeMs = System.currentTimeMillis()
|
|
94
75
|
Timber.d("STATE_BUFFERING entered - starting buffer timer")
|
|
@@ -96,7 +77,6 @@ class AutomaticBufferManager(
|
|
|
96
77
|
}
|
|
97
78
|
Player.STATE_READY -> {
|
|
98
79
|
if (!wasReady) {
|
|
99
|
-
// Playback just became ready - record timing for drain rate calculation
|
|
100
80
|
playbackStartTimeMs = System.currentTimeMillis()
|
|
101
81
|
bufferAtPlaybackStartMs = exoPlayer?.totalBufferedDuration ?: 0
|
|
102
82
|
lastBufferLogTimeMs = playbackStartTimeMs
|
|
@@ -124,7 +104,6 @@ class AutomaticBufferManager(
|
|
|
124
104
|
}
|
|
125
105
|
}
|
|
126
106
|
|
|
127
|
-
// Called frequently during playback - use for buffer monitoring
|
|
128
107
|
override fun onIsPlayingChanged(
|
|
129
108
|
eventTime: androidx.media3.exoplayer.analytics.AnalyticsListener.EventTime,
|
|
130
109
|
isPlaying: Boolean,
|
|
@@ -168,7 +147,6 @@ class AutomaticBufferManager(
|
|
|
168
147
|
}
|
|
169
148
|
|
|
170
149
|
override fun onMediaItemTransition(mediaItem: androidx.media3.common.MediaItem?, reason: Int) {
|
|
171
|
-
// Reset on station change (new media loaded)
|
|
172
150
|
if (
|
|
173
151
|
reason == Player.MEDIA_ITEM_TRANSITION_REASON_PLAYLIST_CHANGED ||
|
|
174
152
|
reason == Player.MEDIA_ITEM_TRANSITION_REASON_SEEK
|
|
@@ -193,7 +171,6 @@ class AutomaticBufferManager(
|
|
|
193
171
|
bufferAtPlaybackStartMs,
|
|
194
172
|
)
|
|
195
173
|
|
|
196
|
-
// Only adjust if we have valid timing data
|
|
197
174
|
if (playbackDurationMs > 0 && bufferAtPlaybackStartMs > 0) {
|
|
198
175
|
val newRebufferBuffer =
|
|
199
176
|
calculateOptimalRebufferBuffer(playbackDurationMs, bufferAtPlaybackStartMs)
|
|
@@ -212,23 +189,19 @@ class AutomaticBufferManager(
|
|
|
212
189
|
Timber.d("Skipping adjustment - insufficient timing data")
|
|
213
190
|
}
|
|
214
191
|
|
|
215
|
-
//
|
|
192
|
+
// The next rebuffer counts only after STATE_READY records a fresh start.
|
|
216
193
|
wasReady = false
|
|
217
194
|
playbackStartTimeMs = 0
|
|
218
195
|
bufferAtPlaybackStartMs = 0
|
|
219
196
|
}
|
|
220
197
|
|
|
221
198
|
/**
|
|
222
|
-
*
|
|
223
|
-
*
|
|
224
|
-
* Drain rate = initialBuffer / timeUntilRebuffer Needed buffer = drainRate × targetDuration (60s)
|
|
225
|
-
*
|
|
226
|
-
* Example: 1000ms buffer lasted 30s → drain rate = 33ms/s → need 2000ms for 60s
|
|
199
|
+
* Assumes the buffer held at ready drained to empty over [playbackDurationMs], and returns the
|
|
200
|
+
* threshold that would last [targetPlaybackDurationMs]: 1000ms lasting 30s needs 2000ms.
|
|
227
201
|
*/
|
|
228
202
|
private fun calculateOptimalRebufferBuffer(playbackDurationMs: Long, initialBufferMs: Long): Int {
|
|
229
203
|
val currentConfig = loadControl.getBufferConfig()
|
|
230
204
|
|
|
231
|
-
// If we don't have good timing data, fall back to 1.5x increase
|
|
232
205
|
if (playbackDurationMs <= 0 || initialBufferMs <= 0) {
|
|
233
206
|
Timber.d("Insufficient timing data, using 1.5x fallback")
|
|
234
207
|
return (currentConfig.bufferForPlaybackAfterRebufferMs * 1.5)
|
|
@@ -236,11 +209,8 @@ class AutomaticBufferManager(
|
|
|
236
209
|
.coerceIn(defaultConfig.bufferForPlaybackAfterRebufferMs, maxRebufferBufferMs)
|
|
237
210
|
}
|
|
238
211
|
|
|
239
|
-
// Calculate drain rate: how much buffer we lose per second of playback
|
|
240
|
-
// drainRate = initialBuffer / playbackDuration (ms per second)
|
|
241
212
|
val drainRateMsPerSec = (initialBufferMs.toFloat() / (playbackDurationMs / 1000f))
|
|
242
213
|
|
|
243
|
-
// Calculate buffer needed to sustain 60 seconds
|
|
244
214
|
val neededBufferMs = (drainRateMsPerSec * (targetPlaybackDurationMs / 1000)).toLong()
|
|
245
215
|
|
|
246
216
|
Timber.d(
|
|
@@ -249,7 +219,7 @@ class AutomaticBufferManager(
|
|
|
249
219
|
neededBufferMs,
|
|
250
220
|
)
|
|
251
221
|
|
|
252
|
-
//
|
|
222
|
+
// The current threshold as the floor: it never drops within an item.
|
|
253
223
|
return neededBufferMs
|
|
254
224
|
.toInt()
|
|
255
225
|
.coerceIn(currentConfig.bufferForPlaybackAfterRebufferMs, maxRebufferBufferMs)
|
|
@@ -4,17 +4,14 @@ import com.margelo.nitro.audiobrowser.PlayerCapabilities
|
|
|
4
4
|
import com.margelo.nitro.audiobrowser.RemoteButton
|
|
5
5
|
import com.margelo.nitro.audiobrowser.RemoteButtonLayout
|
|
6
6
|
|
|
7
|
-
|
|
8
|
-
* The
|
|
9
|
-
*
|
|
10
|
-
* MediaSessionCommandManager's Media3 assemblies all consume these decisions — previously each
|
|
11
|
-
* re-implemented them, and the copies had drifted.
|
|
7
|
+
/*
|
|
8
|
+
* The one rule for whether a Capability is enabled and the one derivation of the button layout.
|
|
9
|
+
* Every Media3 assembly in MediaSessionCommandManager consumes these instead of deciding for itself.
|
|
12
10
|
*/
|
|
13
11
|
|
|
14
12
|
/**
|
|
15
|
-
* A control
|
|
16
|
-
*
|
|
17
|
-
* they have no entry here.
|
|
13
|
+
* A control a Capability gates. `shuffleMode`, `repeatMode` and `playbackRate` exist on
|
|
14
|
+
* [PlayerCapabilities] but drive only CarPlay, so they have no entry.
|
|
18
15
|
*/
|
|
19
16
|
enum class Capability {
|
|
20
17
|
PLAY_PAUSE,
|
|
@@ -28,9 +25,8 @@ enum class Capability {
|
|
|
28
25
|
}
|
|
29
26
|
|
|
30
27
|
/**
|
|
31
|
-
*
|
|
32
|
-
*
|
|
33
|
-
* surface and only goes away when both halves are disabled.
|
|
28
|
+
* Everything is enabled unless explicitly `false` — except FAVORITE, which is opt-in, and
|
|
29
|
+
* PLAY_PAUSE, one control that goes away only when both `play` and `pause` are `false`.
|
|
34
30
|
*/
|
|
35
31
|
fun PlayerCapabilities.isEnabled(capability: Capability): Boolean =
|
|
36
32
|
when (capability) {
|
|
@@ -45,13 +41,10 @@ fun PlayerCapabilities.isEnabled(capability: Capability): Boolean =
|
|
|
45
41
|
}
|
|
46
42
|
|
|
47
43
|
/**
|
|
48
|
-
* The
|
|
49
|
-
*
|
|
50
|
-
*
|
|
51
|
-
*
|
|
52
|
-
* Media3 does define SLOT_BACK_SECONDARY and SLOT_FORWARD_SECONDARY, but `DisplayConstraints`
|
|
53
|
-
* defaults both to **0 buttons** — only a controller that opts in with `setMaxButtonsForSlot` shows
|
|
54
|
-
* them, which no system surface does.
|
|
44
|
+
* The positions every Android system surface renders, mapped to `CommandButton.SLOT_*` at assembly.
|
|
45
|
+
* Media3's SLOT_BACK_SECONDARY and SLOT_FORWARD_SECONDARY are left out: `DisplayConstraints` allows
|
|
46
|
+
* them 0 buttons unless a controller opts in with `setMaxButtonsForSlot`, which no system surface
|
|
47
|
+
* does.
|
|
55
48
|
*/
|
|
56
49
|
enum class ButtonSlot {
|
|
57
50
|
BACK,
|
|
@@ -61,7 +54,6 @@ enum class ButtonSlot {
|
|
|
61
54
|
|
|
62
55
|
data class SlottedButton(val button: RemoteButton, val slot: ButtonSlot)
|
|
63
56
|
|
|
64
|
-
/** The Capability gating a button. */
|
|
65
57
|
private val RemoteButton.capability: Capability
|
|
66
58
|
get() =
|
|
67
59
|
when (this) {
|
|
@@ -72,17 +64,12 @@ private val RemoteButton.capability: Capability
|
|
|
72
64
|
RemoteButton.FAVORITE -> Capability.FAVORITE
|
|
73
65
|
}
|
|
74
66
|
|
|
75
|
-
/** Whether [button]'s gating Capability allows it. */
|
|
76
67
|
fun PlayerCapabilities.allows(button: RemoteButton): Boolean = isEnabled(button.capability)
|
|
77
68
|
|
|
78
69
|
/**
|
|
79
|
-
*
|
|
80
|
-
*
|
|
81
|
-
*
|
|
82
|
-
* data-class equality compares arrays by *reference*. Plain `==` therefore reports "changed" for
|
|
83
|
-
* two identical layouts whenever overflow is set, because every options update carries a fresh
|
|
84
|
-
* array across the bridge — which would republish the layout to Android Auto on every unrelated
|
|
85
|
-
* `updateOptions` call.
|
|
70
|
+
* Layout equality with `overflow` compared by content. Data-class `==` compares the array by
|
|
71
|
+
* reference, and every options update brings a fresh array across the bridge, so `==` would
|
|
72
|
+
* republish the layout to Android Auto on every unrelated `updateOptions`.
|
|
86
73
|
*/
|
|
87
74
|
internal fun RemoteButtonLayout?.sameAs(other: RemoteButtonLayout?): Boolean =
|
|
88
75
|
if (this == null || other == null) {
|
|
@@ -92,39 +79,18 @@ internal fun RemoteButtonLayout?.sameAs(other: RemoteButtonLayout?): Boolean =
|
|
|
92
79
|
}
|
|
93
80
|
|
|
94
81
|
/**
|
|
95
|
-
* The
|
|
96
|
-
*
|
|
97
|
-
*
|
|
98
|
-
* - [capabilities] — *may* this button exist? Admission.
|
|
99
|
-
* - [layout] — *where* does it go? Arrangement.
|
|
100
|
-
*
|
|
101
|
-
* **A layout can rearrange buttons but never add one.** Every entry is filtered through [allows]
|
|
102
|
-
* regardless of its position, so naming a button whose Capability is disabled does nothing —
|
|
103
|
-
* listing `FAVORITE` while `capabilities.favorite` is off leaves it off. This is the usual
|
|
104
|
-
* surprise, because JUMP_FORWARD and JUMP_BACKWARD default to disabled: a layout full of jump
|
|
105
|
-
* buttons silently produces none until those capabilities are turned on.
|
|
106
|
-
*
|
|
107
|
-
* With no [layout], [capabilities] does both jobs — it decides membership *and* infers positions:
|
|
108
|
-
* skip takes the primary positions, jump falls back into a primary position when its skip is
|
|
109
|
-
* disabled and otherwise sits in overflow, favorite in overflow.
|
|
110
|
-
*
|
|
111
|
-
* With a [layout], each field maps to its position — `back` to BACK, `forward` to FORWARD, every
|
|
112
|
-
* `overflow` entry to OVERFLOW in order — and disabled entries drop out. A dropped entry leaves its
|
|
113
|
-
* position empty rather than promoting anything into it: turning off one capability must not
|
|
114
|
-
* silently rearrange the row.
|
|
82
|
+
* The buttons and their positions. [capabilities] decides which buttons may exist; [layout] only
|
|
83
|
+
* arranges them, and can never add one: an entry whose Capability is disabled drops out, leaving
|
|
84
|
+
* its position empty rather than promoting another button into it.
|
|
115
85
|
*
|
|
116
|
-
*
|
|
117
|
-
*
|
|
118
|
-
* anyway — Nitro maps both an omitted and a null enum field to Kotlin `null`, so native cannot tell
|
|
119
|
-
* "leave this empty" from "derive this one".
|
|
86
|
+
* Without a [layout], skip takes BACK and FORWARD, jump takes a primary position when its skip is
|
|
87
|
+
* disabled and otherwise goes to OVERFLOW, and favorite goes to OVERFLOW.
|
|
120
88
|
*
|
|
121
|
-
* [
|
|
122
|
-
*
|
|
123
|
-
* purely cosmetic here — a button left out of the layout disappears from every screen while still
|
|
124
|
-
* responding to a headset.
|
|
89
|
+
* A [layout] is never merged with those defaults: Nitro maps an omitted and a null enum field to
|
|
90
|
+
* the same `null`, so native cannot tell "leave empty" from "derive this one".
|
|
125
91
|
*
|
|
126
|
-
*
|
|
127
|
-
*
|
|
92
|
+
* Placement is cosmetic: [capabilities] also drives the session commands, so a button left out of
|
|
93
|
+
* the layout disappears from every screen but still answers a headset.
|
|
128
94
|
*/
|
|
129
95
|
fun deriveButtonSlots(
|
|
130
96
|
capabilities: PlayerCapabilities,
|
|
@@ -145,7 +111,6 @@ fun deriveButtonSlots(
|
|
|
145
111
|
val jumpBackward = capabilities.isEnabled(Capability.JUMP_BACKWARD)
|
|
146
112
|
val jumpForward = capabilities.isEnabled(Capability.JUMP_FORWARD)
|
|
147
113
|
|
|
148
|
-
// Primary positions: skip, with jump falling back when its skip is disabled.
|
|
149
114
|
if (skipPrevious) {
|
|
150
115
|
add(SlottedButton(RemoteButton.SKIP_TO_PREVIOUS, ButtonSlot.BACK))
|
|
151
116
|
} else if (jumpBackward) {
|
|
@@ -157,7 +122,6 @@ fun deriveButtonSlots(
|
|
|
157
122
|
add(SlottedButton(RemoteButton.JUMP_FORWARD, ButtonSlot.FORWARD))
|
|
158
123
|
}
|
|
159
124
|
|
|
160
|
-
// Jump moves to overflow when skip holds the primary position.
|
|
161
125
|
if (skipPrevious && jumpBackward) {
|
|
162
126
|
add(SlottedButton(RemoteButton.JUMP_BACKWARD, ButtonSlot.OVERFLOW))
|
|
163
127
|
}
|
|
@@ -6,38 +6,27 @@ import okhttp3.Request
|
|
|
6
6
|
import okhttp3.Response
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
|
-
* Drops the caller's headers
|
|
9
|
+
* Drops the caller's headers from a redirect hop that leaves the origin the call addressed.
|
|
10
10
|
*
|
|
11
|
-
* OkHttp
|
|
12
|
-
* a
|
|
13
|
-
* still reaches whatever host the first one named. iOS forwards none across a hop and web clears
|
|
14
|
-
* them too; this brings Android in line.
|
|
11
|
+
* OkHttp's redirect follow-up removes only `Authorization`; every other configured header (an
|
|
12
|
+
* `X-Api-Key`, a cookie) would reach whichever host the redirect names. iOS and web forward none.
|
|
15
13
|
*
|
|
16
|
-
*
|
|
17
|
-
*
|
|
18
|
-
*
|
|
14
|
+
* Must be installed as a network interceptor: an application interceptor sees only the first
|
|
15
|
+
* request, not each hop. `chain.call().request()` is the call's original request, so each hop is
|
|
16
|
+
* compared against the URL the caller addressed, not the hop before it.
|
|
19
17
|
*
|
|
20
|
-
*
|
|
21
|
-
*
|
|
22
|
-
* config's headers to it — authenticated segments are a supported shape, and web does the same
|
|
23
|
-
* through Shaka's request filter. So this closes the leak of handing a credential to a host the
|
|
24
|
-
* caller never named; it is not a rule that the credential stays on one origin.
|
|
18
|
+
* Covers redirects only. An HLS segment or key fetch is its own call to the CDN URL, and
|
|
19
|
+
* [TransformingDataSource] applies the config's headers to it on purpose.
|
|
25
20
|
*/
|
|
26
21
|
internal object CrossOriginHeaderStripper : Interceptor {
|
|
27
22
|
|
|
28
23
|
/**
|
|
29
|
-
*
|
|
30
|
-
*
|
|
31
|
-
* breaks without them. Everything else on a media request came from the media config, and is the
|
|
32
|
-
* caller's to send only to the host it addressed.
|
|
24
|
+
* Lowercase names of headers OkHttp and media3 set per hop, which the request breaks without:
|
|
25
|
+
* `range` carries the seek, so dropping it restarts the read from zero.
|
|
33
26
|
*
|
|
34
|
-
* `
|
|
35
|
-
*
|
|
36
|
-
*
|
|
37
|
-
* apart. Dropping it on a hop costs the station's `icy-metaint`, so `IcyDataSource` is never
|
|
38
|
-
* installed and `onMetadata` stops firing: live "now playing" disappears on exactly the
|
|
39
|
-
* redirecting streams this interceptor exists for, and the interleaved metadata bytes stay in the
|
|
40
|
-
* audio as audible chirping. It is a request for a response format, never a credential.
|
|
27
|
+
* `icy-metadata` is media3's request for Shoutcast metadata, arriving on the DataSpec alongside
|
|
28
|
+
* the config's headers. Dropping it loses `icy-metaint`: "now playing" stops on redirected
|
|
29
|
+
* streams and the interleaved metadata bytes play as audible chirps.
|
|
41
30
|
*/
|
|
42
31
|
private val TRANSPORT_HEADERS =
|
|
43
32
|
setOf(
|
|
@@ -60,11 +49,10 @@ internal object CrossOriginHeaderStripper : Interceptor {
|
|
|
60
49
|
)
|
|
61
50
|
}
|
|
62
51
|
|
|
63
|
-
/** Scheme, host and port
|
|
52
|
+
/** Scheme, host and port: the same test web's `followMediaRedirect` applies. */
|
|
64
53
|
internal fun sameOrigin(a: HttpUrl, b: HttpUrl): Boolean =
|
|
65
54
|
a.scheme == b.scheme && a.host == b.host && a.port == b.port
|
|
66
55
|
|
|
67
|
-
/** The request with every caller-supplied header removed. */
|
|
68
56
|
internal fun stripCallerHeaders(request: Request): Request =
|
|
69
57
|
request
|
|
70
58
|
.newBuilder()
|