defaultRequestProperties) {
+ inner.setDefaultRequestProperties(defaultRequestProperties);
return this;
}
- /**
- * Sets the user agent that will be used.
- *
- * The default is {@code null}, which causes the default user agent of the underlying
- * platform to be used.
- *
- * @param userAgent The user agent that will be used, or {@code null} to use the default user
- * agent of the underlying platform.
- * @return This factory.
- */
- public NiconicoLiveHttpDataSource.Factory setUserAgent(@Nullable String userAgent) {
- this.userAgent = userAgent;
+ public Factory setUserAgent(@Nullable final String userAgent) {
+ inner.setUserAgent(userAgent);
return this;
}
- /**
- * Sets the connect timeout, in milliseconds.
- *
- *
The default is {@link PurifiedHttpDataSource#DEFAULT_CONNECT_TIMEOUT_MILLIS}.
- *
- * @param connectTimeoutMs The connect timeout, in milliseconds, that will be used.
- * @return This factory.
- */
- public NiconicoLiveHttpDataSource.Factory setConnectTimeoutMs(int connectTimeoutMs) {
- this.connectTimeoutMs = connectTimeoutMs;
+ public Factory setConnectTimeoutMs(final int connectTimeoutMs) {
+ inner.setConnectTimeoutMs(connectTimeoutMs);
return this;
}
- /**
- * Sets the read timeout, in milliseconds.
- *
- *
The default is {@link PurifiedHttpDataSource#DEFAULT_READ_TIMEOUT_MILLIS}.
- *
- * @param readTimeoutMs The connect timeout, in milliseconds, that will be used.
- * @return This factory.
- */
- public NiconicoLiveHttpDataSource.Factory setReadTimeoutMs(int readTimeoutMs) {
- this.readTimeoutMs = readTimeoutMs;
+ public Factory setReadTimeoutMs(final int readTimeoutMs) {
+ inner.setReadTimeoutMs(readTimeoutMs);
return this;
}
- /**
- * Sets whether to allow cross protocol redirects.
- *
- *
The default is {@code false}.
- *
- * @param allowCrossProtocolRedirects Whether to allow cross protocol redirects.
- * @return This factory.
- */
- public NiconicoLiveHttpDataSource.Factory setAllowCrossProtocolRedirects(boolean allowCrossProtocolRedirects) {
- this.allowCrossProtocolRedirects = allowCrossProtocolRedirects;
+ public Factory setAllowCrossProtocolRedirects(final boolean allowCrossProtocolRedirects) {
+ inner.setAllowCrossProtocolRedirects(allowCrossProtocolRedirects);
return this;
}
- /**
- * Sets a content type {@link Predicate}. If a content type is rejected by the predicate then a
- * {@link HttpDataSource.InvalidContentTypeException} is thrown from {@link
- * PurifiedHttpDataSource#open(DataSpec)}.
- *
- *
The default is {@code null}.
- *
- * @param contentTypePredicate The content type {@link Predicate}, or {@code null} to clear a
- * predicate that was previously set.
- * @return This factory.
- */
- public NiconicoLiveHttpDataSource.Factory setContentTypePredicate(@Nullable Predicate contentTypePredicate) {
- this.contentTypePredicate = contentTypePredicate;
+ public Factory setContentTypePredicate(@Nullable final Predicate predicate) {
+ inner.setContentTypePredicate(predicate);
return this;
}
- /**
- * Sets the {@link TransferListener} that will be used.
- *
- * The default is {@code null}.
- *
- *
See {@link DataSource#addTransferListener(TransferListener)}.
- *
- * @param transferListener The listener that will be used.
- * @return This factory.
- */
- public NiconicoLiveHttpDataSource.Factory setTransferListener(@Nullable TransferListener transferListener) {
- this.transferListener = transferListener;
+ public Factory setTransferListener(@Nullable final TransferListener transferListener) {
+ inner.setTransferListener(transferListener);
return this;
}
- /**
- * Sets whether we should keep the POST method and body when we have HTTP 302 redirects for a
- * POST request.
- */
- public NiconicoLiveHttpDataSource.Factory setKeepPostFor302Redirects(boolean keepPostFor302Redirects) {
- this.keepPostFor302Redirects = keepPostFor302Redirects;
+ public Factory setKeepPostFor302Redirects(final boolean keepPostFor302Redirects) {
+ inner.setKeepPostFor302Redirects(keepPostFor302Redirects);
return this;
}
@Override
public NiconicoLiveHttpDataSource createDataSource() {
- NiconicoLiveHttpDataSource dataSource =
- new NiconicoLiveHttpDataSource(
- userAgent,
- connectTimeoutMs,
- readTimeoutMs,
- allowCrossProtocolRedirects,
- defaultRequestProperties,
- contentTypePredicate,
- keepPostFor302Redirects,
- url);
- if (transferListener != null) {
- dataSource.addTransferListener(transferListener);
- }
- return dataSource;
+ return new NiconicoLiveHttpDataSource(inner.createDataSource(), url);
}
}
- NiconicoLiveHttpDataSource(@Nullable String userAgent, int connectTimeoutMillis, int readTimeoutMillis, boolean allowCrossProtocolRedirects, @Nullable RequestProperties defaultRequestProperties
- , @Nullable Predicate contentTypePredicate, boolean keepPostFor302Redirects, String liveUrl) {
- super(userAgent, connectTimeoutMillis, readTimeoutMillis, allowCrossProtocolRedirects, defaultRequestProperties, contentTypePredicate, keepPostFor302Redirects);
+
+ NiconicoLiveHttpDataSource(final HttpDataSource delegate, final String liveUrl) {
+ super(delegate);
this.liveUrl = liveUrl;
}
+
@Override
- public long open(DataSpec dataSpec) throws HttpDataSourceException
- {
+ public long open(final DataSpec dataSpec) throws HttpDataSourceException {
// String fetchUrl = dataSpec.uri.toString();
// int type = 0;
// List anonStrings = Arrays.asList("anonymous-user-", "anonymous_user_", "ht2_nicolive=");
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/NonUriHlsPlaylistParserFactory.java b/app/src/main/java/org/schabi/newpipe/player/helper/NonUriHlsPlaylistParserFactory.java
index a3a25fd1df..aee0d5ff46 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/NonUriHlsPlaylistParserFactory.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/NonUriHlsPlaylistParserFactory.java
@@ -5,11 +5,11 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist;
-import com.google.android.exoplayer2.source.hls.playlist.HlsMultivariantPlaylist;
-import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylist;
-import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistParserFactory;
-import com.google.android.exoplayer2.upstream.ParsingLoadable;
+import androidx.media3.exoplayer.hls.playlist.HlsMediaPlaylist;
+import androidx.media3.exoplayer.hls.playlist.HlsMultivariantPlaylist;
+import androidx.media3.exoplayer.hls.playlist.HlsPlaylist;
+import androidx.media3.exoplayer.hls.playlist.HlsPlaylistParserFactory;
+import androidx.media3.exoplayer.upstream.ParsingLoadable;
import java.io.IOException;
import java.io.InputStream;
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerDataSource.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerDataSource.java
index 0217153e3f..fa9c4d1039 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerDataSource.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerDataSource.java
@@ -3,24 +3,24 @@
import android.content.Context;
import android.net.Uri;
-import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.source.ProgressiveMediaSource;
-import com.google.android.exoplayer2.source.SingleSampleMediaSource;
-import com.google.android.exoplayer2.source.dash.DashMediaSource;
-import com.google.android.exoplayer2.source.dash.DefaultDashChunkSource;
-import com.google.android.exoplayer2.source.hls.HlsMediaSource;
-import com.google.android.exoplayer2.source.hls.DefaultHlsExtractorFactory;
-import com.google.android.exoplayer2.source.hls.playlist.DefaultHlsPlaylistTracker;
-import com.google.android.exoplayer2.source.smoothstreaming.DefaultSsChunkSource;
-import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource;
-import com.google.android.exoplayer2.extractor.ts.DefaultTsPayloadReaderFactory;
-import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.DefaultDataSource;
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;
-import com.google.android.exoplayer2.upstream.DefaultLoadErrorHandlingPolicy;
-import com.google.android.exoplayer2.upstream.ResolvingDataSource;
-import com.google.android.exoplayer2.upstream.TransferListener;
-import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
+import androidx.media3.exoplayer.source.MediaSource;
+import androidx.media3.exoplayer.source.ProgressiveMediaSource;
+import androidx.media3.exoplayer.source.SingleSampleMediaSource;
+import androidx.media3.exoplayer.dash.DashMediaSource;
+import androidx.media3.exoplayer.dash.DefaultDashChunkSource;
+import androidx.media3.exoplayer.hls.HlsMediaSource;
+import androidx.media3.exoplayer.hls.DefaultHlsExtractorFactory;
+import androidx.media3.exoplayer.hls.playlist.DefaultHlsPlaylistTracker;
+import androidx.media3.exoplayer.smoothstreaming.DefaultSsChunkSource;
+import androidx.media3.exoplayer.smoothstreaming.SsMediaSource;
+import androidx.media3.extractor.ts.DefaultTsPayloadReaderFactory;
+import androidx.media3.datasource.DataSource;
+import androidx.media3.datasource.DefaultDataSource;
+import androidx.media3.datasource.DefaultHttpDataSource;
+import androidx.media3.exoplayer.upstream.DefaultLoadErrorHandlingPolicy;
+import androidx.media3.datasource.ResolvingDataSource;
+import androidx.media3.datasource.TransferListener;
+import androidx.media3.datasource.cache.CacheDataSource;
import com.grack.nanojson.JsonObject;
import com.grack.nanojson.JsonParser;
import com.grack.nanojson.JsonParserException;
@@ -48,7 +48,7 @@
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistParserFactory;
+import androidx.media3.exoplayer.hls.playlist.HlsPlaylistParserFactory;
import org.schabi.newpipe.extractor.services.youtube.dashmanifestcreators.YoutubeOtfDashManifestCreator;
import org.schabi.newpipe.extractor.services.youtube.dashmanifestcreators.YoutubePostLiveStreamDvrDashManifestCreator;
@@ -117,10 +117,11 @@ public HlsMediaSource.Factory getLiveHlsMediaSourceFactory() {
return new HlsMediaSource.Factory(cachelessDataSourceFactory)
.setAllowChunklessPreparation(true)
.setPlaylistTrackerFactory((dataSourceFactory, loadErrorHandlingPolicy,
- playlistParserFactory) ->
+ playlistParserFactory, cmcdConfiguration,
+ downloadExecutorSupplier) ->
new DefaultHlsPlaylistTracker(dataSourceFactory, loadErrorHandlingPolicy,
- playlistParserFactory,
- PLAYLIST_STUCK_TARGET_DURATION_COEFFICIENT));
+ playlistParserFactory, cmcdConfiguration,
+ PLAYLIST_STUCK_TARGET_DURATION_COEFFICIENT, downloadExecutorSupplier));
}
public DashMediaSource.Factory getLiveDashMediaSourceFactory() {
@@ -257,10 +258,12 @@ public HlsMediaSource.Factory getNicoLiveHlsMediaSourceFactory(String liveUrl) {
return new HlsMediaSource.Factory(newFactory)
.setAllowChunklessPreparation(true)
.setPlaylistTrackerFactory((dataSourceFactory, loadErrorHandlingPolicy,
- playlistParserFactory) ->
+ playlistParserFactory, cmcdConfiguration,
+ downloadExecutorSupplier) ->
new DefaultHlsPlaylistTracker(dataSourceFactory, loadErrorHandlingPolicy,
- playlistParserFactory,
- PLAYLIST_STUCK_TARGET_DURATION_COEFFICIENT)).setLoadErrorHandlingPolicy(new DefaultLoadErrorHandlingPolicy());
+ playlistParserFactory, cmcdConfiguration,
+ PLAYLIST_STUCK_TARGET_DURATION_COEFFICIENT, downloadExecutorSupplier))
+ .setLoadErrorHandlingPolicy(new DefaultLoadErrorHandlingPolicy());
}
// BiliBiliMediaSourceFactories
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
index 91258be878..b2c2778a77 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
@@ -1,8 +1,8 @@
package org.schabi.newpipe.player.helper;
-import static com.google.android.exoplayer2.Player.REPEAT_MODE_ALL;
-import static com.google.android.exoplayer2.Player.REPEAT_MODE_OFF;
-import static com.google.android.exoplayer2.Player.REPEAT_MODE_ONE;
+import static androidx.media3.common.Player.REPEAT_MODE_ALL;
+import static androidx.media3.common.Player.REPEAT_MODE_OFF;
+import static androidx.media3.common.Player.REPEAT_MODE_ONE;
import static org.schabi.newpipe.extractor.stream.AudioStream.UNKNOWN_BITRATE;
import static org.schabi.newpipe.extractor.stream.VideoStream.RESOLUTION_UNKNOWN;
import static org.schabi.newpipe.player.Player.IDLE_WINDOW_FLAGS;
@@ -33,16 +33,16 @@
import androidx.core.content.ContextCompat;
import androidx.preference.PreferenceManager;
-import com.google.android.exoplayer2.PlaybackParameters;
-import com.google.android.exoplayer2.Player.RepeatMode;
-import com.google.android.exoplayer2.SeekParameters;
-import com.google.android.exoplayer2.source.ProgressiveMediaSource;
-import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
-import com.google.android.exoplayer2.trackselection.ExoTrackSelection;
-import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
-import com.google.android.exoplayer2.ui.AspectRatioFrameLayout.ResizeMode;
-import com.google.android.exoplayer2.ui.CaptionStyleCompat;
-import com.google.android.exoplayer2.util.MimeTypes;
+import androidx.media3.common.PlaybackParameters;
+import androidx.media3.common.Player.RepeatMode;
+import androidx.media3.exoplayer.SeekParameters;
+import androidx.media3.exoplayer.source.ProgressiveMediaSource;
+import androidx.media3.exoplayer.trackselection.AdaptiveTrackSelection;
+import androidx.media3.exoplayer.trackselection.ExoTrackSelection;
+import androidx.media3.ui.AspectRatioFrameLayout;
+import androidx.media3.ui.AspectRatioFrameLayout.ResizeMode;
+import androidx.media3.ui.CaptionStyleCompat;
+import androidx.media3.common.MimeTypes;
import org.schabi.newpipe.R;
import org.schabi.newpipe.extractor.InfoItem;
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java
index b853cb37f6..33390b078b 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java
@@ -8,8 +8,8 @@
import android.util.Log;
import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.PlaybackException;
-import com.google.android.exoplayer2.PlaybackParameters;
+import androidx.media3.common.PlaybackException;
+import androidx.media3.common.PlaybackParameters;
import org.schabi.newpipe.App;
import org.schabi.newpipe.MainActivity;
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PurifiedDataSource.java b/app/src/main/java/org/schabi/newpipe/player/helper/PurifiedDataSource.java
index 903405c3af..c76a5163c6 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PurifiedDataSource.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PurifiedDataSource.java
@@ -20,19 +20,19 @@
import android.net.Uri;
import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.upstream.AssetDataSource;
-import com.google.android.exoplayer2.upstream.ContentDataSource;
-import com.google.android.exoplayer2.upstream.DataSchemeDataSource;
-import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.DataSpec;
-import com.google.android.exoplayer2.upstream.FileDataSource;
-import com.google.android.exoplayer2.upstream.HttpDataSource;
-import com.google.android.exoplayer2.upstream.RawResourceDataSource;
-import com.google.android.exoplayer2.upstream.TransferListener;
-import com.google.android.exoplayer2.upstream.UdpDataSource;
-import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.Log;
-import com.google.android.exoplayer2.util.Util;
+import androidx.media3.datasource.AssetDataSource;
+import androidx.media3.datasource.ContentDataSource;
+import androidx.media3.datasource.DataSchemeDataSource;
+import androidx.media3.datasource.DataSource;
+import androidx.media3.datasource.DataSpec;
+import androidx.media3.datasource.FileDataSource;
+import androidx.media3.datasource.HttpDataSource;
+import androidx.media3.datasource.RawResourceDataSource;
+import androidx.media3.datasource.TransferListener;
+import androidx.media3.datasource.UdpDataSource;
+import androidx.media3.common.util.Assertions;
+import androidx.media3.common.util.Log;
+import androidx.media3.common.util.Util;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
@@ -331,7 +331,7 @@ private DataSource getContentDataSource() {
private DataSource getRtmpDataSource() {
if (rtmpDataSource == null) {
try {
- Class clazz = Class.forName("com.google.android.exoplayer2.ext.rtmp.RtmpDataSource");
+ Class clazz = Class.forName("androidx.media3.datasource.rtmp.RtmpDataSource");
rtmpDataSource = (DataSource) clazz.getConstructor().newInstance();
addListenersToDataSource(rtmpDataSource);
} catch (ClassNotFoundException e) {
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PurifiedHttpDataSource.java b/app/src/main/java/org/schabi/newpipe/player/helper/PurifiedHttpDataSource.java
index 6fc957fcc5..162145dc9f 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PurifiedHttpDataSource.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PurifiedHttpDataSource.java
@@ -1,182 +1,139 @@
package org.schabi.newpipe.player.helper;
+import android.net.Uri;
+
import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.metadata.icy.IcyHeaders;
-import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.DataSpec;
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;
-import com.google.android.exoplayer2.upstream.HttpDataSource;
-import com.google.android.exoplayer2.upstream.TransferListener;
+import androidx.media3.datasource.DataSpec;
+import androidx.media3.datasource.DefaultHttpDataSource;
+import androidx.media3.datasource.HttpDataSource;
+import androidx.media3.datasource.TransferListener;
+import androidx.media3.extractor.metadata.icy.IcyHeaders;
import com.google.common.base.Predicate;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
-public class PurifiedHttpDataSource extends DefaultHttpDataSource {
- public static class Factory implements HttpDataSource.Factory {
+/**
+ * media3 makes {@link DefaultHttpDataSource}'s constructor private, so we can no longer subclass it.
+ * We wrap one instead and only intercept {@link #open(DataSpec)} to drop the ICY metadata-enable
+ * header. Subclasses (NiconicoLive) override {@code open} and call {@code super.open}.
+ */
+public class PurifiedHttpDataSource implements HttpDataSource {
+ public static final int DEFAULT_CONNECT_TIMEOUT_MILLIS =
+ DefaultHttpDataSource.DEFAULT_CONNECT_TIMEOUT_MILLIS;
+ public static final int DEFAULT_READ_TIMEOUT_MILLIS =
+ DefaultHttpDataSource.DEFAULT_READ_TIMEOUT_MILLIS;
+
+ protected final HttpDataSource delegate;
+
+ protected PurifiedHttpDataSource(final HttpDataSource delegate) {
+ this.delegate = delegate;
+ }
- private final RequestProperties defaultRequestProperties;
-
- @Nullable
- private TransferListener transferListener;
- @Nullable private Predicate contentTypePredicate;
- @Nullable private String userAgent;
- private int connectTimeoutMs;
- private int readTimeoutMs;
- private boolean allowCrossProtocolRedirects;
- private boolean keepPostFor302Redirects;
-
- /** Creates an instance. */
- public Factory() {
- defaultRequestProperties = new RequestProperties();
- connectTimeoutMs = DEFAULT_CONNECT_TIMEOUT_MILLIS;
- readTimeoutMs = DEFAULT_READ_TIMEOUT_MILLIS;
- }
+ @Override
+ public long open(final DataSpec dataSpec) throws HttpDataSourceException {
+ final Map headers = new HashMap<>(dataSpec.httpRequestHeaders);
+ headers.remove(IcyHeaders.REQUEST_HEADER_ENABLE_METADATA_NAME);
+ return delegate.open(dataSpec.withRequestHeaders(headers));
+ }
+
+ @Override
+ public int read(final byte[] buffer, final int offset, final int length)
+ throws HttpDataSourceException {
+ return delegate.read(buffer, offset, length);
+ }
+
+ @Override
+ public void addTransferListener(final TransferListener transferListener) {
+ delegate.addTransferListener(transferListener);
+ }
+
+ @Nullable
+ @Override
+ public Uri getUri() {
+ return delegate.getUri();
+ }
+
+ @Override
+ public Map> getResponseHeaders() {
+ return delegate.getResponseHeaders();
+ }
+
+ @Override
+ public void close() throws HttpDataSourceException {
+ delegate.close();
+ }
+
+ @Override
+ public void setRequestProperty(final String name, final String value) {
+ delegate.setRequestProperty(name, value);
+ }
+
+ @Override
+ public void clearRequestProperty(final String name) {
+ delegate.clearRequestProperty(name);
+ }
+
+ @Override
+ public void clearAllRequestProperties() {
+ delegate.clearAllRequestProperties();
+ }
+
+ @Override
+ public int getResponseCode() {
+ return delegate.getResponseCode();
+ }
+
+ public static class Factory implements HttpDataSource.Factory {
+ protected final DefaultHttpDataSource.Factory inner = new DefaultHttpDataSource.Factory();
@Override
- public final PurifiedHttpDataSource.Factory setDefaultRequestProperties(Map defaultRequestProperties) {
- this.defaultRequestProperties.clearAndSet(defaultRequestProperties);
+ public final Factory setDefaultRequestProperties(
+ final Map defaultRequestProperties) {
+ inner.setDefaultRequestProperties(defaultRequestProperties);
return this;
}
- /**
- * Sets the user agent that will be used.
- *
- * The default is {@code null}, which causes the default user agent of the underlying
- * platform to be used.
- *
- * @param userAgent The user agent that will be used, or {@code null} to use the default user
- * agent of the underlying platform.
- * @return This factory.
- */
- public PurifiedHttpDataSource.Factory setUserAgent(@Nullable String userAgent) {
- this.userAgent = userAgent;
+ public Factory setUserAgent(@Nullable final String userAgent) {
+ inner.setUserAgent(userAgent);
return this;
}
- /**
- * Sets the connect timeout, in milliseconds.
- *
- *
The default is {@link PurifiedHttpDataSource#DEFAULT_CONNECT_TIMEOUT_MILLIS}.
- *
- * @param connectTimeoutMs The connect timeout, in milliseconds, that will be used.
- * @return This factory.
- */
- public PurifiedHttpDataSource.Factory setConnectTimeoutMs(int connectTimeoutMs) {
- this.connectTimeoutMs = connectTimeoutMs;
+ public Factory setConnectTimeoutMs(final int connectTimeoutMs) {
+ inner.setConnectTimeoutMs(connectTimeoutMs);
return this;
}
- /**
- * Sets the read timeout, in milliseconds.
- *
- *
The default is {@link PurifiedHttpDataSource#DEFAULT_READ_TIMEOUT_MILLIS}.
- *
- * @param readTimeoutMs The connect timeout, in milliseconds, that will be used.
- * @return This factory.
- */
- public PurifiedHttpDataSource.Factory setReadTimeoutMs(int readTimeoutMs) {
- this.readTimeoutMs = readTimeoutMs;
+ public Factory setReadTimeoutMs(final int readTimeoutMs) {
+ inner.setReadTimeoutMs(readTimeoutMs);
return this;
}
- /**
- * Sets whether to allow cross protocol redirects.
- *
- *
The default is {@code false}.
- *
- * @param allowCrossProtocolRedirects Whether to allow cross protocol redirects.
- * @return This factory.
- */
- public PurifiedHttpDataSource.Factory setAllowCrossProtocolRedirects(boolean allowCrossProtocolRedirects) {
- this.allowCrossProtocolRedirects = allowCrossProtocolRedirects;
+ public Factory setAllowCrossProtocolRedirects(final boolean allowCrossProtocolRedirects) {
+ inner.setAllowCrossProtocolRedirects(allowCrossProtocolRedirects);
return this;
}
- /**
- * Sets a content type {@link Predicate}. If a content type is rejected by the predicate then a
- * {@link HttpDataSource.InvalidContentTypeException} is thrown from {@link
- * PurifiedHttpDataSource#open(DataSpec)}.
- *
- *
The default is {@code null}.
- *
- * @param contentTypePredicate The content type {@link Predicate}, or {@code null} to clear a
- * predicate that was previously set.
- * @return This factory.
- */
- public PurifiedHttpDataSource.Factory setContentTypePredicate(@Nullable Predicate contentTypePredicate) {
- this.contentTypePredicate = contentTypePredicate;
+ public Factory setContentTypePredicate(@Nullable final Predicate predicate) {
+ inner.setContentTypePredicate(predicate);
return this;
}
- /**
- * Sets the {@link TransferListener} that will be used.
- *
- * The default is {@code null}.
- *
- *
See {@link DataSource#addTransferListener(TransferListener)}.
- *
- * @param transferListener The listener that will be used.
- * @return This factory.
- */
- public PurifiedHttpDataSource.Factory setTransferListener(@Nullable TransferListener transferListener) {
- this.transferListener = transferListener;
+ public Factory setTransferListener(@Nullable final TransferListener transferListener) {
+ inner.setTransferListener(transferListener);
return this;
}
- /**
- * Sets whether we should keep the POST method and body when we have HTTP 302 redirects for a
- * POST request.
- */
- public PurifiedHttpDataSource.Factory setKeepPostFor302Redirects(boolean keepPostFor302Redirects) {
- this.keepPostFor302Redirects = keepPostFor302Redirects;
+ public Factory setKeepPostFor302Redirects(final boolean keepPostFor302Redirects) {
+ inner.setKeepPostFor302Redirects(keepPostFor302Redirects);
return this;
}
@Override
public PurifiedHttpDataSource createDataSource() {
- PurifiedHttpDataSource dataSource =
- new PurifiedHttpDataSource(
- userAgent,
- connectTimeoutMs,
- readTimeoutMs,
- allowCrossProtocolRedirects,
- defaultRequestProperties,
- contentTypePredicate,
- keepPostFor302Redirects);
- if (transferListener != null) {
- dataSource.addTransferListener(transferListener);
- }
- return dataSource;
+ return new PurifiedHttpDataSource(inner.createDataSource());
}
}
- PurifiedHttpDataSource(
- @Nullable String userAgent,
- int connectTimeoutMillis,
- int readTimeoutMillis,
- boolean allowCrossProtocolRedirects,
- @Nullable RequestProperties defaultRequestProperties,
- @Nullable Predicate contentTypePredicate,
- boolean keepPostFor302Redirects) {
- super(
- userAgent,
- connectTimeoutMillis,
- readTimeoutMillis,
- allowCrossProtocolRedirects,
- defaultRequestProperties
- );
- }
-
- @Override
- public long open(DataSpec dataSpec) throws HttpDataSourceException
- {
- final Map m1 = dataSpec.httpRequestHeaders;
- final Map m2 = new HashMap<>();
- for (Map.Entry entry : m1.entrySet())
- if(!entry.getKey().equals(IcyHeaders.REQUEST_HEADER_ENABLE_METADATA_NAME))
- m2.put(entry.getKey(), entry.getValue());
-
- return super.open(dataSpec.withRequestHeaders(m2));
- }
}
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/YoutubeDashLiveManifestParser.java b/app/src/main/java/org/schabi/newpipe/player/helper/YoutubeDashLiveManifestParser.java
index 00f5de071c..efaf5c91d7 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/YoutubeDashLiveManifestParser.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/YoutubeDashLiveManifestParser.java
@@ -5,12 +5,12 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.source.dash.manifest.DashManifest;
-import com.google.android.exoplayer2.source.dash.manifest.DashManifestParser;
-import com.google.android.exoplayer2.source.dash.manifest.Period;
-import com.google.android.exoplayer2.source.dash.manifest.ProgramInformation;
-import com.google.android.exoplayer2.source.dash.manifest.ServiceDescriptionElement;
-import com.google.android.exoplayer2.source.dash.manifest.UtcTimingElement;
+import androidx.media3.exoplayer.dash.manifest.DashManifest;
+import androidx.media3.exoplayer.dash.manifest.DashManifestParser;
+import androidx.media3.exoplayer.dash.manifest.Period;
+import androidx.media3.exoplayer.dash.manifest.ProgramInformation;
+import androidx.media3.exoplayer.dash.manifest.ServiceDescriptionElement;
+import androidx.media3.exoplayer.dash.manifest.UtcTimingElement;
import java.util.List;
diff --git a/app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserPlaybackPreparer.kt b/app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserPlaybackPreparer.kt
index 129f248875..044e7b4b4c 100644
--- a/app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserPlaybackPreparer.kt
+++ b/app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserPlaybackPreparer.kt
@@ -3,11 +3,9 @@ package org.schabi.newpipe.player.mediabrowser
import android.content.Context
import android.net.Uri
import android.os.Bundle
-import android.os.ResultReceiver
import android.support.v4.media.session.PlaybackStateCompat
import android.util.Log
-import com.google.android.exoplayer2.Player
-import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector.PlaybackPreparer
+import org.schabi.newpipe.player.mediasession.PlaybackPreparer
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.core.Single
import io.reactivex.rxjava3.disposables.Disposable
@@ -94,15 +92,6 @@ class MediaBrowserPlaybackPreparer(
override fun onPrepareFromUri(uri: Uri, playWhenReady: Boolean, extras: Bundle?) {
onUnsupportedError()
}
-
- override fun onCommand(
- player: Player,
- command: String,
- extras: Bundle?,
- cb: ResultReceiver?
- ): Boolean {
- return false
- }
//endregion
//region Errors
diff --git a/app/src/main/java/org/schabi/newpipe/player/mediaitem/MediaItemTag.java b/app/src/main/java/org/schabi/newpipe/player/mediaitem/MediaItemTag.java
index d23dd4574c..1e00e2b8f8 100644
--- a/app/src/main/java/org/schabi/newpipe/player/mediaitem/MediaItemTag.java
+++ b/app/src/main/java/org/schabi/newpipe/player/mediaitem/MediaItemTag.java
@@ -2,10 +2,10 @@
import android.net.Uri;
-import com.google.android.exoplayer2.MediaItem;
-import com.google.android.exoplayer2.MediaItem.RequestMetadata;
-import com.google.android.exoplayer2.MediaMetadata;
-import com.google.android.exoplayer2.Player;
+import androidx.media3.common.MediaItem;
+import androidx.media3.common.MediaItem.RequestMetadata;
+import androidx.media3.common.MediaMetadata;
+import androidx.media3.common.Player;
import org.schabi.newpipe.extractor.stream.StreamInfo;
import org.schabi.newpipe.extractor.stream.StreamType;
diff --git a/app/src/main/java/org/schabi/newpipe/player/mediaitem/StreamInfoTag.java b/app/src/main/java/org/schabi/newpipe/player/mediaitem/StreamInfoTag.java
index 4095f2bc88..f2ed6dc138 100644
--- a/app/src/main/java/org/schabi/newpipe/player/mediaitem/StreamInfoTag.java
+++ b/app/src/main/java/org/schabi/newpipe/player/mediaitem/StreamInfoTag.java
@@ -1,6 +1,6 @@
package org.schabi.newpipe.player.mediaitem;
-import com.google.android.exoplayer2.MediaItem;
+import androidx.media3.common.MediaItem;
import org.schabi.newpipe.extractor.stream.StreamInfo;
import org.schabi.newpipe.extractor.stream.StreamType;
diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueueNavigator.java b/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueueNavigator.java
deleted file mode 100644
index 92cd425c5f..0000000000
--- a/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueueNavigator.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.schabi.newpipe.player.mediasession;
-
-import android.os.Bundle;
-import android.os.ResultReceiver;
-import android.support.v4.media.session.MediaSessionCompat;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector;
-import com.google.android.exoplayer2.util.Util;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static android.support.v4.media.session.PlaybackStateCompat.ACTION_SKIP_TO_NEXT;
-import static android.support.v4.media.session.PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS;
-import static android.support.v4.media.session.PlaybackStateCompat.ACTION_SKIP_TO_QUEUE_ITEM;
-
-public class PlayQueueNavigator implements MediaSessionConnector.QueueNavigator {
- public static final int DEFAULT_MAX_QUEUE_SIZE = 10;
-
- private final MediaSessionCompat mediaSession;
- private final MediaSessionCallback callback;
- private final int maxQueueSize;
-
- private long activeQueueItemId;
-
- public PlayQueueNavigator(@NonNull final MediaSessionCompat mediaSession,
- @NonNull final MediaSessionCallback callback) {
- this.mediaSession = mediaSession;
- this.callback = callback;
- this.maxQueueSize = DEFAULT_MAX_QUEUE_SIZE;
-
- this.activeQueueItemId = MediaSessionCompat.QueueItem.UNKNOWN_ID;
- }
-
- @Override
- public long getSupportedQueueNavigatorActions(@Nullable final Player player) {
- return ACTION_SKIP_TO_NEXT | ACTION_SKIP_TO_PREVIOUS | ACTION_SKIP_TO_QUEUE_ITEM;
- }
-
- @Override
- public void onTimelineChanged(@NonNull final Player player) {
- publishFloatingQueueWindow();
- }
-
- @Override
- public void onCurrentMediaItemIndexChanged(@NonNull final Player player) {
- if (activeQueueItemId == MediaSessionCompat.QueueItem.UNKNOWN_ID
- || player.getCurrentTimeline().getWindowCount() > maxQueueSize) {
- publishFloatingQueueWindow();
- } else if (!player.getCurrentTimeline().isEmpty()) {
- activeQueueItemId = player.getCurrentMediaItemIndex();
- }
- }
-
- @Override
- public long getActiveQueueItemId(@Nullable final Player player) {
- return callback.getCurrentPlayingIndex();
- }
-
- @Override
- public void onSkipToPrevious(@NonNull final Player player) {
- callback.playPrevious();
- }
-
- @Override
- public void onSkipToQueueItem(@NonNull final Player player, final long id) {
- callback.playItemAtIndex((int) id);
- }
-
- @Override
- public void onSkipToNext(@NonNull final Player player) {
- callback.playNext();
- }
-
- private void publishFloatingQueueWindow() {
- if (callback.getQueueSize() == 0) {
- mediaSession.setQueue(Collections.emptyList());
- activeQueueItemId = MediaSessionCompat.QueueItem.UNKNOWN_ID;
- return;
- }
-
- // Yes this is almost a copypasta, got a problem with that? =\
- final int windowCount = callback.getQueueSize();
- final int currentWindowIndex = callback.getCurrentPlayingIndex();
- final int queueSize = Math.min(maxQueueSize, windowCount);
- final int startIndex = Util.constrainValue(currentWindowIndex - ((queueSize - 1) / 2), 0,
- windowCount - queueSize);
-
- final List queue = new ArrayList<>();
- for (int i = startIndex; i < startIndex + queueSize; i++) {
- queue.add(new MediaSessionCompat.QueueItem(callback.getQueueMetadata(i), i));
- }
- mediaSession.setQueue(queue);
- activeQueueItemId = currentWindowIndex;
- }
-
- @Override
- public boolean onCommand(@NonNull final Player player,
- @NonNull final String command,
- @Nullable final Bundle extras,
- @Nullable final ResultReceiver cb) {
- return false;
- }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasession/PlaybackPreparer.java b/app/src/main/java/org/schabi/newpipe/player/mediasession/PlaybackPreparer.java
new file mode 100644
index 0000000000..8be402b782
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/player/mediasession/PlaybackPreparer.java
@@ -0,0 +1,22 @@
+package org.schabi.newpipe.player.mediasession;
+
+import android.net.Uri;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+/**
+ * Replacement for ExoPlayer's removed {@code MediaSessionConnector.PlaybackPreparer}: lets the
+ * media browser (Android Auto) turn a media id / search / uri into actual playback.
+ */
+public interface PlaybackPreparer {
+ long getSupportedPrepareActions();
+
+ void onPrepare(boolean playWhenReady);
+
+ void onPrepareFromMediaId(String mediaId, boolean playWhenReady, @Nullable Bundle extras);
+
+ void onPrepareFromSearch(String query, boolean playWhenReady, @Nullable Bundle extras);
+
+ void onPrepareFromUri(Uri uri, boolean playWhenReady, @Nullable Bundle extras);
+}
diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java b/app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java
index 8aad356d0a..9e00cf3a7d 100644
--- a/app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java
+++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java
@@ -2,15 +2,15 @@
import android.util.Log;
-import com.google.android.exoplayer2.MediaItem;
-import com.google.android.exoplayer2.PlaybackException;
-import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.source.BaseMediaSource;
-import com.google.android.exoplayer2.source.MediaPeriod;
-import com.google.android.exoplayer2.source.SilenceMediaSource;
-import com.google.android.exoplayer2.source.SinglePeriodTimeline;
-import com.google.android.exoplayer2.upstream.Allocator;
-import com.google.android.exoplayer2.upstream.TransferListener;
+import androidx.media3.common.MediaItem;
+import androidx.media3.common.PlaybackException;
+import androidx.media3.common.Timeline;
+import androidx.media3.exoplayer.source.BaseMediaSource;
+import androidx.media3.exoplayer.source.MediaPeriod;
+import androidx.media3.exoplayer.source.SilenceMediaSource;
+import androidx.media3.exoplayer.source.SinglePeriodTimeline;
+import androidx.media3.exoplayer.upstream.Allocator;
+import androidx.media3.datasource.TransferListener;
import org.schabi.newpipe.player.mediaitem.ExceptionTag;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
@@ -120,10 +120,10 @@ protected void prepareSourceInternal(@Nullable final TransferListener mediaTrans
* If the error is not known, e.g. network issue, then the exception is not swallowed here in
* {@link FailedMediaSource}. The exception is then propagated to the player, which
* {@link org.schabi.newpipe.player.Player Player} can react to inside
- * {@link com.google.android.exoplayer2.Player.Listener#onPlayerError(PlaybackException)}.
+ * {@link androidx.media3.common.Player.Listener#onPlayerError(PlaybackException)}.
*
* @throws IOException An error which will always result in
- * {@link com.google.android.exoplayer2.PlaybackException#ERROR_CODE_IO_UNSPECIFIED}.
+ * {@link androidx.media3.common.PlaybackException#ERROR_CODE_IO_UNSPECIFIED}.
*/
@Override
public void maybeThrowSourceInfoRefreshError() throws IOException {
diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java b/app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java
index 95524cf692..2832be7fa6 100644
--- a/app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java
+++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java
@@ -1,12 +1,12 @@
package org.schabi.newpipe.player.mediasource;
-import com.google.android.exoplayer2.MediaItem;
-import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.source.CompositeMediaSource;
-import com.google.android.exoplayer2.source.MediaPeriod;
-import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.upstream.Allocator;
-import com.google.android.exoplayer2.upstream.TransferListener;
+import androidx.media3.common.MediaItem;
+import androidx.media3.common.Timeline;
+import androidx.media3.exoplayer.source.CompositeMediaSource;
+import androidx.media3.exoplayer.source.MediaPeriod;
+import androidx.media3.exoplayer.source.MediaSource;
+import androidx.media3.exoplayer.upstream.Allocator;
+import androidx.media3.datasource.TransferListener;
import org.schabi.newpipe.player.mediaitem.MediaItemTag;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSource.java b/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSource.java
index 9d6b948937..f60bd49815 100644
--- a/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSource.java
+++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSource.java
@@ -2,7 +2,7 @@
import androidx.annotation.NonNull;
-import com.google.android.exoplayer2.source.MediaSource;
+import androidx.media3.exoplayer.source.MediaSource;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSourcePlaylist.java b/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSourcePlaylist.java
index 4c03807672..46335fd075 100644
--- a/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSourcePlaylist.java
+++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSourcePlaylist.java
@@ -5,8 +5,8 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
-import com.google.android.exoplayer2.source.ShuffleOrder;
+import androidx.media3.exoplayer.source.ConcatenatingMediaSource;
+import androidx.media3.exoplayer.source.ShuffleOrder;
import org.schabi.newpipe.player.mediaitem.MediaItemTag;
diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasource/PlaceholderMediaSource.java b/app/src/main/java/org/schabi/newpipe/player/mediasource/PlaceholderMediaSource.java
index 92d4403c8b..4e18edf6f1 100644
--- a/app/src/main/java/org/schabi/newpipe/player/mediasource/PlaceholderMediaSource.java
+++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/PlaceholderMediaSource.java
@@ -1,11 +1,11 @@
package org.schabi.newpipe.player.mediasource;
-import com.google.android.exoplayer2.MediaItem;
-import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.source.CompositeMediaSource;
-import com.google.android.exoplayer2.source.MediaPeriod;
-import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.upstream.Allocator;
+import androidx.media3.common.MediaItem;
+import androidx.media3.common.Timeline;
+import androidx.media3.exoplayer.source.CompositeMediaSource;
+import androidx.media3.exoplayer.source.MediaPeriod;
+import androidx.media3.exoplayer.source.MediaSource;
+import androidx.media3.exoplayer.upstream.Allocator;
import org.schabi.newpipe.player.mediaitem.PlaceholderTag;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java b/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java
index f984668276..5269771b36 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java
@@ -8,7 +8,7 @@
import androidx.annotation.Nullable;
import androidx.collection.ArraySet;
-import com.google.android.exoplayer2.source.MediaSource;
+import androidx.media3.exoplayer.source.MediaSource;
import org.reactivestreams.Subscriber;
import org.reactivestreams.Subscription;
@@ -477,7 +477,7 @@ private void onMediaSourceReceived(@NonNull final PlayQueueItem item,
/**
* Checks if the corresponding MediaSource in
- * {@link com.google.android.exoplayer2.source.ConcatenatingMediaSource}
+ * {@link androidx.media3.exoplayer.source.ConcatenatingMediaSource}
* for a given {@link PlayQueueItem} needs replacement, either due to gapless playback
* readiness or playlist desynchronization.
*
diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java b/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java
index 7376070015..e482646026 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java
@@ -3,7 +3,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.source.MediaSource;
+import androidx.media3.exoplayer.source.MediaSource;
import org.schabi.newpipe.extractor.stream.StreamInfo;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/PlayerMediaSession.java b/app/src/main/java/org/schabi/newpipe/player/playback/PlayerMediaSession.java
index cd0f377155..265c50a1c7 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playback/PlayerMediaSession.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playback/PlayerMediaSession.java
@@ -9,15 +9,15 @@
import org.schabi.newpipe.player.mediasession.MediaSessionCallback;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
-import static com.google.android.exoplayer2.Player.REPEAT_MODE_OFF;
+import static androidx.media3.common.Player.REPEAT_MODE_OFF;
import static org.schabi.newpipe.player.helper.PlayerHelper.nextRepeatMode;
public class PlayerMediaSession implements MediaSessionCallback {
public final Player player;
- private final com.google.android.exoplayer2.Player exoPlayer;
+ private final androidx.media3.common.Player exoPlayer;
public int mode = 0;
- public PlayerMediaSession(final Player player, final com.google.android.exoplayer2.Player exoPlayer) {
+ public PlayerMediaSession(final Player player, final androidx.media3.common.Player exoPlayer) {
this.player = player;
this.exoPlayer = exoPlayer;
refresh();
@@ -114,10 +114,10 @@ public void changePlayMode() {
player.onShuffleClicked();
break;
case 1: // repeat_one
- player.setRepeatMode(com.google.android.exoplayer2.Player.REPEAT_MODE_ONE);
+ player.setRepeatMode(androidx.media3.common.Player.REPEAT_MODE_ONE);
break;
case 2: // repeat_all
- player.setRepeatMode(com.google.android.exoplayer2.Player.REPEAT_MODE_ALL);
+ player.setRepeatMode(androidx.media3.common.Player.REPEAT_MODE_ALL);
break;
case 3: // repeat_none
default:
@@ -132,9 +132,9 @@ public void close(){
public void refresh(){
if (exoPlayer.getShuffleModeEnabled()) {
this.mode = 1;
- } else if (exoPlayer.getRepeatMode() == com.google.android.exoplayer2.Player.REPEAT_MODE_ONE) {
+ } else if (exoPlayer.getRepeatMode() == androidx.media3.common.Player.REPEAT_MODE_ONE) {
this.mode = 2;
- } else if (exoPlayer.getRepeatMode() == com.google.android.exoplayer2.Player.REPEAT_MODE_ALL) {
+ } else if (exoPlayer.getRepeatMode() == androidx.media3.common.Player.REPEAT_MODE_ALL) {
this.mode = 3;
} else {
this.mode = 0;
diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/SurfaceHolderCallback.java b/app/src/main/java/org/schabi/newpipe/player/playback/SurfaceHolderCallback.java
index da6cb36d4f..b02a9240d3 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playback/SurfaceHolderCallback.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playback/SurfaceHolderCallback.java
@@ -3,8 +3,8 @@
import android.content.Context;
import android.view.SurfaceHolder;
-import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.video.PlaceholderSurface;
+import androidx.media3.common.Player;
+import androidx.media3.exoplayer.video.PlaceholderSurface;
/**
* Prevent error message: 'Unrecoverable player error occurred'
diff --git a/app/src/main/java/org/schabi/newpipe/player/resolver/AudioPlaybackResolver.java b/app/src/main/java/org/schabi/newpipe/player/resolver/AudioPlaybackResolver.java
index 7e3f590078..d44b64b556 100644
--- a/app/src/main/java/org/schabi/newpipe/player/resolver/AudioPlaybackResolver.java
+++ b/app/src/main/java/org/schabi/newpipe/player/resolver/AudioPlaybackResolver.java
@@ -9,7 +9,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.source.MediaSource;
+import androidx.media3.exoplayer.source.MediaSource;
import org.schabi.newpipe.extractor.stream.AudioStream;
import org.schabi.newpipe.extractor.stream.StreamInfo;
diff --git a/app/src/main/java/org/schabi/newpipe/player/resolver/CustomDataSourceFactory.java b/app/src/main/java/org/schabi/newpipe/player/resolver/CustomDataSourceFactory.java
index 82dff6ec9b..06fe0b3656 100644
--- a/app/src/main/java/org/schabi/newpipe/player/resolver/CustomDataSourceFactory.java
+++ b/app/src/main/java/org/schabi/newpipe/player/resolver/CustomDataSourceFactory.java
@@ -4,9 +4,9 @@
import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.upstream.ByteArrayDataSource;
-import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.TransferListener;
+import androidx.media3.datasource.ByteArrayDataSource;
+import androidx.media3.datasource.DataSource;
+import androidx.media3.datasource.TransferListener;
public class CustomDataSourceFactory implements DataSource.Factory {
private final Context context;
diff --git a/app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java b/app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java
index d8d9ecb0d6..e15a73033d 100644
--- a/app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java
+++ b/app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java
@@ -6,19 +6,19 @@
import android.net.Uri;
import android.util.Log;
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.MediaItem;
-import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.source.ProgressiveMediaSource;
-import com.google.android.exoplayer2.source.dash.DashMediaSource;
-import com.google.android.exoplayer2.source.dash.manifest.DashManifest;
-import com.google.android.exoplayer2.source.dash.manifest.DashManifestParser;
-import com.google.android.exoplayer2.source.hls.HlsMediaSource;
-import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylist;
-import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistParser;
-import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource;
-import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest;
-import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifestParser;
+import androidx.media3.common.C;
+import androidx.media3.common.MediaItem;
+import androidx.media3.exoplayer.source.MediaSource;
+import androidx.media3.exoplayer.source.ProgressiveMediaSource;
+import androidx.media3.exoplayer.dash.DashMediaSource;
+import androidx.media3.exoplayer.dash.manifest.DashManifest;
+import androidx.media3.exoplayer.dash.manifest.DashManifestParser;
+import androidx.media3.exoplayer.hls.HlsMediaSource;
+import androidx.media3.exoplayer.hls.playlist.HlsPlaylist;
+import androidx.media3.exoplayer.hls.playlist.HlsPlaylistParser;
+import androidx.media3.exoplayer.smoothstreaming.SsMediaSource;
+import androidx.media3.exoplayer.smoothstreaming.manifest.SsManifest;
+import androidx.media3.exoplayer.smoothstreaming.manifest.SsManifestParser;
import com.grack.nanojson.JsonObject;
import com.grack.nanojson.JsonParser;
import com.grack.nanojson.JsonParserException;
diff --git a/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java b/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java
index 9c9324081c..ce6fef5d63 100644
--- a/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java
+++ b/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java
@@ -7,11 +7,11 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.MediaItem;
-import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.source.MergingMediaSource;
-import com.google.android.exoplayer2.source.SingleSampleMediaSource;
+import androidx.media3.common.C;
+import androidx.media3.common.MediaItem;
+import androidx.media3.exoplayer.source.MediaSource;
+import androidx.media3.exoplayer.source.MergingMediaSource;
+import androidx.media3.exoplayer.source.SingleSampleMediaSource;
import org.schabi.newpipe.extractor.MediaFormat;
import org.schabi.newpipe.extractor.stream.AudioStream;
@@ -30,7 +30,7 @@
import java.util.Optional;
import java.util.stream.Collectors;
-import static com.google.android.exoplayer2.C.TIME_UNSET;
+import static androidx.media3.common.C.TIME_UNSET;
import static org.schabi.newpipe.util.ListHelper.*;
public class VideoPlaybackResolver implements PlaybackResolver {
diff --git a/app/src/main/java/org/schabi/newpipe/views/ExpandableSurfaceView.java b/app/src/main/java/org/schabi/newpipe/views/ExpandableSurfaceView.java
index 010e1be56f..a6f43415f2 100644
--- a/app/src/main/java/org/schabi/newpipe/views/ExpandableSurfaceView.java
+++ b/app/src/main/java/org/schabi/newpipe/views/ExpandableSurfaceView.java
@@ -5,10 +5,10 @@
import android.util.AttributeSet;
import android.view.SurfaceView;
-import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
+import androidx.media3.ui.AspectRatioFrameLayout;
-import static com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_FIT;
-import static com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_ZOOM;
+import static androidx.media3.ui.AspectRatioFrameLayout.RESIZE_MODE_FIT;
+import static androidx.media3.ui.AspectRatioFrameLayout.RESIZE_MODE_ZOOM;
public class ExpandableSurfaceView extends SurfaceView {
private int resizeMode = RESIZE_MODE_FIT;
diff --git a/app/src/main/java/us/shandian/giga/hls/manifest/HlsPlaylistParser.kt b/app/src/main/java/us/shandian/giga/hls/manifest/HlsPlaylistParser.kt
index 49590671a6..5174924acb 100644
--- a/app/src/main/java/us/shandian/giga/hls/manifest/HlsPlaylistParser.kt
+++ b/app/src/main/java/us/shandian/giga/hls/manifest/HlsPlaylistParser.kt
@@ -1,13 +1,13 @@
package us.shandian.giga.hls.manifest
import android.net.Uri
-import com.google.android.exoplayer2.C
-import com.google.android.exoplayer2.Format
-import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist as ExoHlsMediaPlaylist
-import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist.Segment as ExoHlsSegment
-import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist.SegmentBase as ExoHlsSegmentBase
-import com.google.android.exoplayer2.source.hls.playlist.HlsMultivariantPlaylist as ExoHlsMultivariantPlaylist
-import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistParser as ExoHlsPlaylistParser
+import androidx.media3.common.C
+import androidx.media3.common.Format
+import androidx.media3.exoplayer.hls.playlist.HlsMediaPlaylist as ExoHlsMediaPlaylist
+import androidx.media3.exoplayer.hls.playlist.HlsMediaPlaylist.Segment as ExoHlsSegment
+import androidx.media3.exoplayer.hls.playlist.HlsMediaPlaylist.SegmentBase as ExoHlsSegmentBase
+import androidx.media3.exoplayer.hls.playlist.HlsMultivariantPlaylist as ExoHlsMultivariantPlaylist
+import androidx.media3.exoplayer.hls.playlist.HlsPlaylistParser as ExoHlsPlaylistParser
import java.io.ByteArrayInputStream
import java.io.IOException
import java.net.URI
diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_fastforward.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_fastforward.xml
new file mode 100644
index 0000000000..4b86e109e9
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_fastforward.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_enter.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_enter.xml
new file mode 100644
index 0000000000..db11f299be
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_enter.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_exit.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_exit.xml
new file mode 100644
index 0000000000..782d9ff34d
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_fullscreen_exit.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_next.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_next.xml
new file mode 100644
index 0000000000..6305bcbc90
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_next.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_pause.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_pause.xml
new file mode 100644
index 0000000000..45cd68bed6
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_pause.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_play.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_play.xml
new file mode 100644
index 0000000000..c8c4cdb127
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_play.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_previous.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_previous.xml
new file mode 100644
index 0000000000..9564a2a350
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_previous.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_repeat_all.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_repeat_all.xml
new file mode 100644
index 0000000000..dad37fa1f0
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_repeat_all.xml
@@ -0,0 +1,23 @@
+
+
+
+
diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_repeat_off.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_repeat_off.xml
new file mode 100644
index 0000000000..132eae0d76
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_repeat_off.xml
@@ -0,0 +1,23 @@
+
+
+
+
diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_repeat_one.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_repeat_one.xml
new file mode 100644
index 0000000000..d51010566a
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_repeat_one.xml
@@ -0,0 +1,23 @@
+
+
+
+
diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_rewind.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_rewind.xml
new file mode 100644
index 0000000000..976b706170
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_rewind.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_off.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_off.xml
new file mode 100644
index 0000000000..283ce30c3c
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_off.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_on.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_on.xml
new file mode 100644
index 0000000000..123c06c43e
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_shuffle_on.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
diff --git a/app/src/main/res/drawable-anydpi-v21/exo_icon_stop.xml b/app/src/main/res/drawable-anydpi-v21/exo_icon_stop.xml
new file mode 100644
index 0000000000..2e1e40cbb5
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v21/exo_icon_stop.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_all.xml b/app/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_all.xml
new file mode 100644
index 0000000000..dad37fa1f0
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_all.xml
@@ -0,0 +1,23 @@
+
+
+
+
diff --git a/app/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_off.xml b/app/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_off.xml
new file mode 100644
index 0000000000..132eae0d76
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_off.xml
@@ -0,0 +1,23 @@
+
+
+
+
diff --git a/app/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_one.xml b/app/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_one.xml
new file mode 100644
index 0000000000..d51010566a
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi-v21/exo_media_action_repeat_one.xml
@@ -0,0 +1,23 @@
+
+
+
+
diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_circular_play.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_circular_play.png
new file mode 100644
index 0000000000..ecf3df3cb1
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_circular_play.png differ
diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_fastforward.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_fastforward.png
new file mode 100644
index 0000000000..5699614c6b
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_fastforward.png differ
diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_fullscreen_enter.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_fullscreen_enter.png
new file mode 100644
index 0000000000..9b8131124d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_fullscreen_enter.png differ
diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_fullscreen_exit.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_fullscreen_exit.png
new file mode 100644
index 0000000000..159bea7fd8
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_fullscreen_exit.png differ
diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_next.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_next.png
new file mode 100644
index 0000000000..303e896187
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_next.png differ
diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_pause.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_pause.png
new file mode 100644
index 0000000000..f49aed7571
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_pause.png differ
diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_play.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_play.png
new file mode 100644
index 0000000000..5a3e037ae9
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_play.png differ
diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_previous.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_previous.png
new file mode 100644
index 0000000000..2c3b3af982
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_previous.png differ
diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_repeat_all.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_repeat_all.png
new file mode 100644
index 0000000000..2824e7847c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_repeat_all.png differ
diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_repeat_off.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_repeat_off.png
new file mode 100644
index 0000000000..0b92f583da
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_repeat_off.png differ
diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_repeat_one.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_repeat_one.png
new file mode 100644
index 0000000000..232aa2b1cd
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_repeat_one.png differ
diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_rewind.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_rewind.png
new file mode 100644
index 0000000000..d9e279231a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_rewind.png differ
diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_shuffle_off.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_shuffle_off.png
new file mode 100644
index 0000000000..b693422db7
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_shuffle_off.png differ
diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_shuffle_on.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_shuffle_on.png
new file mode 100644
index 0000000000..52a805aac1
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_shuffle_on.png differ
diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_stop.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_stop.png
new file mode 100644
index 0000000000..3ad2c9c4e3
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_stop.png differ
diff --git a/app/src/main/res/drawable-hdpi-v4/exo_icon_vr.png b/app/src/main/res/drawable-hdpi-v4/exo_icon_vr.png
new file mode 100644
index 0000000000..90948eb44f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_icon_vr.png differ
diff --git a/app/src/main/res/drawable-hdpi-v4/exo_media_action_repeat_all.png b/app/src/main/res/drawable-hdpi-v4/exo_media_action_repeat_all.png
new file mode 100644
index 0000000000..2824e7847c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_media_action_repeat_all.png differ
diff --git a/app/src/main/res/drawable-hdpi-v4/exo_media_action_repeat_off.png b/app/src/main/res/drawable-hdpi-v4/exo_media_action_repeat_off.png
new file mode 100644
index 0000000000..0b92f583da
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_media_action_repeat_off.png differ
diff --git a/app/src/main/res/drawable-hdpi-v4/exo_media_action_repeat_one.png b/app/src/main/res/drawable-hdpi-v4/exo_media_action_repeat_one.png
new file mode 100644
index 0000000000..232aa2b1cd
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v4/exo_media_action_repeat_one.png differ
diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_circular_play.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_circular_play.png
new file mode 100644
index 0000000000..e5104fcd62
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_circular_play.png differ
diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_fastforward.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_fastforward.png
new file mode 100644
index 0000000000..e63921abe6
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_fastforward.png differ
diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_fullscreen_enter.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_fullscreen_enter.png
new file mode 100644
index 0000000000..1af1f68a02
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_fullscreen_enter.png differ
diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_fullscreen_exit.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_fullscreen_exit.png
new file mode 100644
index 0000000000..db03f46435
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_fullscreen_exit.png differ
diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_next.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_next.png
new file mode 100644
index 0000000000..78f9bed762
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_next.png differ
diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_pause.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_pause.png
new file mode 100644
index 0000000000..1818039e51
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_pause.png differ
diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_play.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_play.png
new file mode 100644
index 0000000000..f0b0570d0b
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_play.png differ
diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_previous.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_previous.png
new file mode 100644
index 0000000000..4d2eccfe9a
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_previous.png differ
diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_repeat_all.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_repeat_all.png
new file mode 100644
index 0000000000..5c91a47519
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_repeat_all.png differ
diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_repeat_off.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_repeat_off.png
new file mode 100644
index 0000000000..a94abd864f
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_repeat_off.png differ
diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_repeat_one.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_repeat_one.png
new file mode 100644
index 0000000000..a59a985239
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_repeat_one.png differ
diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_rewind.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_rewind.png
new file mode 100644
index 0000000000..8cd1daa810
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_rewind.png differ
diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_shuffle_off.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_shuffle_off.png
new file mode 100644
index 0000000000..2353dd4289
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_shuffle_off.png differ
diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_shuffle_on.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_shuffle_on.png
new file mode 100644
index 0000000000..80ec43a119
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_shuffle_on.png differ
diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_stop.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_stop.png
new file mode 100644
index 0000000000..836f4dbb55
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_stop.png differ
diff --git a/app/src/main/res/drawable-ldpi-v4/exo_icon_vr.png b/app/src/main/res/drawable-ldpi-v4/exo_icon_vr.png
new file mode 100644
index 0000000000..6e21960ed6
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_icon_vr.png differ
diff --git a/app/src/main/res/drawable-ldpi-v4/exo_media_action_repeat_all.png b/app/src/main/res/drawable-ldpi-v4/exo_media_action_repeat_all.png
new file mode 100644
index 0000000000..5c91a47519
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_media_action_repeat_all.png differ
diff --git a/app/src/main/res/drawable-ldpi-v4/exo_media_action_repeat_off.png b/app/src/main/res/drawable-ldpi-v4/exo_media_action_repeat_off.png
new file mode 100644
index 0000000000..a94abd864f
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_media_action_repeat_off.png differ
diff --git a/app/src/main/res/drawable-ldpi-v4/exo_media_action_repeat_one.png b/app/src/main/res/drawable-ldpi-v4/exo_media_action_repeat_one.png
new file mode 100644
index 0000000000..a59a985239
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v4/exo_media_action_repeat_one.png differ
diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_circular_play.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_circular_play.png
new file mode 100644
index 0000000000..7242e1f5c8
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_circular_play.png differ
diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_fastforward.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_fastforward.png
new file mode 100644
index 0000000000..1b42a5315f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_fastforward.png differ
diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_fullscreen_enter.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_fullscreen_enter.png
new file mode 100644
index 0000000000..4423c7ce99
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_fullscreen_enter.png differ
diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_fullscreen_exit.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_fullscreen_exit.png
new file mode 100644
index 0000000000..364bad0b84
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_fullscreen_exit.png differ
diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_next.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_next.png
new file mode 100644
index 0000000000..a93aae0f34
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_next.png differ
diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_pause.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_pause.png
new file mode 100644
index 0000000000..3e150b5a45
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_pause.png differ
diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_play.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_play.png
new file mode 100644
index 0000000000..692d8c2ad9
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_play.png differ
diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_previous.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_previous.png
new file mode 100644
index 0000000000..ea83907d8e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_previous.png differ
diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_repeat_all.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_repeat_all.png
new file mode 100644
index 0000000000..97f7e1cc75
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_repeat_all.png differ
diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_repeat_off.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_repeat_off.png
new file mode 100644
index 0000000000..6a02321702
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_repeat_off.png differ
diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_repeat_one.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_repeat_one.png
new file mode 100644
index 0000000000..59bac33705
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_repeat_one.png differ
diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_rewind.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_rewind.png
new file mode 100644
index 0000000000..231bcee4ca
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_rewind.png differ
diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_shuffle_off.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_shuffle_off.png
new file mode 100644
index 0000000000..a55d716cce
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_shuffle_off.png differ
diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_shuffle_on.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_shuffle_on.png
new file mode 100644
index 0000000000..0924b2cb69
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_shuffle_on.png differ
diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_stop.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_stop.png
new file mode 100644
index 0000000000..2aeffbb6cf
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_stop.png differ
diff --git a/app/src/main/res/drawable-mdpi-v4/exo_icon_vr.png b/app/src/main/res/drawable-mdpi-v4/exo_icon_vr.png
new file mode 100644
index 0000000000..02063a79a9
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_icon_vr.png differ
diff --git a/app/src/main/res/drawable-mdpi-v4/exo_media_action_repeat_all.png b/app/src/main/res/drawable-mdpi-v4/exo_media_action_repeat_all.png
new file mode 100644
index 0000000000..97f7e1cc75
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_media_action_repeat_all.png differ
diff --git a/app/src/main/res/drawable-mdpi-v4/exo_media_action_repeat_off.png b/app/src/main/res/drawable-mdpi-v4/exo_media_action_repeat_off.png
new file mode 100644
index 0000000000..6a02321702
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_media_action_repeat_off.png differ
diff --git a/app/src/main/res/drawable-mdpi-v4/exo_media_action_repeat_one.png b/app/src/main/res/drawable-mdpi-v4/exo_media_action_repeat_one.png
new file mode 100644
index 0000000000..59bac33705
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v4/exo_media_action_repeat_one.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_circular_play.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_circular_play.png
new file mode 100644
index 0000000000..dd31d608d4
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_circular_play.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_fastforward.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_fastforward.png
new file mode 100644
index 0000000000..ab7e1fd334
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_fastforward.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_fullscreen_enter.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_fullscreen_enter.png
new file mode 100644
index 0000000000..c1dcfb2902
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_fullscreen_enter.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_fullscreen_exit.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_fullscreen_exit.png
new file mode 100644
index 0000000000..ef360fe40c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_fullscreen_exit.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_next.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_next.png
new file mode 100644
index 0000000000..f3552d7216
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_next.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_pause.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_pause.png
new file mode 100644
index 0000000000..1c868f1831
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_pause.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_play.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_play.png
new file mode 100644
index 0000000000..381eabdccf
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_play.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_previous.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_previous.png
new file mode 100644
index 0000000000..0a2ddd5e90
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_previous.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_repeat_all.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_repeat_all.png
new file mode 100644
index 0000000000..2baaedecbf
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_repeat_all.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_repeat_off.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_repeat_off.png
new file mode 100644
index 0000000000..2468f92f9f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_repeat_off.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_repeat_one.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_repeat_one.png
new file mode 100644
index 0000000000..4e1d53db77
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_repeat_one.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_rewind.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_rewind.png
new file mode 100644
index 0000000000..a798fee30e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_rewind.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_shuffle_off.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_shuffle_off.png
new file mode 100644
index 0000000000..2b67cabf5a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_shuffle_off.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_shuffle_on.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_shuffle_on.png
new file mode 100644
index 0000000000..ede80c9341
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_shuffle_on.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_stop.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_stop.png
new file mode 100644
index 0000000000..8727a93480
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_stop.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_icon_vr.png b/app/src/main/res/drawable-xhdpi-v4/exo_icon_vr.png
new file mode 100644
index 0000000000..ff243ef56a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_icon_vr.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_media_action_repeat_all.png b/app/src/main/res/drawable-xhdpi-v4/exo_media_action_repeat_all.png
new file mode 100644
index 0000000000..2baaedecbf
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_media_action_repeat_all.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_media_action_repeat_off.png b/app/src/main/res/drawable-xhdpi-v4/exo_media_action_repeat_off.png
new file mode 100644
index 0000000000..2468f92f9f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_media_action_repeat_off.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v4/exo_media_action_repeat_one.png b/app/src/main/res/drawable-xhdpi-v4/exo_media_action_repeat_one.png
new file mode 100644
index 0000000000..4e1d53db77
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v4/exo_media_action_repeat_one.png differ
diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_circular_play.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_circular_play.png
new file mode 100644
index 0000000000..56ed071b2f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_circular_play.png differ
diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_fastforward.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_fastforward.png
new file mode 100644
index 0000000000..1e8db0ec23
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_fastforward.png differ
diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_fullscreen_enter.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_fullscreen_enter.png
new file mode 100644
index 0000000000..a0a1b4d4f3
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_fullscreen_enter.png differ
diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_fullscreen_exit.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_fullscreen_exit.png
new file mode 100644
index 0000000000..b7f4133fd9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_fullscreen_exit.png differ
diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_next.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_next.png
new file mode 100644
index 0000000000..131a531b37
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_next.png differ
diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_pause.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_pause.png
new file mode 100644
index 0000000000..ac8d4fcad5
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_pause.png differ
diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_play.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_play.png
new file mode 100644
index 0000000000..365b3dfee5
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_play.png differ
diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_previous.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_previous.png
new file mode 100644
index 0000000000..884cbdd407
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_previous.png differ
diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_repeat_all.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_repeat_all.png
new file mode 100644
index 0000000000..d7207ebc0d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_repeat_all.png differ
diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_repeat_off.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_repeat_off.png
new file mode 100644
index 0000000000..4d6253ead6
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_repeat_off.png differ
diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_repeat_one.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_repeat_one.png
new file mode 100644
index 0000000000..d577f4ebcd
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_repeat_one.png differ
diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_rewind.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_rewind.png
new file mode 100644
index 0000000000..4bab545714
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_rewind.png differ
diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_shuffle_off.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_shuffle_off.png
new file mode 100644
index 0000000000..22209d1f88
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_shuffle_off.png differ
diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_shuffle_on.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_shuffle_on.png
new file mode 100644
index 0000000000..4c5e141a3f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_shuffle_on.png differ
diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_stop.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_stop.png
new file mode 100644
index 0000000000..5239336671
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_stop.png differ
diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_icon_vr.png b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_vr.png
new file mode 100644
index 0000000000..7c0338842d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_icon_vr.png differ
diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_media_action_repeat_all.png b/app/src/main/res/drawable-xxhdpi-v4/exo_media_action_repeat_all.png
new file mode 100644
index 0000000000..d7207ebc0d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_media_action_repeat_all.png differ
diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_media_action_repeat_off.png b/app/src/main/res/drawable-xxhdpi-v4/exo_media_action_repeat_off.png
new file mode 100644
index 0000000000..4d6253ead6
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_media_action_repeat_off.png differ
diff --git a/app/src/main/res/drawable-xxhdpi-v4/exo_media_action_repeat_one.png b/app/src/main/res/drawable-xxhdpi-v4/exo_media_action_repeat_one.png
new file mode 100644
index 0000000000..d577f4ebcd
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v4/exo_media_action_repeat_one.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_circular_play.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_circular_play.png
new file mode 100644
index 0000000000..eabf12f38a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_circular_play.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_fastforward.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_fastforward.png
new file mode 100644
index 0000000000..cb7d89cd32
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_fastforward.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_fullscreen_enter.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_fullscreen_enter.png
new file mode 100644
index 0000000000..172fe0db5e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_fullscreen_enter.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_fullscreen_exit.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_fullscreen_exit.png
new file mode 100644
index 0000000000..0db7b8f8b4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_fullscreen_exit.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_next.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_next.png
new file mode 100644
index 0000000000..7cb2bd1b5b
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_next.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_pause.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_pause.png
new file mode 100644
index 0000000000..c623c94267
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_pause.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_play.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_play.png
new file mode 100644
index 0000000000..1f0f6818a8
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_play.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_previous.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_previous.png
new file mode 100644
index 0000000000..50cf727a02
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_previous.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_repeat_all.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_repeat_all.png
new file mode 100644
index 0000000000..b847d068d2
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_repeat_all.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_repeat_off.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_repeat_off.png
new file mode 100644
index 0000000000..64324b3fdc
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_repeat_off.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_repeat_one.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_repeat_one.png
new file mode 100644
index 0000000000..bd4fc75657
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_repeat_one.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_rewind.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_rewind.png
new file mode 100644
index 0000000000..709611c568
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_rewind.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_shuffle_off.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_shuffle_off.png
new file mode 100644
index 0000000000..ab42a5ad6b
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_shuffle_off.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_shuffle_on.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_shuffle_on.png
new file mode 100644
index 0000000000..f6d3ac445d
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_shuffle_on.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_stop.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_stop.png
new file mode 100644
index 0000000000..06c99c9b59
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_icon_stop.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_media_action_repeat_all.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_media_action_repeat_all.png
new file mode 100644
index 0000000000..b847d068d2
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_media_action_repeat_all.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_media_action_repeat_off.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_media_action_repeat_off.png
new file mode 100644
index 0000000000..64324b3fdc
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_media_action_repeat_off.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v4/exo_media_action_repeat_one.png b/app/src/main/res/drawable-xxxhdpi-v4/exo_media_action_repeat_one.png
new file mode 100644
index 0000000000..bd4fc75657
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v4/exo_media_action_repeat_one.png differ
diff --git a/app/src/main/res/layout-land/activity_player_queue_control.xml b/app/src/main/res/layout-land/activity_player_queue_control.xml
index a055ad7acf..b77e1b6aae 100644
--- a/app/src/main/res/layout-land/activity_player_queue_control.xml
+++ b/app/src/main/res/layout-land/activity_player_queue_control.xml
@@ -121,7 +121,7 @@
android:clickable="true"
android:focusable="true"
android:scaleType="fitCenter"
- android:src="@drawable/exo_controls_rewind"
+ android:src="@drawable/exo_icon_rewind"
android:tint="?attr/colorAccent"
tools:ignore="ContentDescription" />
@@ -171,7 +171,7 @@
android:clickable="true"
android:focusable="true"
android:scaleType="fitCenter"
- android:src="@drawable/exo_controls_fastforward"
+ android:src="@drawable/exo_icon_fastforward"
android:tint="?attr/colorAccent"
tools:ignore="ContentDescription" />
diff --git a/app/src/main/res/layout/activity_player_queue_control.xml b/app/src/main/res/layout/activity_player_queue_control.xml
index 2cb9922093..48c7787ccb 100644
--- a/app/src/main/res/layout/activity_player_queue_control.xml
+++ b/app/src/main/res/layout/activity_player_queue_control.xml
@@ -204,7 +204,7 @@
android:clickable="true"
android:focusable="true"
android:scaleType="fitCenter"
- android:src="@drawable/exo_controls_rewind"
+ android:src="@drawable/exo_icon_rewind"
android:tint="?attr/colorAccent" />
-