From 9ac4b15696bf1f22bfba3e20f76fbb90b3f3e690 Mon Sep 17 00:00:00 2001 From: Stypox Date: Wed, 5 Feb 2025 09:13:57 +0000 Subject: [PATCH] deploy: 9f83b385a4d080edcd652373b0d48b3f43fc9146 --- javadoc/allclasses-index.html | 523 +++++++++--------- javadoc/allclasses.html | 8 +- javadoc/allpackages-index.html | 4 +- javadoc/constant-values.html | 4 +- javadoc/deprecated-list.html | 4 +- javadoc/help-doc.html | 4 +- javadoc/index-all.html | 161 +++++- javadoc/index.html | 6 +- javadoc/member-search-index.js | 2 +- javadoc/member-search-index.zip | Bin 24936 -> 25517 bytes .../schabi/newpipe/extractor/Collector.html | 4 +- .../schabi/newpipe/extractor/Extractor.html | 4 +- .../extractor/Image.ResolutionLevel.html | 4 +- .../org/schabi/newpipe/extractor/Image.html | 4 +- .../org/schabi/newpipe/extractor/Info.html | 4 +- .../newpipe/extractor/InfoItem.InfoType.html | 4 +- .../schabi/newpipe/extractor/InfoItem.html | 4 +- .../newpipe/extractor/InfoItemExtractor.html | 4 +- .../newpipe/extractor/InfoItemsCollector.html | 4 +- .../ListExtractor.InfoItemsPage.html | 4 +- .../newpipe/extractor/ListExtractor.html | 4 +- .../schabi/newpipe/extractor/ListInfo.html | 4 +- .../schabi/newpipe/extractor/MediaFormat.html | 4 +- .../schabi/newpipe/extractor/MetaInfo.html | 4 +- .../extractor/MultiInfoItemsCollector.html | 4 +- .../org/schabi/newpipe/extractor/NewPipe.html | 4 +- .../org/schabi/newpipe/extractor/Page.html | 4 +- .../schabi/newpipe/extractor/ServiceList.html | 4 +- .../extractor/StreamingService.LinkType.html | 4 +- ...ngService.ServiceInfo.MediaCapability.html | 4 +- .../StreamingService.ServiceInfo.html | 4 +- .../newpipe/extractor/StreamingService.html | 4 +- .../extractor/channel/ChannelExtractor.html | 4 +- .../extractor/channel/ChannelInfo.html | 4 +- .../extractor/channel/ChannelInfoItem.html | 4 +- .../channel/ChannelInfoItemExtractor.html | 4 +- .../channel/ChannelInfoItemsCollector.html | 4 +- .../extractor/channel/package-summary.html | 4 +- .../extractor/channel/package-tree.html | 4 +- .../channel/tabs/ChannelTabExtractor.html | 4 +- .../channel/tabs/ChannelTabInfo.html | 4 +- .../extractor/channel/tabs/ChannelTabs.html | 4 +- .../channel/tabs/package-summary.html | 4 +- .../extractor/channel/tabs/package-tree.html | 4 +- .../extractor/comments/CommentsExtractor.html | 4 +- .../extractor/comments/CommentsInfo.html | 4 +- .../extractor/comments/CommentsInfoItem.html | 4 +- .../comments/CommentsInfoItemExtractor.html | 4 +- .../comments/CommentsInfoItemsCollector.html | 4 +- .../extractor/comments/package-summary.html | 4 +- .../extractor/comments/package-tree.html | 4 +- .../extractor/downloader/Downloader.html | 4 +- .../extractor/downloader/Request.Builder.html | 4 +- .../newpipe/extractor/downloader/Request.html | 4 +- .../extractor/downloader/Response.html | 4 +- .../extractor/downloader/package-summary.html | 4 +- .../extractor/downloader/package-tree.html | 4 +- .../AccountTerminatedException.Reason.html | 4 +- .../AccountTerminatedException.html | 4 +- .../AgeRestrictedContentException.html | 4 +- .../ContentNotAvailableException.html | 4 +- .../ContentNotSupportedException.html | 4 +- .../exceptions/ExtractionException.html | 4 +- .../exceptions/FoundAdException.html | 4 +- .../GeographicRestrictionException.html | 4 +- .../exceptions/PaidContentException.html | 4 +- .../exceptions/ParsingException.html | 4 +- .../exceptions/PrivateContentException.html | 4 +- .../exceptions/ReCaptchaException.html | 4 +- .../SoundCloudGoPlusContentException.html | 4 +- .../exceptions/UnsupportedTabException.html | 4 +- .../YoutubeMusicPremiumContentException.html | 4 +- .../extractor/exceptions/package-summary.html | 4 +- .../extractor/exceptions/package-tree.html | 4 +- .../newpipe/extractor/feed/FeedExtractor.html | 4 +- .../newpipe/extractor/feed/FeedInfo.html | 4 +- .../extractor/feed/package-summary.html | 4 +- .../newpipe/extractor/feed/package-tree.html | 4 +- .../extractor/kiosk/KioskExtractor.html | 4 +- .../newpipe/extractor/kiosk/KioskInfo.html | 4 +- .../KioskList.KioskExtractorFactory.html | 4 +- .../newpipe/extractor/kiosk/KioskList.html | 4 +- .../extractor/kiosk/package-summary.html | 4 +- .../newpipe/extractor/kiosk/package-tree.html | 4 +- .../extractor/linkhandler/LinkHandler.html | 4 +- .../linkhandler/LinkHandlerFactory.html | 4 +- .../linkhandler/ListLinkHandler.html | 4 +- .../linkhandler/ListLinkHandlerFactory.html | 4 +- ...inkHandler.ChannelTabExtractorBuilder.html | 4 +- .../ReadyChannelTabListLinkHandler.html | 4 +- .../linkhandler/SearchQueryHandler.html | 4 +- .../SearchQueryHandlerFactory.html | 4 +- .../linkhandler/package-summary.html | 4 +- .../extractor/linkhandler/package-tree.html | 4 +- .../localization/ContentCountry.html | 4 +- .../extractor/localization/DateWrapper.html | 4 +- .../extractor/localization/Localization.html | 4 +- .../extractor/localization/TimeAgoParser.html | 63 +-- .../localization/TimeAgoPatternsManager.html | 27 +- .../localization/package-summary.html | 4 +- .../extractor/localization/package-tree.html | 4 +- .../newpipe/extractor/package-summary.html | 4 +- .../newpipe/extractor/package-tree.html | 4 +- .../extractor/playlist/PlaylistExtractor.html | 4 +- .../playlist/PlaylistInfo.PlaylistType.html | 4 +- .../extractor/playlist/PlaylistInfo.html | 4 +- .../extractor/playlist/PlaylistInfoItem.html | 4 +- .../playlist/PlaylistInfoItemExtractor.html | 4 +- .../playlist/PlaylistInfoItemsCollector.html | 4 +- .../extractor/playlist/package-summary.html | 4 +- .../extractor/playlist/package-tree.html | 4 +- ...SearchExtractor.NothingFoundException.html | 4 +- .../extractor/search/SearchExtractor.html | 4 +- .../newpipe/extractor/search/SearchInfo.html | 4 +- .../extractor/search/package-summary.html | 4 +- .../extractor/search/package-tree.html | 4 +- .../services/bandcamp/BandcampService.html | 4 +- .../BandcampAlbumInfoItemExtractor.html | 4 +- .../extractors/BandcampChannelExtractor.html | 4 +- .../BandcampChannelInfoItemExtractor.html | 4 +- .../BandcampChannelTabExtractor.html | 4 +- .../extractors/BandcampCommentsExtractor.html | 4 +- .../BandcampCommentsInfoItemExtractor.html | 4 +- .../extractors/BandcampExtractorHelper.html | 4 +- .../extractors/BandcampFeaturedExtractor.html | 4 +- .../extractors/BandcampPlaylistExtractor.html | 4 +- .../BandcampPlaylistInfoItemExtractor.html | 4 +- ...campPlaylistInfoItemFeaturedExtractor.html | 4 +- .../extractors/BandcampRadioExtractor.html | 4 +- .../BandcampRadioInfoItemExtractor.html | 4 +- .../BandcampRadioStreamExtractor.html | 4 +- ...dcampRelatedPlaylistInfoItemExtractor.html | 4 +- .../extractors/BandcampSearchExtractor.html | 4 +- .../extractors/BandcampStreamExtractor.html | 4 +- .../BandcampSuggestionExtractor.html | 4 +- .../bandcamp/extractors/package-summary.html | 4 +- .../bandcamp/extractors/package-tree.html | 4 +- ...campDiscographStreamInfoItemExtractor.html | 4 +- ...ndcampPlaylistStreamInfoItemExtractor.html | 4 +- ...BandcampSearchStreamInfoItemExtractor.html | 4 +- .../BandcampStreamInfoItemExtractor.html | 4 +- .../streaminfoitem/package-summary.html | 4 +- .../streaminfoitem/package-tree.html | 4 +- .../BandcampChannelLinkHandlerFactory.html | 4 +- .../BandcampChannelTabLinkHandlerFactory.html | 4 +- .../BandcampCommentsLinkHandlerFactory.html | 4 +- .../BandcampFeaturedLinkHandlerFactory.html | 4 +- .../BandcampPlaylistLinkHandlerFactory.html | 4 +- .../BandcampSearchQueryHandlerFactory.html | 4 +- .../BandcampStreamLinkHandlerFactory.html | 4 +- .../bandcamp/linkHandler/package-summary.html | 4 +- .../bandcamp/linkHandler/package-tree.html | 4 +- .../services/bandcamp/package-summary.html | 4 +- .../services/bandcamp/package-tree.html | 4 +- .../services/media_ccc/MediaCCCService.html | 4 +- .../MediaCCCChannelTabExtractor.html | 4 +- .../MediaCCCConferenceExtractor.html | 4 +- .../extractors/MediaCCCConferenceKiosk.html | 4 +- .../MediaCCCLiveStreamExtractor.html | 4 +- .../extractors/MediaCCCLiveStreamKiosk.html | 4 +- .../MediaCCCLiveStreamKioskExtractor.html | 4 +- .../extractors/MediaCCCParsingHelper.html | 4 +- .../extractors/MediaCCCRecentKiosk.html | 4 +- .../MediaCCCRecentKioskExtractor.html | 4 +- .../extractors/MediaCCCSearchExtractor.html | 4 +- .../extractors/MediaCCCStreamExtractor.html | 4 +- .../MediaCCCConferenceInfoItemExtractor.html | 4 +- .../MediaCCCStreamInfoItemExtractor.html | 4 +- .../extractors/infoItems/package-summary.html | 4 +- .../extractors/infoItems/package-tree.html | 4 +- .../media_ccc/extractors/package-summary.html | 4 +- .../media_ccc/extractors/package-tree.html | 4 +- .../MediaCCCConferenceLinkHandlerFactory.html | 4 +- ...aCCCConferencesListLinkHandlerFactory.html | 4 +- .../MediaCCCLiveListLinkHandlerFactory.html | 4 +- .../MediaCCCRecentListLinkHandlerFactory.html | 4 +- .../MediaCCCSearchQueryHandlerFactory.html | 4 +- .../MediaCCCStreamLinkHandlerFactory.html | 4 +- .../linkHandler/package-summary.html | 4 +- .../media_ccc/linkHandler/package-tree.html | 4 +- .../services/media_ccc/package-summary.html | 4 +- .../services/media_ccc/package-tree.html | 4 +- .../services/peertube/PeertubeInstance.html | 4 +- .../peertube/PeertubeParsingHelper.html | 4 +- .../services/peertube/PeertubeService.html | 4 +- .../extractors/PeertubeAccountExtractor.html | 4 +- .../extractors/PeertubeChannelExtractor.html | 4 +- .../PeertubeChannelInfoItemExtractor.html | 4 +- .../PeertubeChannelTabExtractor.html | 4 +- .../extractors/PeertubeCommentsExtractor.html | 4 +- .../PeertubeCommentsInfoItemExtractor.html | 4 +- .../extractors/PeertubePlaylistExtractor.html | 4 +- .../PeertubePlaylistInfoItemExtractor.html | 4 +- .../extractors/PeertubeSearchExtractor.html | 4 +- .../PeertubeSepiaStreamInfoItemExtractor.html | 4 +- .../extractors/PeertubeStreamExtractor.html | 4 +- .../PeertubeStreamInfoItemExtractor.html | 4 +- .../PeertubeSuggestionExtractor.html | 4 +- .../extractors/PeertubeTrendingExtractor.html | 4 +- .../peertube/extractors/package-summary.html | 4 +- .../peertube/extractors/package-tree.html | 4 +- .../PeertubeChannelLinkHandlerFactory.html | 4 +- .../PeertubeChannelTabLinkHandlerFactory.html | 4 +- .../PeertubeCommentsLinkHandlerFactory.html | 4 +- .../PeertubePlaylistLinkHandlerFactory.html | 4 +- .../PeertubeSearchQueryHandlerFactory.html | 4 +- .../PeertubeStreamLinkHandlerFactory.html | 4 +- .../PeertubeTrendingLinkHandlerFactory.html | 4 +- .../peertube/linkHandler/package-summary.html | 4 +- .../peertube/linkHandler/package-tree.html | 4 +- .../services/peertube/package-summary.html | 4 +- .../services/peertube/package-tree.html | 4 +- .../soundcloud/SoundcloudParsingHelper.html | 4 +- .../soundcloud/SoundcloudService.html | 4 +- .../SoundcloudChannelExtractor.html | 4 +- .../SoundcloudChannelInfoItemExtractor.html | 4 +- .../SoundcloudChannelTabExtractor.html | 4 +- .../extractors/SoundcloudChartsExtractor.html | 4 +- .../SoundcloudCommentsExtractor.html | 4 +- .../SoundcloudCommentsInfoItemExtractor.html | 4 +- .../SoundcloudPlaylistExtractor.html | 4 +- .../SoundcloudPlaylistInfoItemExtractor.html | 4 +- .../extractors/SoundcloudSearchExtractor.html | 4 +- .../extractors/SoundcloudStreamExtractor.html | 83 +-- .../SoundcloudStreamInfoItemExtractor.html | 4 +- .../SoundcloudSubscriptionExtractor.html | 4 +- .../SoundcloudSuggestionExtractor.html | 4 +- .../extractors/package-summary.html | 4 +- .../soundcloud/extractors/package-tree.html | 4 +- .../SoundcloudChannelLinkHandlerFactory.html | 4 +- ...oundcloudChannelTabLinkHandlerFactory.html | 4 +- .../SoundcloudChartsLinkHandlerFactory.html | 4 +- .../SoundcloudCommentsLinkHandlerFactory.html | 4 +- .../SoundcloudPlaylistLinkHandlerFactory.html | 4 +- .../SoundcloudSearchQueryHandlerFactory.html | 4 +- .../SoundcloudStreamLinkHandlerFactory.html | 4 +- .../linkHandler/package-summary.html | 4 +- .../soundcloud/linkHandler/package-tree.html | 4 +- .../services/soundcloud/package-summary.html | 4 +- .../services/soundcloud/package-tree.html | 4 +- .../services/youtube/DeliveryType.html | 4 +- ...InnertubeClientRequestInfo.ClientInfo.html | 333 +++++++++++ ...InnertubeClientRequestInfo.DeviceInfo.html | 347 ++++++++++++ .../youtube/InnertubeClientRequestInfo.html | 411 ++++++++++++++ .../services/youtube/ItagItem.ItagType.html | 4 +- .../extractor/services/youtube/ItagItem.html | 4 +- .../services/youtube/PoTokenProvider.html | 402 ++++++++++++++ .../services/youtube/PoTokenResult.html | 375 +++++++++++++ ...hannelHelper.ChannelHeader.HeaderType.html | 4 +- .../YoutubeChannelHelper.ChannelHeader.html | 4 +- ...tubeChannelHelper.ChannelResponseData.html | 4 +- .../youtube/YoutubeChannelHelper.html | 4 +- .../youtube/YoutubeDescriptionHelper.html | 4 +- .../YoutubeJavaScriptPlayerManager.html | 4 +- .../youtube/YoutubeMetaInfoHelper.html | 4 +- .../youtube/YoutubeParsingHelper.html | 428 ++++++-------- .../services/youtube/YoutubeService.html | 4 +- .../services/youtube/YoutubeStreamHelper.html | 486 ++++++++++++++++ .../CreationException.html | 4 +- .../YoutubeDashManifestCreatorsUtils.html | 8 +- .../YoutubeOtfDashManifestCreator.html | 4 +- ...ePostLiveStreamDvrDashManifestCreator.html | 4 +- ...YoutubeProgressiveDashManifestCreator.html | 4 +- .../dashmanifestcreators/package-summary.html | 4 +- .../dashmanifestcreators/package-tree.html | 4 +- .../extractors/YoutubeChannelExtractor.html | 4 +- .../YoutubeChannelInfoItemExtractor.html | 4 +- ...hannelTabExtractor.VideosTabExtractor.html | 4 +- .../YoutubeChannelTabExtractor.html | 4 +- ...or.SystemPlaylistUrlCreationException.html | 4 +- .../YoutubeChannelTabPlaylistExtractor.html | 4 +- .../extractors/YoutubeCommentsExtractor.html | 4 +- .../YoutubeCommentsInfoItemExtractor.html | 4 +- .../extractors/YoutubeFeedExtractor.html | 4 +- .../YoutubeFeedInfoItemExtractor.html | 4 +- ...YoutubeMixOrPlaylistInfoItemExtractor.html | 4 +- ...eMixOrPlaylistLockupInfoItemExtractor.html | 4 +- .../YoutubeMixPlaylistExtractor.html | 4 +- ...MusicAlbumOrPlaylistInfoItemExtractor.html | 4 +- .../YoutubeMusicArtistInfoItemExtractor.html | 4 +- .../YoutubeMusicSearchExtractor.html | 4 +- ...tubeMusicSongOrVideoInfoItemExtractor.html | 4 +- .../extractors/YoutubePlaylistExtractor.html | 4 +- .../YoutubePlaylistInfoItemExtractor.html | 4 +- .../YoutubeReelInfoItemExtractor.html | 4 +- .../extractors/YoutubeSearchExtractor.html | 4 +- .../YoutubeShortsLockupInfoItemExtractor.html | 4 +- .../extractors/YoutubeStreamExtractor.html | 85 ++- .../YoutubeStreamInfoItemExtractor.html | 4 +- .../YoutubeSubscriptionExtractor.html | 4 +- .../YoutubeSuggestionExtractor.html | 4 +- .../extractors/YoutubeTrendingExtractor.html | 4 +- .../youtube/extractors/package-summary.html | 4 +- .../youtube/extractors/package-tree.html | 4 +- .../YoutubeChannelLinkHandlerFactory.html | 4 +- .../YoutubeChannelTabLinkHandlerFactory.html | 4 +- .../YoutubeCommentsLinkHandlerFactory.html | 4 +- .../YoutubePlaylistLinkHandlerFactory.html | 4 +- .../YoutubeSearchQueryHandlerFactory.html | 4 +- .../YoutubeStreamLinkHandlerFactory.html | 4 +- .../YoutubeTrendingLinkHandlerFactory.html | 4 +- .../youtube/linkHandler/package-summary.html | 4 +- .../youtube/linkHandler/package-tree.html | 4 +- .../services/youtube/package-summary.html | 44 +- .../services/youtube/package-tree.html | 15 +- .../extractor/stream/AudioStream.Builder.html | 4 +- .../newpipe/extractor/stream/AudioStream.html | 4 +- .../extractor/stream/AudioTrackType.html | 4 +- .../extractor/stream/DeliveryMethod.html | 4 +- .../newpipe/extractor/stream/Description.html | 4 +- .../newpipe/extractor/stream/Frameset.html | 4 +- .../newpipe/extractor/stream/Stream.html | 4 +- .../stream/StreamExtractor.Privacy.html | 4 +- .../extractor/stream/StreamExtractor.html | 4 +- .../StreamInfo.StreamExtractException.html | 4 +- .../newpipe/extractor/stream/StreamInfo.html | 4 +- .../extractor/stream/StreamInfoItem.html | 4 +- .../stream/StreamInfoItemExtractor.html | 4 +- .../stream/StreamInfoItemsCollector.html | 4 +- .../extractor/stream/StreamSegment.html | 4 +- .../newpipe/extractor/stream/StreamType.html | 4 +- .../stream/SubtitlesStream.Builder.html | 4 +- .../extractor/stream/SubtitlesStream.html | 4 +- .../extractor/stream/VideoStream.Builder.html | 4 +- .../newpipe/extractor/stream/VideoStream.html | 4 +- .../extractor/stream/package-summary.html | 4 +- .../extractor/stream/package-tree.html | 4 +- .../SubscriptionExtractor.ContentSource.html | 4 +- ...ptionExtractor.InvalidSourceException.html | 4 +- .../subscription/SubscriptionExtractor.html | 4 +- .../subscription/SubscriptionItem.html | 4 +- .../subscription/package-summary.html | 4 +- .../extractor/subscription/package-tree.html | 4 +- .../suggestion/SuggestionExtractor.html | 4 +- .../extractor/suggestion/package-summary.html | 4 +- .../extractor/suggestion/package-tree.html | 4 +- .../extractor/timeago/PatternsHolder.html | 4 +- .../extractor/timeago/PatternsManager.html | 4 +- .../extractor/timeago/package-summary.html | 4 +- .../extractor/timeago/package-tree.html | 4 +- .../extractor/timeago/patterns/af.html | 4 +- .../extractor/timeago/patterns/am.html | 4 +- .../extractor/timeago/patterns/ar.html | 4 +- .../extractor/timeago/patterns/az.html | 4 +- .../extractor/timeago/patterns/be.html | 4 +- .../extractor/timeago/patterns/bg.html | 4 +- .../extractor/timeago/patterns/bn.html | 4 +- .../extractor/timeago/patterns/bs.html | 4 +- .../extractor/timeago/patterns/ca.html | 4 +- .../extractor/timeago/patterns/cs.html | 4 +- .../extractor/timeago/patterns/da.html | 4 +- .../extractor/timeago/patterns/de.html | 4 +- .../extractor/timeago/patterns/el.html | 4 +- .../extractor/timeago/patterns/en.html | 4 +- .../extractor/timeago/patterns/en_GB.html | 4 +- .../extractor/timeago/patterns/es.html | 4 +- .../extractor/timeago/patterns/es_419.html | 4 +- .../extractor/timeago/patterns/es_US.html | 4 +- .../extractor/timeago/patterns/et.html | 4 +- .../extractor/timeago/patterns/eu.html | 4 +- .../extractor/timeago/patterns/fa.html | 4 +- .../extractor/timeago/patterns/fi.html | 4 +- .../extractor/timeago/patterns/fil.html | 4 +- .../extractor/timeago/patterns/fr.html | 4 +- .../extractor/timeago/patterns/fr_CA.html | 4 +- .../extractor/timeago/patterns/gl.html | 4 +- .../extractor/timeago/patterns/gu.html | 4 +- .../extractor/timeago/patterns/hi.html | 4 +- .../extractor/timeago/patterns/hr.html | 4 +- .../extractor/timeago/patterns/hu.html | 4 +- .../extractor/timeago/patterns/hy.html | 4 +- .../extractor/timeago/patterns/id.html | 4 +- .../extractor/timeago/patterns/is.html | 4 +- .../extractor/timeago/patterns/it.html | 4 +- .../extractor/timeago/patterns/iw.html | 4 +- .../extractor/timeago/patterns/ja.html | 4 +- .../extractor/timeago/patterns/ka.html | 4 +- .../extractor/timeago/patterns/kk.html | 4 +- .../extractor/timeago/patterns/km.html | 4 +- .../extractor/timeago/patterns/kn.html | 4 +- .../extractor/timeago/patterns/ko.html | 4 +- .../extractor/timeago/patterns/ky.html | 4 +- .../extractor/timeago/patterns/lo.html | 4 +- .../extractor/timeago/patterns/lt.html | 4 +- .../extractor/timeago/patterns/lv.html | 4 +- .../extractor/timeago/patterns/mk.html | 4 +- .../extractor/timeago/patterns/ml.html | 4 +- .../extractor/timeago/patterns/mn.html | 4 +- .../extractor/timeago/patterns/mr.html | 4 +- .../extractor/timeago/patterns/ms.html | 4 +- .../extractor/timeago/patterns/my.html | 4 +- .../extractor/timeago/patterns/ne.html | 4 +- .../extractor/timeago/patterns/nl.html | 4 +- .../extractor/timeago/patterns/no.html | 4 +- .../extractor/timeago/patterns/pa.html | 4 +- .../timeago/patterns/package-summary.html | 4 +- .../timeago/patterns/package-tree.html | 4 +- .../extractor/timeago/patterns/pl.html | 4 +- .../extractor/timeago/patterns/pt.html | 4 +- .../extractor/timeago/patterns/pt_PT.html | 4 +- .../extractor/timeago/patterns/ro.html | 4 +- .../extractor/timeago/patterns/ru.html | 4 +- .../extractor/timeago/patterns/si.html | 4 +- .../extractor/timeago/patterns/sk.html | 4 +- .../extractor/timeago/patterns/sl.html | 4 +- .../extractor/timeago/patterns/sq.html | 4 +- .../extractor/timeago/patterns/sr.html | 4 +- .../extractor/timeago/patterns/sr_Latn.html | 4 +- .../extractor/timeago/patterns/sv.html | 4 +- .../extractor/timeago/patterns/sw.html | 4 +- .../extractor/timeago/patterns/ta.html | 4 +- .../extractor/timeago/patterns/te.html | 4 +- .../extractor/timeago/patterns/th.html | 4 +- .../extractor/timeago/patterns/tr.html | 4 +- .../extractor/timeago/patterns/uk.html | 4 +- .../extractor/timeago/patterns/ur.html | 4 +- .../extractor/timeago/patterns/uz.html | 4 +- .../extractor/timeago/patterns/vi.html | 4 +- .../extractor/timeago/patterns/zh_CN.html | 4 +- .../extractor/timeago/patterns/zh_HK.html | 4 +- .../extractor/timeago/patterns/zh_TW.html | 4 +- .../extractor/timeago/patterns/zu.html | 4 +- .../extractor/utils/ExtractorHelper.html | 4 +- .../newpipe/extractor/utils/ImageSuffix.html | 4 +- .../newpipe/extractor/utils/JavaScript.html | 4 +- .../newpipe/extractor/utils/JsonUtils.html | 4 +- .../newpipe/extractor/utils/LocaleCompat.html | 4 +- .../extractor/utils/ManifestCreatorCache.html | 4 +- .../schabi/newpipe/extractor/utils/Pair.html | 4 +- .../utils/Parser.RegexException.html | 4 +- .../newpipe/extractor/utils/Parser.html | 4 +- .../newpipe/extractor/utils/ProtoBuilder.html | 4 +- .../RandomStringFromAlphabetGenerator.html | 4 +- .../schabi/newpipe/extractor/utils/Utils.html | 4 +- .../jsextractor/JavaScriptExtractor.html | 4 +- .../utils/jsextractor/Lexer.ParsedToken.html | 4 +- .../extractor/utils/jsextractor/Lexer.html | 4 +- .../extractor/utils/jsextractor/Token.html | 4 +- .../utils/jsextractor/package-summary.html | 4 +- .../utils/jsextractor/package-tree.html | 4 +- .../extractor/utils/package-summary.html | 4 +- .../newpipe/extractor/utils/package-tree.html | 4 +- javadoc/overview-summary.html | 2 +- javadoc/overview-tree.html | 10 +- javadoc/package-search-index.zip | Bin 490 -> 490 bytes javadoc/serialized-form.html | 4 +- javadoc/type-search-index.js | 2 +- javadoc/type-search-index.zip | Bin 2640 -> 2705 bytes 448 files changed, 4016 insertions(+), 1497 deletions(-) create mode 100644 javadoc/org/schabi/newpipe/extractor/services/youtube/InnertubeClientRequestInfo.ClientInfo.html create mode 100644 javadoc/org/schabi/newpipe/extractor/services/youtube/InnertubeClientRequestInfo.DeviceInfo.html create mode 100644 javadoc/org/schabi/newpipe/extractor/services/youtube/InnertubeClientRequestInfo.html create mode 100644 javadoc/org/schabi/newpipe/extractor/services/youtube/PoTokenProvider.html create mode 100644 javadoc/org/schabi/newpipe/extractor/services/youtube/PoTokenResult.html create mode 100644 javadoc/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamHelper.html diff --git a/javadoc/allclasses-index.html b/javadoc/allclasses-index.html index 4099206e0..2b601b7cb 100644 --- a/javadoc/allclasses-index.html +++ b/javadoc/allclasses-index.html @@ -3,7 +3,7 @@ -All Classes (NewPipeExtractor v0.24.4) +All Classes (NewPipeExtractor v0.24.5) @@ -21,13 +21,13 @@ + + + + + + + + + +
+ +
+ +
+
+
Package org.schabi.newpipe.extractor.services.youtube
+

Class InnertubeClientRequestInfo.ClientInfo

+
+
+
    +
  • java.lang.Object
    • +
  • +
      +
    • org.schabi.newpipe.extractor.services.youtube.InnertubeClientRequestInfo.ClientInfo
      • +
    +
    • +
+
+
    +
  • +
    +
    Enclosing class:
    +
    InnertubeClientRequestInfo
    +
    +
    +
    public static final class InnertubeClientRequestInfo.ClientInfo
+extends java.lang.Object
    +
    • +
+
+
+
    +
  • + +
    + +
    + +
    +
      +
    • + + +

      Method Summary

      +
        +
      • + + +

        Methods inherited from class java.lang.Object

        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
        • +
      +
      • +
    +
    +
    • +
+
+
+
    +
  • + +
    +
      +
    • + + +

      Field Detail

      + + + +
        +
      • +

        clientName

        +
        @Nonnull
+public java.lang.String clientName
        +
        • +
      + + + +
        +
      • +

        clientVersion

        +
        @Nonnull
+public java.lang.String clientVersion
        +
        • +
      + + + +
        +
      • +

        clientScreen

        +
        @Nonnull
+public java.lang.String clientScreen
        +
        • +
      + + + +
        +
      • +

        clientId

        +
        @Nullable
+public java.lang.String clientId
        +
        • +
      + + + +
        +
      • +

        visitorData

        +
        @Nullable
+public java.lang.String visitorData
        +
        • +
      +
      • +
    +
    +
    • +
+
+
+
+ + + + diff --git a/javadoc/org/schabi/newpipe/extractor/services/youtube/InnertubeClientRequestInfo.DeviceInfo.html b/javadoc/org/schabi/newpipe/extractor/services/youtube/InnertubeClientRequestInfo.DeviceInfo.html new file mode 100644 index 000000000..c53cc589f --- /dev/null +++ b/javadoc/org/schabi/newpipe/extractor/services/youtube/InnertubeClientRequestInfo.DeviceInfo.html @@ -0,0 +1,347 @@ + + + + + +InnertubeClientRequestInfo.DeviceInfo (NewPipeExtractor v0.24.5) + + + + + + + + + + + + + + +
+ +
+ +
+
+
Package org.schabi.newpipe.extractor.services.youtube
+

Class InnertubeClientRequestInfo.DeviceInfo

+
+
+
    +
  • java.lang.Object
    • +
  • +
      +
    • org.schabi.newpipe.extractor.services.youtube.InnertubeClientRequestInfo.DeviceInfo
      • +
    +
    • +
+
+
    +
  • +
    +
    Enclosing class:
    +
    InnertubeClientRequestInfo
    +
    +
    +
    public static final class InnertubeClientRequestInfo.DeviceInfo
+extends java.lang.Object
    +
    • +
+
+
+
    +
  • + +
    + +
    + +
    +
      +
    • + + +

      Method Summary

      +
        +
      • + + +

        Methods inherited from class java.lang.Object

        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
        • +
      +
      • +
    +
    +
    • +
+
+
+
    +
  • + +
    +
      +
    • + + +

      Field Detail

      + + + +
        +
      • +

        platform

        +
        @Nonnull
+public java.lang.String platform
        +
        • +
      + + + +
        +
      • +

        deviceMake

        +
        @Nullable
+public java.lang.String deviceMake
        +
        • +
      + + + +
        +
      • +

        deviceModel

        +
        @Nullable
+public java.lang.String deviceModel
        +
        • +
      + + + +
        +
      • +

        osName

        +
        @Nullable
+public java.lang.String osName
        +
        • +
      + + + +
        +
      • +

        osVersion

        +
        @Nullable
+public java.lang.String osVersion
        +
        • +
      + + + +
        +
      • +

        androidSdkVersion

        +
        public int androidSdkVersion
        +
        • +
      +
      • +
    +
    +
    • +
+
+
+
+ + + + diff --git a/javadoc/org/schabi/newpipe/extractor/services/youtube/InnertubeClientRequestInfo.html b/javadoc/org/schabi/newpipe/extractor/services/youtube/InnertubeClientRequestInfo.html new file mode 100644 index 000000000..25c535375 --- /dev/null +++ b/javadoc/org/schabi/newpipe/extractor/services/youtube/InnertubeClientRequestInfo.html @@ -0,0 +1,411 @@ + + + + + +InnertubeClientRequestInfo (NewPipeExtractor v0.24.5) + + + + + + + + + + + + + + +
+ +
+ +
+
+
Package org.schabi.newpipe.extractor.services.youtube
+

Class InnertubeClientRequestInfo

+
+
+
    +
  • java.lang.Object
    • +
  • +
      +
    • org.schabi.newpipe.extractor.services.youtube.InnertubeClientRequestInfo
      • +
    +
    • +
+
+
    +
  • +
    +
    public final class InnertubeClientRequestInfo
+extends java.lang.Object
    +
    • +
+
+
+ +
+
+ +
+
+
+ + + + diff --git a/javadoc/org/schabi/newpipe/extractor/services/youtube/ItagItem.ItagType.html b/javadoc/org/schabi/newpipe/extractor/services/youtube/ItagItem.ItagType.html index 4a3728cef..4a3ecd84c 100644 --- a/javadoc/org/schabi/newpipe/extractor/services/youtube/ItagItem.ItagType.html +++ b/javadoc/org/schabi/newpipe/extractor/services/youtube/ItagItem.ItagType.html @@ -3,7 +3,7 @@ -ItagItem.ItagType (NewPipeExtractor v0.24.4) +ItagItem.ItagType (NewPipeExtractor v0.24.5) @@ -21,7 +21,7 @@ + + + + + + + + + +
+ +
+ +
+
+
Package org.schabi.newpipe.extractor.services.youtube
+

Interface PoTokenProvider

+
+
+
+
    +
  • +
    +
    public interface PoTokenProvider
    +
    Interface to provide poTokens to YouTube player requests. + +

    + On some major clients, YouTube requires that the integrity of the device passes some checks to + allow playback. +

    + +

    + These checks involve running codes to verify the integrity and using their result to generate + one or multiple poToken(s) (which stands for proof of origin token(s)). +

    + +

    + These tokens may have a role in triggering the sign in requirement. +

    + +

    + If an implementation does not want to return a poToken for a specific client, it must + return null. +

    + +

    + Implementations of this interface are expected to be thread-safe, as they may be accessed by + multiple threads. +

    +
    • +
+
+
+ +
+
+
    +
  • + +
    +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getWebClientPoToken

        +
        @Nullable
+PoTokenResult getWebClientPoToken​(java.lang.String videoId)
        +
        Get a PoTokenResult specific to the desktop website, a.k.a. the WEB InnerTube client. + +

        + To be generated and valid, poTokens from this client must be generated using Google's + BotGuard machine, which requires a JavaScript engine with a good DOM implementation. They + must be added to adaptive/DASH streaming URLs with the pot parameter. +

        + +

        + Note that YouTube desktop website generates two poTokens: + - one for the player requests poTokens, using the videoId as the minter value; + - one for the streaming URLs, using a visitor data for logged-out users as the minter value. +

        +
        +
        Returns:
        +
        a PoTokenResult specific to the WEB InnerTube client
        +
        +
        • +
      + + + +
        +
      • +

        getWebEmbedClientPoToken

        +
        @Nullable
+PoTokenResult getWebEmbedClientPoToken​(java.lang.String videoId)
        +
        Get a PoTokenResult specific to the web embeds, a.k.a. the WEB_EMBEDDED_PLAYER + InnerTube client. + +

        + To be generated and valid, poTokens from this client must be generated using Google's + BotGuard machine, which requires a JavaScript engine with a good DOM implementation. They + should be added to adaptive/DASH streaming URLs with the pot parameter. +

        + +

        + As of writing, like the YouTube desktop website previously did, it generates only one + poToken, sent in player requests and streaming URLs, using a visitor data for + logged-out users. poTokens do not seem to be mandatory for now on this client. +

        +
        +
        Returns:
        +
        a PoTokenResult specific to the WEB_EMBEDDED_PLAYER InnerTube client
        +
        +
        • +
      + + + +
        +
      • +

        getAndroidClientPoToken

        +
        @Nullable
+PoTokenResult getAndroidClientPoToken​(java.lang.String videoId)
        +
        Get a PoTokenResult specific to the Android app, a.k.a. the ANDROID InnerTube client. + +

        + Implementation details are not known, the app uses DroidGuard, a downloaded native virtual + machine ran by Google Play Services for which its code is updated pretty frequently. +

        + +

        + As of writing, DroidGuard seem to check for the Android app signature and package ID, as + non-rooted YouTube patched with reVanced doesn't work without spoofing another InnerTube + client while the rooted version works without any client spoofing. +

        + +

        + There should be only one poToken needed for the player requests, it shouldn't be + required for regular adaptive URLs (i.e. not server adaptive bitrate (SABR) URLs). HLS + formats returned (only for premieres and running and post-live livestreams) in the client's + HLS manifest URL should work without poTokens. +

        +
        +
        Returns:
        +
        a PoTokenResult specific to the ANDROID InnerTube client
        +
        +
        • +
      + + + +
        +
      • +

        getIosClientPoToken

        +
        @Nullable
+PoTokenResult getIosClientPoToken​(java.lang.String videoId)
        +
        Get a PoTokenResult specific to the iOS app, a.k.a. the IOS InnerTube client. + +

        + Implementation details are not known, the app seem to use something called iosGuard which + should be similar to Android's DroidGuard. It may rely on Apple's attestation APIs. +

        + +

        + As of writing, there should be only one poToken needed for the player requests, it + shouldn't be required for regular adaptive URLs (i.e. not server adaptive bitrate (SABR) + URLs). HLS formats returned in the client's HLS manifest URL should also work without a + poToken. +

        +
        +
        Returns:
        +
        a PoTokenResult specific to the IOS InnerTube client
        +
        +
        • +
      +
      • +
    +
    +
    • +
+
+
+
+ + + + diff --git a/javadoc/org/schabi/newpipe/extractor/services/youtube/PoTokenResult.html b/javadoc/org/schabi/newpipe/extractor/services/youtube/PoTokenResult.html new file mode 100644 index 000000000..e0cc47d59 --- /dev/null +++ b/javadoc/org/schabi/newpipe/extractor/services/youtube/PoTokenResult.html @@ -0,0 +1,375 @@ + + + + + +PoTokenResult (NewPipeExtractor v0.24.5) + + + + + + + + + + + + + + +
+ +
+ +
+
+
Package org.schabi.newpipe.extractor.services.youtube
+

Class PoTokenResult

+
+
+
    +
  • java.lang.Object
    • +
  • +
      +
    • org.schabi.newpipe.extractor.services.youtube.PoTokenResult
      • +
    +
    • +
+
+
    +
  • +
    +
    public final class PoTokenResult
+extends java.lang.Object
    +
    The result of a supported/successful poToken extraction request by a + PoTokenProvider.
    +
    • +
+
+
+
    +
  • + +
    +
      +
    • + + +

      Field Summary

      + + + + + + + + + + + + + + + + + + + + + + +
      Fields 
      Modifier and TypeFieldDescription
      java.lang.StringplayerRequestPoToken +
      The poToken of a player request, a Protobuf object encoded as a base 64 string.
      +
      java.lang.StringstreamingDataPoToken +
      The poToken to be appended to streaming URLs, a Protobuf object encoded as a base + 64 string.
      +
      java.lang.StringvisitorData +
      The visitor data associated with a poToken.
      +
      +
      • +
    +
    + +
    +
      +
    • + + +

      Constructor Summary

      + + + + + + + + + + +
      Constructors 
      ConstructorDescription
      PoTokenResult​(java.lang.String visitorData, + java.lang.String playerRequestPoToken, + java.lang.String streamingDataPoToken) +
      Construct a PoTokenResult instance.
      +
      +
      • +
    +
    + +
    +
      +
    • + + +

      Method Summary

      +
        +
      • + + +

        Methods inherited from class java.lang.Object

        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
        • +
      +
      • +
    +
    +
    • +
+
+
+
    +
  • + +
    +
      +
    • + + +

      Field Detail

      + + + +
        +
      • +

        visitorData

        +
        @Nonnull
+public final java.lang.String visitorData
        +
        The visitor data associated with a poToken.
        +
        • +
      + + + +
        +
      • +

        playerRequestPoToken

        +
        @Nonnull
+public final java.lang.String playerRequestPoToken
        +
        The poToken of a player request, a Protobuf object encoded as a base 64 string.
        +
        • +
      + + + +
        +
      • +

        streamingDataPoToken

        +
        @Nullable
+public final java.lang.String streamingDataPoToken
        +
        The poToken to be appended to streaming URLs, a Protobuf object encoded as a base + 64 string. + +

        + It may be required on some clients such as HTML5 ones and may also differ from the player + request poToken. +

        +
        • +
      +
      • +
    +
    + +
    +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        PoTokenResult

        +
        public PoTokenResult​(@Nonnull
+                     java.lang.String visitorData,
+                     @Nonnull
+                     java.lang.String playerRequestPoToken,
+                     @Nullable
+                     java.lang.String streamingDataPoToken)
        +
        Construct a PoTokenResult instance.
        +
        +
        Parameters:
        +
        visitorData - see visitorData
        +
        playerRequestPoToken - see playerRequestPoToken
        +
        streamingDataPoToken - see streamingDataPoToken
        +
        Throws:
        +
        java.lang.NullPointerException - if a non-null parameter is null
        +
        +
        • +
      +
      • +
    +
    +
    • +
+
+
+
+ + + + diff --git a/javadoc/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelHelper.ChannelHeader.HeaderType.html b/javadoc/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelHelper.ChannelHeader.HeaderType.html index 8d72f91f0..222c23c4a 100644 --- a/javadoc/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelHelper.ChannelHeader.HeaderType.html +++ b/javadoc/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelHelper.ChannelHeader.HeaderType.html @@ -3,7 +3,7 @@ -YoutubeChannelHelper.ChannelHeader.HeaderType (NewPipeExtractor v0.24.4) +YoutubeChannelHelper.ChannelHeader.HeaderType (NewPipeExtractor v0.24.5) @@ -21,7 +21,7 @@ + + + + + + + + + +
+ +
+ +
+
+
Package org.schabi.newpipe.extractor.services.youtube
+

Class YoutubeStreamHelper

+
+
+
    +
  • java.lang.Object
    • +
  • +
      +
    • org.schabi.newpipe.extractor.services.youtube.YoutubeStreamHelper
      • +
    +
    • +
+
+
    +
  • +
    +
    public final class YoutubeStreamHelper
+extends java.lang.Object
    +
    • +
+
+
+ +
+
+
    +
  • + +
    +
      +
    • + + +

      Method Detail

      + + + +
        +
      • +

        getWebMetadataPlayerResponse

        +
        @Nonnull
+public static com.grack.nanojson.JsonObject getWebMetadataPlayerResponse​(@Nonnull
+                                                                         Localization localization,
+                                                                         @Nonnull
+                                                                         ContentCountry contentCountry,
+                                                                         @Nonnull
+                                                                         java.lang.String videoId)
+                                                                  throws java.io.IOException,
+                                                                         ExtractionException
        +
        +
        Throws:
        +
        java.io.IOException
        +
        ExtractionException
        +
        +
        • +
      + + + +
        +
      • +

        getTvHtml5PlayerResponse

        +
        @Nonnull
+public static com.grack.nanojson.JsonObject getTvHtml5PlayerResponse​(@Nonnull
+                                                                     Localization localization,
+                                                                     @Nonnull
+                                                                     ContentCountry contentCountry,
+                                                                     @Nonnull
+                                                                     java.lang.String videoId,
+                                                                     @Nonnull
+                                                                     java.lang.String cpn,
+                                                                     int signatureTimestamp)
+                                                              throws java.io.IOException,
+                                                                     ExtractionException
        +
        +
        Throws:
        +
        java.io.IOException
        +
        ExtractionException
        +
        +
        • +
      + + + +
        +
      • +

        getWebFullPlayerResponse

        +
        @Nonnull
+public static com.grack.nanojson.JsonObject getWebFullPlayerResponse​(@Nonnull
+                                                                     Localization localization,
+                                                                     @Nonnull
+                                                                     ContentCountry contentCountry,
+                                                                     @Nonnull
+                                                                     java.lang.String videoId,
+                                                                     @Nonnull
+                                                                     java.lang.String cpn,
+                                                                     @Nonnull
+                                                                     PoTokenResult webPoTokenResult,
+                                                                     int signatureTimestamp)
+                                                              throws java.io.IOException,
+                                                                     ExtractionException
        +
        +
        Throws:
        +
        java.io.IOException
        +
        ExtractionException
        +
        +
        • +
      + + + +
        +
      • +

        getWebEmbeddedPlayerResponse

        +
        @Nonnull
+public static com.grack.nanojson.JsonObject getWebEmbeddedPlayerResponse​(@Nonnull
+                                                                         Localization localization,
+                                                                         @Nonnull
+                                                                         ContentCountry contentCountry,
+                                                                         @Nonnull
+                                                                         java.lang.String videoId,
+                                                                         @Nonnull
+                                                                         java.lang.String cpn,
+                                                                         @Nullable
+                                                                         PoTokenResult webEmbeddedPoTokenResult,
+                                                                         int signatureTimestamp)
+                                                                  throws java.io.IOException,
+                                                                         ExtractionException
        +
        +
        Throws:
        +
        java.io.IOException
        +
        ExtractionException
        +
        +
        • +
      + + + +
        +
      • +

        getAndroidPlayerResponse

        +
        public static com.grack.nanojson.JsonObject getAndroidPlayerResponse​(@Nonnull
+                                                                     ContentCountry contentCountry,
+                                                                     @Nonnull
+                                                                     Localization localization,
+                                                                     @Nonnull
+                                                                     java.lang.String videoId,
+                                                                     @Nonnull
+                                                                     java.lang.String cpn,
+                                                                     @Nonnull
+                                                                     PoTokenResult androidPoTokenResult)
+                                                              throws java.io.IOException,
+                                                                     ExtractionException
        +
        +
        Throws:
        +
        java.io.IOException
        +
        ExtractionException
        +
        +
        • +
      + + + +
        +
      • +

        getAndroidReelPlayerResponse

        +
        public static com.grack.nanojson.JsonObject getAndroidReelPlayerResponse​(@Nonnull
+                                                                         ContentCountry contentCountry,
+                                                                         @Nonnull
+                                                                         Localization localization,
+                                                                         @Nonnull
+                                                                         java.lang.String videoId,
+                                                                         @Nonnull
+                                                                         java.lang.String cpn)
+                                                                  throws java.io.IOException,
+                                                                         ExtractionException
        +
        +
        Throws:
        +
        java.io.IOException
        +
        ExtractionException
        +
        +
        • +
      + + + +
        +
      • +

        getIosPlayerResponse

        +
        public static com.grack.nanojson.JsonObject getIosPlayerResponse​(@Nonnull
+                                                                 ContentCountry contentCountry,
+                                                                 @Nonnull
+                                                                 Localization localization,
+                                                                 @Nonnull
+                                                                 java.lang.String videoId,
+                                                                 @Nonnull
+                                                                 java.lang.String cpn,
+                                                                 @Nullable
+                                                                 PoTokenResult iosPoTokenResult)
+                                                          throws java.io.IOException,
+                                                                 ExtractionException
        +
        +
        Throws:
        +
        java.io.IOException
        +
        ExtractionException
        +
        +
        • +
      +
      • +
    +
    +
    • +
+
+
+
+ + + + diff --git a/javadoc/org/schabi/newpipe/extractor/services/youtube/dashmanifestcreators/CreationException.html b/javadoc/org/schabi/newpipe/extractor/services/youtube/dashmanifestcreators/CreationException.html index 449685c21..8c218e24f 100644 --- a/javadoc/org/schabi/newpipe/extractor/services/youtube/dashmanifestcreators/CreationException.html +++ b/javadoc/org/schabi/newpipe/extractor/services/youtube/dashmanifestcreators/CreationException.html @@ -3,7 +3,7 @@ -CreationException (NewPipeExtractor v0.24.4) +CreationException (NewPipeExtractor v0.24.5) @@ -21,7 +21,7 @@