Skip to content

修复后台播放因Audio无法处理降级策略的问题，增加预载窗口 #43

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

Merged
Re-BeiChen merged 2 commits into from
Jun 15, 2026
Merged

修复后台播放因Audio无法处理降级策略的问题，增加预载窗口 #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a68f4c3
fix: 修复音质降级，优化音质切换逻辑
Shomi-FJS Jun 12, 2026
4a43592
refactor(playback&cache): 优化预加载逻辑与播放性能
Shomi-FJS Jun 13, 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: 19 additions & 20 deletions android/app/src/main/java/top/imsyy/splayer/android/cache/AudioCacheProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,23 +366,23 @@ public static String resolveCacheKey(@NonNull Uri uri) {
// ========== prefetch ==========

private static final String TAG = "AudioCachePrefetch";
/** 默认预下载字节数：512 KB，足够 ExoPlayer 启播第一帧解码 + 内部缓冲。 */
public static final long DEFAULT_PREFETCH_BYTES = 512L * 1024L;
/** 短预载单线程：供“下一首前 512KB”使用，低占用高响应。 */
/** 默认预下载字节数：2 MB，避免无损 / Hi-Res 在开头数秒跨过 512 KB 缓存边界后阻塞。 */
public static final long DEFAULT_PREFETCH_BYTES = 2L * 1024L * 1024L;
/** 短预载单线程：供“下一首前段音频”使用，低占用高响应。 */
private static volatile ExecutorService prefetchExecutor;
/**
* 全量下载独立单线程：全量一首 5-10MB 需背景跑，不能占着短预载走道。<br>
* 拆走后：load 下一首 → prefetchExecutor 立即跑 512KB；全量送到 fullDownloadExecutor。
* 拆走后：load 下一首 → prefetchExecutor 立即跑短预载；全量送到 fullDownloadExecutor。
*/
private static volatile ExecutorService fullDownloadExecutor;
/** 全量下载任务取消标志；cancelAllPrefetch / clearAll 需要能同步中断。 */
@Nullable private static volatile AtomicBoolean currentFullCancelFlag;
/** 已在排队 / 进行中的 cacheKey 集合，幂等去重。 */
private static final Set<String> inFlight = new HashSet<>();
/**
* 每个 cacheKey 独立写锁：保证同 cacheKey 的 CacheWriter 不会并发执行（短预载 + 全量任务跨 executor 时
* 每个 cacheKey 独立写锁：保证同 cacheKey 的 CacheWriter 不会并发执行（短预载 + 预载任务跨 executor 时
* 都从位置 0 写同一组 span，并发会触发 SimpleCache 的 holeSpan 锁竞争 + CacheException）。<br>
* 短任务持锁 ~1s 完成；全量任务后到达直接接力——FLAG_BLOCK_ON_CACHE 会跳过已缓存字节只下剩余部分。<br>
* 短任务持锁 ~1s 完成；预载任务后到达直接接力——FLAG_BLOCK_ON_CACHE 会跳过已缓存字节只下剩余部分。<br>
* 用 ConcurrentHashMap 保证 computeIfAbsent 的原子性。
*/
private static final Map<String, Object> cacheKeyWriterLocks = new ConcurrentHashMap<>();
Expand All @@ -408,7 +408,7 @@ private static ExecutorService getExecutor() {
return prefetchExecutor;
}

/** 全量下载独立 executor：与短预载不抢资源。 */
/** 预载 独立 executor：与短预载不抢资源。 */
@NonNull
private static ExecutorService getFullDownloadExecutor() {
if (fullDownloadExecutor == null) {
Expand All @@ -419,7 +419,7 @@ private static ExecutorService getFullDownloadExecutor() {
r -> {
Thread t = new Thread(r, "audio-cache-full-download");
t.setDaemon(true);
// 更低优先级：全量下载为后台作业，不应抢占短预载 / 当前播放。
// 更低优先级：预载 为后台作业，不应抢占短预载 / 当前播放。
t.setPriority(Thread.NORM_PRIORITY - 2);
return t;
});
Expand All @@ -438,7 +438,7 @@ private static ExecutorService getFullDownloadExecutor() {
* <p>幂等：同 cacheKey 已在队列或已 ready 时直接 no-op。
*
* @param appContext app context
* @param url 要预下载的 http(s) url；非 http 直接忽略
* @param url 要预 的 http(s) url；非 http 直接忽略
*/
public static void prefetchUrl(@NonNull Context appContext, @Nullable String url) {
prefetchUrlWithLength(appContext, url, DEFAULT_PREFETCH_BYTES, /* cancelPrev= */ true);
Expand All @@ -453,23 +453,23 @@ public static void prefetchUrl(@NonNull Context appContext, @Nullable String url
* 排到自己时若用户已经切歌，TTL 索引也会让本任务的字节仍然有效（promoted=true）。
*/
public static void prefetchUrlFull(@NonNull Context appContext, @Nullable String url) {
// 幂等短路：已 promoted 跳过。全量下载的推进与最终 promote 标记都在 prefetchUrlWithLength 内负责。
// 幂等短路：已 promoted 跳过。预载 的推进与最终 promote 标记都在 prefetchUrlWithLength 内负责。
if (url == null || url.isEmpty()) return;
Uri uri = Uri.parse(url);
// scheme 校验与短预载入口保持一致：非 http(s) 直接拒绝，避免误算 cacheKey 与日志噪声。
String scheme = uri.getScheme();
if (scheme == null || (!scheme.equals("http") && !scheme.equals("https"))) return;
String cacheKey = resolveCacheKey(uri);
if (AudioPrefetchTtlIndex.getInstance(appContext).isPromoted(cacheKey)) return;
// cancelPrev=false：完整下载不应抢占已经在跑的短预载
// cancelPrev=false：完整 不应抢占已经在跑的短预载
prefetchUrlWithLength(appContext, url, /* length= */ Long.MAX_VALUE, /* cancelPrev= */ false);
}

/** 公共实现：length 控制下载字节数；cancelPrev 控制是否取消上一首未完成的任务。 */
/** 公共实现：length 控制 字节数；cancelPrev 控制是否取消上一首未完成的任务。 */
private static void prefetchUrlWithLength(
@NonNull Context appContext, @Nullable String url, long length, boolean cancelPrev) {
if (url == null || url.isEmpty()) return;
// 低磁盘：不启动任何 prefetch（短预载 / 全量下载都被拦）。在 PlaybackManager.schedulePromotion 调用前路拦截。
// 低磁盘：不启动任何 prefetch（短预载 / 预载 都被拦）。在 PlaybackManager.schedulePromotion 调用前路拦截。
if (isLowDiskSpace(appContext)) {
Log.d(TAG, "low disk: prefetch skipped for " + url);
return;
Expand All @@ -492,7 +492,7 @@ private static void prefetchUrlWithLength(
// 已完整命中（cachedBytes ≥ length 阈值）则跳过 IO；但仍刷新 TTL 索引让缓存"续期"
long probeLength = length == Long.MAX_VALUE ? DEFAULT_PREFETCH_BYTES : length;
long cachedBytes = cache.getCachedBytes(cacheKey, 0, probeLength);
// 全量下载场景：还需要确认是否真的下完了（用 contentLength 判断更准但成本高，这里宽松判定）
// 预载 场景：还需要确认是否真的下完了（用 contentLength 判断更准但成本高，这里宽松判定）
if (length != Long.MAX_VALUE && cachedBytes >= length) {
ttlIndex.markAccess(cacheKey);
synchronized (inFlight) {
Expand All @@ -510,15 +510,15 @@ private static void prefetchUrlWithLength(
currentCancelFlag = cancelFlag;
}
if (isFull) {
// 全量下载不抢带宽但要可被 cancelAll 中断；覆盖上次未完成的全量任务取消标。
// 预载 不抢带宽但要可被 cancelAll 中断；覆盖上次未完成的预载任务取消标。
AtomicBoolean prevFull = currentFullCancelFlag;
if (prevFull != null) prevFull.set(true);
currentFullCancelFlag = cancelFlag;
}
final AtomicBoolean cancelFlagFinal = cancelFlag;
final long lengthFinal = length;

// 路由：全量走后台 executor，短预载走响应 executor，互不阻塞。
// 路由：预载走后台 executor，短预载走响应 executor，互不阻塞。
ExecutorService chosen = isFull ? getFullDownloadExecutor() : getExecutor();
chosen.execute(() -> {
// 取每个 cacheKey 自己的 monitor：跨 executor 时同 cacheKey 串行，避免并发 CacheWriter 写同一组 span
Expand Down Expand Up @@ -548,7 +548,7 @@ private static void prefetchUrlWithLength(
if (cancelFlagFinal.get()) Thread.currentThread().interrupt();
});
writer.cache();
// 全量下载（length=MAX_VALUE）成功返回才标 promoted；CacheWriter 中途抛异常会走到 catch，不会 promote。
// 预载 （length=MAX_VALUE）成功返回才标 promoted；CacheWriter 中途抛异常会走到 catch，不会 promote。
// 这样 getPromotedAudioFile 看到 isPromoted=true 时，可认为文件完整；automix 不会读到截断字节。
//
// 修复 #1：promote 前比对实际缓存字节数 vs upstream Content-Length（CacheDataSource 在 open 时
Expand Down Expand Up @@ -586,7 +586,7 @@ private static void prefetchUrlWithLength(
});
}

/** 取消所有正在排队的 prefetch（应用关闭 / 清缓存场景）；同时中断全量下载。 */
/** 取消所有正在排队的 prefetch（应用关闭 / 清缓存场景）；同时中断预载 。 */
public static void cancelAllPrefetch() {
AtomicBoolean flag = currentCancelFlag;
if (flag != null) flag.set(true);
Expand Down Expand Up @@ -741,8 +741,7 @@ public static File getPromotedAudioFile(@NonNull Context appContext, @Nullable S
String cacheKey = resolveCacheKey(uri);
if (!AudioPrefetchTtlIndex.getInstance(appContext).isPromoted(cacheKey)) return null;

SimpleCache cache = simpleCache;
if (cache == null) return null;
SimpleCache cache = getOrCreate(appContext);

NavigableSet<CacheSpan> spans;
try {
Expand Down
22 changes: 12 additions & 10 deletions android/app/src/main/java/top/imsyy/splayer/android/cache/AudioPrefetchTtlIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public void markAccess(@NonNull String cacheKey) {
* 升级为“正式缓存”：调用者判定用户真的听了这首歌（如播放 > 10s）。<br>
* 从 prefetch 索引中移除，加入 promoted 集合；将不再被 50min TTL sweep 清。
*
* @return true 表示是首次 promote（调用者可据此决定是否启动全量下载）
* @return true 表示是首次 promote（调用者可据此决定是否启动预载）
*/
public boolean promote(@NonNull String cacheKey) {
if (cacheKey.isEmpty()) return false;
Expand Down Expand Up @@ -140,7 +140,7 @@ public int countPrefetchOnly() {
*
* <ol>
* <li>过期（now - lastAccessAt > TTL_MILLIS）的条目，从 SimpleCache 中清除对应资源
* <li>SimpleCache 中已经不存在该 cacheKey 的"孤儿"索引项
* <li>SimpleCache 中已经不存在该 cacheKey 的"孤立"索引项
* </ol>
*/
public void sweep() {
Expand All @@ -149,11 +149,9 @@ public void sweep() {

Map<String, ?> all = prefs.getAll();

SimpleCache cache;
try {
cache = AudioCacheProvider.getOrCreate(appContext);
} catch (Throwable e) {
Log.w(TAG, "sweep: SimpleCache not ready, skip");
SimpleCache cache = AudioCacheProvider.peekSimpleCache();
if (cache == null) {
Log.d(TAG, "sweep: SimpleCache not initialized, skip");
return;
}
Set<String> liveKeys = new HashSet<>(cache.getKeys());
Expand Down Expand Up @@ -191,18 +189,22 @@ public void sweep() {
editor.remove(cacheKey);
continue;
}
long latestTs = prefs.getLong(cacheKey, ts);
if (latestTs >= expireBefore) {
continue;
}
try {
cache.removeResource(cacheKey);
editor.remove(cacheKey);
expired++;
} catch (Throwable e) {
Log.w(TAG, "sweep: removeResource failed: " + cacheKey, e);
}
editor.remove(cacheKey);
expired++;
}
}
editor.apply();

// 2) 扫 promoted 集合：清除 SimpleCache 已不存在的孤儿条目（被全局 LRU 配额删过）
// 2) 扫 promoted 集合：清除 SimpleCache 已不存在的孤立条目（被全局 LRU 配额删过）
Map<String, ?> promotedAll = promotedPrefs.getAll();
SharedPreferences.Editor pEditor = promotedPrefs.edit();
int promotedOrphan = 0;
Expand Down
12 changes: 11 additions & 1 deletion ...oid/app/src/main/java/top/imsyy/splayer/android/playback/AndroidNativePlaybackPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,9 @@ public void syncApiContext(PluginCall call) {
.syncApiContext(
call.getString("apiBaseUrl", ""),
call.getString("cookie", ""),
call.getString("songLevel", "exhigh"));
call.getString("songLevel", "exhigh"),
Boolean.TRUE.equals(call.getBoolean("disableAiAudio", false)),
Boolean.TRUE.equals(call.getBoolean("playSongDemo", false)));
call.resolve();
});
}
Expand Down Expand Up @@ -484,6 +486,14 @@ public void prefetchAudio(PluginCall call) {
call.resolve();
}

@PluginMethod
public void isPromotedAudioReady(PluginCall call) {
String url = call.getString("url", "");
JSObject result = new JSObject();
result.put("ready", AudioCacheProvider.isPromotedAudioReady(getContext(), url));
call.resolve(result);
}

@PluginMethod
public void enableVisualizer(PluginCall call) {
boolean enable = call.getBoolean("enable", false);
Expand Down
27 changes: 22 additions & 5 deletions android/app/src/main/java/top/imsyy/splayer/android/playback/PlaybackManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ public final class PlaybackManager {
private String apiBaseUrl = "";
private String cookie = "";
private String songLevel = "exhigh";
private boolean disableAiAudio = false;
private boolean playSongDemo = false;

/**
* 当前 promotion 任务 —— load() 时排 10s timer，到期仍是这首歌则把它从 prefetch 升级为
Expand Down Expand Up @@ -360,7 +362,7 @@ public synchronized JSObject load(String url, long positionMs, boolean autoPlay)
final String sourceSnapshot = currentSource;
AudioPrefetchTtlIndex ttlIndex = AudioPrefetchTtlIndex.getInstance(appContext);
ttlIndex.markAccess(cacheKey);
// 已 promoted 的歌不再排 timer（已是正式缓存，全量下载也已经触发过）
// 已 promoted 的歌不再排 timer（已是正式缓存，预载也已经触发过）
if (!ttlIndex.isPromoted(cacheKey)) {
schedulePromotion(cacheKey, sourceSnapshot);
}
Expand Down Expand Up @@ -597,6 +599,7 @@ public synchronized void updateQueueContext(

// 立即预解析前方未解析项，避免后台 ENDED 时才发现无 URL。
prefetchUpcomingUrls();
requestUrlsIfWindowExhausted();
updateMediaSessionButtons();
updateNotification();
emitPlaybackState(false);
Expand Down Expand Up @@ -649,13 +652,21 @@ public synchronized void setAllowMixWithOthers(boolean allow) {
}
}

public synchronized void syncApiContext(String baseUrl, String cookieValue, String level) {
public synchronized void syncApiContext(
String baseUrl,
String cookieValue,
String level,
boolean disableAiAudioState,
boolean playSongDemoState) {
apiBaseUrl = baseUrl == null ? "" : baseUrl.trim();
cookie = cookieValue == null ? "" : cookieValue.trim();
disableAiAudio = disableAiAudioState;
playSongDemo = playSongDemoState;
if (level != null && !level.isEmpty()) {
songLevel = level;
}
urlResolver.updateContext(apiBaseUrl, cookie, songLevel);
urlResolver.updateContext(apiBaseUrl, cookie, songLevel, disableAiAudio, playSongDemo);
prefetchUpcomingUrls();
}

/**
Expand Down Expand Up @@ -1224,6 +1235,8 @@ private void resolveAndPlayAsync(
} else if (!forward) {
// 后退方向窗口耗尽：回落 JS prev（不应触发 requestUrls，那是右缘语义）
emitCustomAction("previous", null, null, null, null, true, null);
} else if ("auto".equals(source)) {
emitCustomAction("next", null, null, null, null, true, null);
}
return;
}
Expand All @@ -1235,8 +1248,12 @@ private void resolveAndPlayAsync(
if (remainAttempts <= 0) {
// 连续失败（账号 / 解锁 / 区域屏蔽）
if (forward) {
pendingResumeAfterRefill = true;
emitRequestUrls();
if (shouldRequestUrlsForwardWrap()) {
pendingResumeAfterRefill = true;
emitRequestUrls();
} else {
emitCustomAction("next", null, null, null, null, true, null);
}
} else {
emitCustomAction("previous", null, null, null, null, true, null);
}
Expand Down
Loading