Skip to content

[SoundCloud] Fix soundcloud regression of expiring HLS streams after 5mins (APK DL in description) #12418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
absurdlylongusername wants to merge 10 commits into
base: dev
Choose a base branch
from
+555 −47
Open

[SoundCloud] Fix soundcloud regression of expiring HLS streams after 5mins (APK DL in description) #12418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
94dd942
ListHelper.getFilteredAudioStreams short circuit on empty list
absurdlylongusername Jun 10, 2025
7b121f2
Allow comment suppression in checkstyle.xml
absurdlylongusername Jul 3, 2025
4e32cbc
Setup ExtractorLogger in MainActivity
absurdlylongusername Jul 3, 2025
0f27336
Add LoggingHttpDataSource to log http requests sent by ExoPlayer for …
absurdlylongusername Jul 3, 2025
c27e964
[SoundCloud] Refactor Soundcloud audio stream extraction code to sepa…
absurdlylongusername Jul 3, 2025
53ae046
Add DEBUG guards for logging
absurdlylongusername Jul 7, 2025
d302c3c
Rename baseUrl to removeQueryParameters
absurdlylongusername Jul 15, 2025
89b6a74
Code review: add warn and debug log overloads with Throwable
absurdlylongusername Feb 2, 2026
c33bcd8
Code review: Remove TODO, Add error message for missing m3u8 playlist…
absurdlylongusername Feb 2, 2026
ffea07c
Update extractor jitpack commit reference
absurdlylongusername Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions app/src/main/java/org/schabi/newpipe/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@
import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
import org.schabi.newpipe.extractor.services.peertube.PeertubeInstance;
import org.schabi.newpipe.extractor.utils.ExtractorLogger;
import org.schabi.newpipe.extractor.utils.Logger;
import org.schabi.newpipe.fragments.BackPressable;
import org.schabi.newpipe.fragments.MainFragment;
import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
Expand Down Expand Up @@ -137,6 +139,43 @@ public class MainActivity extends AppCompatActivity {
@Override
protected void onCreate(final Bundle savedInstanceState) {
if (DEBUG) {
// Override Extractor to print to Logcat
ExtractorLogger.setLogger(new Logger() {
@Override
public void debug(final String tag, final String message) {
Log.d(tag, message);
}

@Override
public void debug(final String tag,
final String message,
final Throwable throwable) {
Log.d(tag, message, throwable);
}

@Override
public void warn(final String tag, final String message) {
Log.w(tag, message);
}

@Override
public void warn(final String tag,
final String message,
final Throwable throwable) {
Log.w(tag, message, throwable);
}

@Override
public void error(final String tag, final String message) {
Log.e(tag, message);
}

@Override
public void error(final String tag, final String message, final Throwable t) {
Log.e(tag, message, t);
}

});
Log.d(TAG, "onCreate() called with: "
+ "savedInstanceState = [" + savedInstanceState + "]");
}
Expand Down
41 changes: 36 additions & 5 deletions app/src/main/java/org/schabi/newpipe/player/Player.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,9 @@ private void setRecovery(final int queuePos, final long windowPos) {
}

if (DEBUG) {
Log.d(TAG, "Setting recovery, queue: " + queuePos + ", pos: " + windowPos);
final var currentTitle = currentItem != null ? currentItem.getTitle() : "";
Log.d(TAG, "Setting recovery, queue: "
+ queuePos + "[" + currentTitle + "], pos: " + windowPos);
}
playQueue.setRecovery(queuePos, windowPos);
}
Expand Down Expand Up @@ -1053,6 +1055,34 @@ private Disposable getProgressUpdateDisposable() {

//endregion

public static String exoplayerStateToString(final int playbackState) {
return switch (playbackState) {
case com.google.android.exoplayer2.Player.STATE_IDLE -> // 1
"STATE_IDLE";
case com.google.android.exoplayer2.Player.STATE_BUFFERING -> // 2
"STATE_BUFFERING";
case com.google.android.exoplayer2.Player.STATE_READY -> //3
"STATE_READY";
case com.google.android.exoplayer2.Player.STATE_ENDED -> // 4
"STATE_ENDED";
default ->
throw new IllegalArgumentException("Unknown playback state " + playbackState);
};
}

public static String stateToString(final int state) {
return switch (state) {
case STATE_PREFLIGHT -> "STATE_PREFLIGHT";
case STATE_BLOCKED -> "STATE_BLOCKED";
case STATE_PLAYING -> "STATE_PLAYING";
case STATE_BUFFERING -> "STATE_BUFFERING";
case STATE_PAUSED -> "STATE_PAUSED";
case STATE_PAUSED_SEEK -> "STATE_PAUSED_SEEK";
case STATE_COMPLETED -> "STATE_COMPLETED";
default -> throw new IllegalArgumentException("Unknown playback state " + state);
};
}


/*//////////////////////////////////////////////////////////////////////////
// Playback states
Expand All @@ -1075,7 +1105,7 @@ public void onPlayWhenReadyChanged(final boolean playWhenReady, final int reason
public void onPlaybackStateChanged(final int playbackState) {
if (DEBUG) {
Log.d(TAG, "ExoPlayer - onPlaybackStateChanged() called with: "
+ "playbackState = [" + playbackState + "]");
+ "playbackState = [" + exoplayerStateToString(playbackState) + "]");
}
updatePlaybackState(getPlayWhenReady(), playbackState);
}
Expand All @@ -1084,7 +1114,7 @@ private void updatePlaybackState(final boolean playWhenReady, final int playback
if (DEBUG) {
Log.d(TAG, "ExoPlayer - updatePlaybackState() called with: "
+ "playWhenReady = [" + playWhenReady + "], "
+ "playbackState = [" + playbackState + "]");
+ "playbackState = [" + exoplayerStateToString(playbackState) + "]");
}

if (currentState == STATE_PAUSED_SEEK) {
Expand Down Expand Up @@ -1162,7 +1192,8 @@ public void onPlaybackUnblock(final MediaSource mediaSource) {

public void changeState(final int state) {
if (DEBUG) {
Log.d(TAG, "changeState() called with: state = [" + state + "]");
Log.d(TAG,
"changeState() called with: state = [" + stateToString(state) + "]");
}
currentState = state;
switch (state) {
Expand Down Expand Up @@ -1882,7 +1913,7 @@ private void saveStreamProgressState(final long progressMillis) {
.observeOn(AndroidSchedulers.mainThread())
.doOnError(e -> {
if (DEBUG) {
e.printStackTrace();
Log.e(TAG, "Error saving stream state", e);
}
})
.onErrorComplete()
Expand Down
124 changes: 124 additions & 0 deletions app/src/main/java/org/schabi/newpipe/player/datasource/LoggingHttpDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
package org.schabi.newpipe.player.datasource;

import static org.schabi.newpipe.MainActivity.DEBUG;

import android.util.Log;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

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 org.schabi.newpipe.DownloaderImpl;

import java.nio.charset.StandardCharsets;
import java.util.Map;

public class LoggingHttpDataSource extends DefaultHttpDataSource {
Copy link
Contributor

@TobiGr TobiGr Dec 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add JDoc here to highlight that data is only logged when DEBUG is true.


public final String TAG = getClass().getSimpleName() + "@" + hashCode();

public LoggingHttpDataSource() { }

public LoggingHttpDataSource(@Nullable final String userAgent,
final int connectTimeoutMillis,
final int readTimeoutMillis,
final boolean allowCrossProtocolRedirects,
@Nullable final RequestProperties defaultRequestProperties) {
super(userAgent,
connectTimeoutMillis,
readTimeoutMillis,
allowCrossProtocolRedirects,
defaultRequestProperties);
}


@Override
public long open(final DataSpec dataSpec) throws HttpDataSourceException {
if (!DEBUG) {
return super.open(dataSpec);
}

Log.d(TAG, "Request URL: " + dataSpec.uri);
try {
return super.open(dataSpec);
} catch (final HttpDataSource.InvalidResponseCodeException e) {
Log.e(TAG, "HTTP error for URL: " + dataSpec.uri);
Log.e(TAG, "Response code: " + e.responseCode);
Log.e(TAG, "Headers: " + e.headerFields);
Log.e(TAG, "Body: " + new String(e.responseBody, StandardCharsets.UTF_8));
throw e;
}
}

@SuppressWarnings("checkstyle:hiddenField")
public static class Factory implements HttpDataSource.Factory {

final RequestProperties defaultRequestProperties;

@Nullable
TransferListener transferListener;
@Nullable
String userAgent;
int connectTimeoutMs;
int readTimeoutMs;
boolean allowCrossProtocolRedirects;

public Factory() {
defaultRequestProperties = new RequestProperties();
connectTimeoutMs = DEFAULT_CONNECT_TIMEOUT_MILLIS;
readTimeoutMs = DEFAULT_READ_TIMEOUT_MILLIS;
userAgent = DownloaderImpl.USER_AGENT;
}

@NonNull
@Override
public HttpDataSource createDataSource() {
final var dataSource = new LoggingHttpDataSource(userAgent,
connectTimeoutMs,
readTimeoutMs,
allowCrossProtocolRedirects,
defaultRequestProperties);
if (transferListener != null) {
dataSource.addTransferListener(transferListener);
}
return dataSource;
}

@NonNull
@Override
public Factory setDefaultRequestProperties(
@NonNull final Map<String, String> defaultRequestProperties) {
this.defaultRequestProperties.clearAndSet(defaultRequestProperties);
return this;
}

public Factory setUserAgent(@Nullable final String userAgent) {
this.userAgent = userAgent;
return this;
}

public Factory setConnectTimeoutMs(final int connectTimeoutMs) {
this.connectTimeoutMs = connectTimeoutMs;
return this;
}

public Factory setReadTimeoutMs(final int readTimeoutMs) {
this.readTimeoutMs = readTimeoutMs;
return this;
}

public Factory setAllowCrossProtocolRedirects(final boolean allowCrossProtocolRedirects) {
this.allowCrossProtocolRedirects = allowCrossProtocolRedirects;
return this;
}

public Factory setTransferListener(@Nullable final TransferListener transferListener) {
this.transferListener = transferListener;
return this;
}
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/org/schabi/newpipe/player/datasource/NonUriHlsDataSourceFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ private NonUriHlsDataSourceFactory(@NonNull final DataSource.Factory dataSourceF
* </p>
*
* <p>
* This change allow playback of non-URI HLS contents, when the manifest is not a master
* This change allows playback of non-URI HLS contents, when the manifest is not a master
* manifest/playlist (otherwise, endless loops should be encountered because the
* {@link DataSource}s created for media playlists should use the master playlist response
* instead).
Expand Down
Loading
Loading