diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
index 7ebf2e82eed..ea74705d71c 100644
--- a/app/src/main/java/org/schabi/newpipe/player/Player.java
+++ b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -112,6 +112,7 @@
import org.schabi.newpipe.player.resolver.AudioPlaybackResolver;
import org.schabi.newpipe.player.resolver.VideoPlaybackResolver;
import org.schabi.newpipe.player.resolver.VideoPlaybackResolver.SourceType;
+import org.schabi.newpipe.player.ui.BackgroundPlayerUi;
import org.schabi.newpipe.player.ui.MainPlayerUi;
import org.schabi.newpipe.player.ui.PlayerUi;
import org.schabi.newpipe.player.ui.PlayerUiList;
@@ -265,6 +266,7 @@ public final class Player implements PlaybackListener, Listener {
@NonNull
private final HistoryRecordManager recordManager;
+ private boolean screenOn = true;
/*//////////////////////////////////////////////////////////////////////////
// Constructor
@@ -500,14 +502,17 @@ private void initUIsForCurrentPlayerType() {
switch (playerType) {
case MAIN:
UIs.destroyAll(PopupPlayerUi.class);
+ UIs.destroyAll(BackgroundPlayerUi.class);
UIs.addAndPrepare(new MainPlayerUi(this, binding));
break;
case POPUP:
UIs.destroyAll(MainPlayerUi.class);
+ UIs.destroyAll(BackgroundPlayerUi.class);
UIs.addAndPrepare(new PopupPlayerUi(this, binding));
break;
case AUDIO:
UIs.destroyAll(VideoPlayerUi.class);
+ UIs.addAndPrepare(new BackgroundPlayerUi(this));
break;
}
}
@@ -752,6 +757,12 @@ private void onBroadcastReceived(final Intent intent) {
case ACTION_SHUFFLE:
toggleShuffleModeEnabled();
break;
+ case Intent.ACTION_SCREEN_OFF:
+ screenOn = false;
+ break;
+ case Intent.ACTION_SCREEN_ON:
+ screenOn = true;
+ break;
case Intent.ACTION_CONFIGURATION_CHANGED:
if (DEBUG) {
Log.d(TAG, "ACTION_CONFIGURATION_CHANGED received");
@@ -2095,12 +2106,12 @@ private void notifyAudioTrackUpdateToListeners() {
}
}
- public void useVideoSource(final boolean videoEnabled) {
- if (playQueue == null || audioPlayerSelected()) {
+ public void useVideoAndSubtitles(final boolean videoAndSubtitlesEnabled) {
+ if (playQueue == null) {
return;
}
- isAudioOnly = !videoEnabled;
+ isAudioOnly = !videoAndSubtitlesEnabled;
getCurrentStreamInfo().ifPresentOrElse(info -> {
// In case we don't know the source type, fall back to either video-with-audio, or
@@ -2108,16 +2119,11 @@ public void useVideoSource(final boolean videoEnabled) {
final SourceType sourceType = videoResolver.getStreamSourceType()
.orElse(SourceType.VIDEO_WITH_AUDIO_OR_AUDIO_ONLY);
+ setRecovery();
+
if (playQueueManagerReloadingNeeded(sourceType, info, getVideoRendererIndex())) {
reloadPlayQueueManager();
}
-
- setRecovery();
-
- // Disable or enable video and subtitles renderers depending of the videoEnabled value
- trackSelector.setParameters(trackSelector.buildUponParameters()
- .setTrackTypeDisabled(C.TRACK_TYPE_TEXT, !videoEnabled)
- .setTrackTypeDisabled(C.TRACK_TYPE_VIDEO, !videoEnabled));
}, () -> {
/*
The current metadata may be null sometimes (for e.g. when using an unstable connection
@@ -2126,9 +2132,15 @@ The current metadata may be null sometimes (for e.g. when using an unstable conn
Reload the play queue manager in this case, which is the behavior when we don't know the
index of the video renderer or playQueueManagerReloadingNeeded returns true
*/
- reloadPlayQueueManager();
setRecovery();
+ reloadPlayQueueManager();
});
+
+ // Disable or enable video and subtitles renderers depending of the
+ // videoAndSubtitlesEnabled value
+ trackSelector.setParameters(trackSelector.buildUponParameters()
+ .setTrackTypeDisabled(C.TRACK_TYPE_TEXT, !videoAndSubtitlesEnabled)
+ .setTrackTypeDisabled(C.TRACK_TYPE_VIDEO, !videoAndSubtitlesEnabled));
}
/**
@@ -2361,4 +2373,11 @@ private int getVideoRendererIndex() {
.orElse(RENDERER_UNAVAILABLE);
}
//endregion
+
+ /**
+ * @return whether the device screen is turned on.
+ */
+ public boolean isScreenOn() {
+ return screenOn;
+ }
}
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 0530d56e921..506b643fed4 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
@@ -129,6 +129,13 @@ public DashMediaSource.Factory getLiveDashMediaSourceFactory() {
getDefaultDashChunkSourceFactory(cachelessDataSourceFactory),
cachelessDataSourceFactory);
}
+
+ public DashMediaSource.Factory getLiveYoutubeDashMediaSourceFactory() {
+ return new DashMediaSource.Factory(
+ getDefaultDashChunkSourceFactory(cachelessDataSourceFactory),
+ cachelessDataSourceFactory)
+ .setManifestParser(new YoutubeDashLiveManifestParser());
+ }
//endregion
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
new file mode 100644
index 00000000000..00f5de071cd
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/YoutubeDashLiveManifestParser.java
@@ -0,0 +1,68 @@
+package org.schabi.newpipe.player.helper;
+
+import android.net.Uri;
+
+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 java.util.List;
+
+/**
+ * A {@link DashManifestParser} fixing YouTube DASH manifests to allow starting playback from the
+ * newest period available instead of the earliest one in some cases.
+ *
+ *
+ * It changes the {@code availabilityStartTime} passed to a custom value doing the workaround.
+ * A better approach to fix the issue should be investigated and used in the future.
+ *
+ */
+public class YoutubeDashLiveManifestParser extends DashManifestParser {
+
+ // Result of Util.parseXsDateTime("1970-01-01T00:00:00Z")
+ private static final long AVAILABILITY_START_TIME_TO_USE = 0;
+
+ // There is no computation made with the availabilityStartTime value in the
+ // parseMediaPresentationDescription method itself, so we can just override methods called in
+ // this method using the workaround value
+ // Overriding parsePeriod does not seem to be needed
+
+ @SuppressWarnings("checkstyle:ParameterNumber")
+ @NonNull
+ @Override
+ protected DashManifest buildMediaPresentationDescription(
+ final long availabilityStartTime,
+ final long durationMs,
+ final long minBufferTimeMs,
+ final boolean dynamic,
+ final long minUpdateTimeMs,
+ final long timeShiftBufferDepthMs,
+ final long suggestedPresentationDelayMs,
+ final long publishTimeMs,
+ @Nullable final ProgramInformation programInformation,
+ @Nullable final UtcTimingElement utcTiming,
+ @Nullable final ServiceDescriptionElement serviceDescription,
+ @Nullable final Uri location,
+ @NonNull final List periods) {
+ return super.buildMediaPresentationDescription(
+ AVAILABILITY_START_TIME_TO_USE,
+ durationMs,
+ minBufferTimeMs,
+ dynamic,
+ minUpdateTimeMs,
+ timeShiftBufferDepthMs,
+ suggestedPresentationDelayMs,
+ publishTimeMs,
+ programInformation,
+ utcTiming,
+ serviceDescription,
+ location,
+ periods);
+ }
+}
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 e204b8372a7..33a007597cb 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
@@ -201,12 +201,13 @@ static MediaSource maybeBuildLiveMediaSource(final PlayerDataSource dataSource,
try {
final StreamInfoTag tag = StreamInfoTag.of(info);
- if (!info.getHlsUrl().isEmpty()) {
- return buildLiveMediaSource(dataSource, info.getHlsUrl(), C.CONTENT_TYPE_HLS, tag);
- } else if (!info.getDashMpdUrl().isEmpty()) {
+ if (!info.getDashMpdUrl().isEmpty()) {
return buildLiveMediaSource(
dataSource, info.getDashMpdUrl(), C.CONTENT_TYPE_DASH, tag);
}
+ if (!info.getHlsUrl().isEmpty()) {
+ return buildLiveMediaSource(dataSource, info.getHlsUrl(), C.CONTENT_TYPE_HLS, tag);
+ }
} catch (final Exception e) {
Log.w(TAG, "Error when generating live media source, falling back to standard sources",
e);
@@ -225,7 +226,11 @@ static MediaSource buildLiveMediaSource(final PlayerDataSource dataSource,
factory = dataSource.getLiveSsMediaSourceFactory();
break;
case C.CONTENT_TYPE_DASH:
- factory = dataSource.getLiveDashMediaSourceFactory();
+ if (metadata.getServiceId() == ServiceList.YouTube.getServiceId()) {
+ factory = dataSource.getLiveYoutubeDashMediaSourceFactory();
+ } else {
+ factory = dataSource.getLiveDashMediaSourceFactory();
+ }
break;
case C.CONTENT_TYPE_HLS:
factory = dataSource.getLiveHlsMediaSourceFactory();
diff --git a/app/src/main/java/org/schabi/newpipe/player/ui/BackgroundPlayerUi.java b/app/src/main/java/org/schabi/newpipe/player/ui/BackgroundPlayerUi.java
new file mode 100644
index 00000000000..9530033d1a8
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/player/ui/BackgroundPlayerUi.java
@@ -0,0 +1,29 @@
+package org.schabi.newpipe.player.ui;
+
+import androidx.annotation.NonNull;
+
+import org.schabi.newpipe.player.Player;
+
+/**
+ * This is not a real UI for the background player, it used to disable fetching video and text
+ * tracks with it.
+ *
+ *
+ * This allows reducing data usage for manifest sources with demuxed audio and video,
+ * such as livestreams.
+ *
+ */
+public class BackgroundPlayerUi extends PlayerUi {
+
+ public BackgroundPlayerUi(@NonNull final Player player) {
+ super(player);
+ }
+
+ @Override
+ public void initPlayback() {
+ super.initPlayback();
+
+ // Make sure to disable video and subtitles track types
+ player.useVideoAndSubtitles(false);
+ }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/player/ui/MainPlayerUi.java b/app/src/main/java/org/schabi/newpipe/player/ui/MainPlayerUi.java
index d8efb30df7d..de4e9211aec 100644
--- a/app/src/main/java/org/schabi/newpipe/player/ui/MainPlayerUi.java
+++ b/app/src/main/java/org/schabi/newpipe/player/ui/MainPlayerUi.java
@@ -216,6 +216,10 @@ public void initPlayback() {
playQueueAdapter = new PlayQueueAdapter(context,
Objects.requireNonNull(player.getPlayQueue()));
segmentAdapter = new StreamSegmentAdapter(getStreamSegmentListener());
+
+ // Make sure video and text tracks are enabled if the user is in the app, in the case user
+ // switched from background player to main player
+ player.useVideoAndSubtitles(fragmentIsVisible);
}
@Override
@@ -329,7 +333,7 @@ public void onBroadcastReceived(final Intent intent) {
} else if (VideoDetailFragment.ACTION_VIDEO_FRAGMENT_RESUMED.equals(intent.getAction())) {
// Restore video source when user returns to the fragment
fragmentIsVisible = true;
- player.useVideoSource(true);
+ player.useVideoAndSubtitles(true);
// When a user returns from background, the system UI will always be shown even if
// controls are invisible: hide it in that case
@@ -368,7 +372,7 @@ private void onFragmentStopped() {
if (player.isPlaying() || player.isLoading()) {
switch (getMinimizeOnExitAction(context)) {
case MINIMIZE_ON_EXIT_MODE_BACKGROUND:
- player.useVideoSource(false);
+ player.useVideoAndSubtitles(false);
break;
case MINIMIZE_ON_EXIT_MODE_POPUP:
getParentActivity().ifPresent(activity -> {
diff --git a/app/src/main/java/org/schabi/newpipe/player/ui/PopupPlayerUi.java b/app/src/main/java/org/schabi/newpipe/player/ui/PopupPlayerUi.java
index 6c98ab0fa0f..e967594fe60 100644
--- a/app/src/main/java/org/schabi/newpipe/player/ui/PopupPlayerUi.java
+++ b/app/src/main/java/org/schabi/newpipe/player/ui/PopupPlayerUi.java
@@ -151,6 +151,14 @@ private void initPopupCloseOverlay() {
windowManager.addView(closeOverlayBinding.getRoot(), closeOverlayLayoutParams);
}
+ @Override
+ public void initPlayback() {
+ super.initPlayback();
+ // Make sure video and text tracks are enabled if the screen is turned on (which should
+ // always be the case), in the case user switched from background player to popup player
+ player.useVideoAndSubtitles(player.isScreenOn());
+ }
+
@Override
protected void setupElementsVisibility() {
binding.fullScreenButton.setVisibility(View.VISIBLE);
@@ -216,10 +224,10 @@ public void onBroadcastReceived(final Intent intent) {
} else if (player.isPlaying() || player.isLoading()) {
if (Intent.ACTION_SCREEN_OFF.equals(intent.getAction())) {
// Use only audio source when screen turns off while popup player is playing
- player.useVideoSource(false);
+ player.useVideoAndSubtitles(false);
} else if (Intent.ACTION_SCREEN_ON.equals(intent.getAction())) {
// Restore video source when screen turns on and user was watching video in popup
- player.useVideoSource(true);
+ player.useVideoAndSubtitles(true);
}
}
}