Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use StreamTypeUtil where possible and add isAudio and isVideo to this utility class

Browse source
This commit is contained in:
AudricV 2022-06-16 11:13:54 +02:00
parent 8dad6d7e1c
commit 73855cacb7
No known key found for this signature in database
GPG key ID: DA92EC7905614198
6 changed files with 44 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/org/schabi/newpipe/player/Player.java
View file

@ -4234,10 +4234,7 @@ public final class Player implements
if (playQueueManagerReloadingNeeded(sourceType, info, getVideoRendererIndex())) {
reloadPlayQueueManager();
} else {
final StreamType streamType = info.getStreamType();
if (streamType == StreamType.AUDIO_STREAM
|| streamType == StreamType.AUDIO_LIVE_STREAM
|| streamType == StreamType.POST_LIVE_AUDIO_STREAM) {
if (StreamTypeUtil.isAudio(info.getStreamType())) {
// Nothing to do more than setting the recovery position
setRecovery();
return;
@ -4296,21 +4293,17 @@ public final class Player implements
@NonNull final StreamInfo streamInfo,
final int videoRendererIndex) {
final StreamType streamType = streamInfo.getStreamType();
final boolean isStreamTypeAudio = StreamTypeUtil.isAudio(streamType);
if (videoRendererIndex == RENDERER_UNAVAILABLE && streamType != StreamType.AUDIO_STREAM
&& streamType != StreamType.AUDIO_LIVE_STREAM
&& streamType != StreamType.POST_LIVE_AUDIO_STREAM) {
if (videoRendererIndex == RENDERER_UNAVAILABLE && !isStreamTypeAudio) {
return true;
}
// The content is an audio stream, an audio live stream, or a live stream with a live
// source: it's not needed to reload the play queue manager because the stream source will
// be the same
if ((streamType == StreamType.AUDIO_STREAM
|| streamType == StreamType.POST_LIVE_AUDIO_STREAM
|| streamType == StreamType.AUDIO_LIVE_STREAM)
|| (streamType == StreamType.LIVE_STREAM
&& sourceType == SourceType.LIVE_STREAM)) {
if (isStreamTypeAudio || (streamType == StreamType.LIVE_STREAM
&& sourceType == SourceType.LIVE_STREAM)) {
return false;
}
@ -4324,9 +4317,7 @@ public final class Player implements
&& isNullOrEmpty(streamInfo.getAudioStreams()))) {
// It's not needed to reload the play queue manager only if the content's stream type
// is a video stream, a live stream or an ended live stream
return streamType != StreamType.VIDEO_STREAM
&& streamType != StreamType.LIVE_STREAM
&& streamType != StreamType.POST_LIVE_STREAM;
return !StreamTypeUtil.isVideo(streamType);
}
// Other cases: the play queue manager reload is needed