yorickr/plezy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(android): fall back when cronet init fails

Browse Source
This commit is contained in:
edde746
2026-06-13 13:23:41 +02:00
parent 75ba6b0627
commit dc769bda41
2 changed files with 72 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/src/main/kotlin/com/edde746/plezy/exoplayer/ExoPlayerCore.kt
+53 -12
View File
@@ -36,6 +36,7 @@ import androidx.media3.common.text.CueGroup
import androidx.media3.common.util.UnstableApi
import androidx.media3.common.util.Util
import androidx.media3.datasource.DefaultDataSource
import androidx.media3.datasource.DefaultHttpDataSource
import androidx.media3.datasource.HttpDataSource
import androidx.media3.datasource.cronet.CronetDataSource
import androidx.media3.exoplayer.DecoderReuseEvaluation
@@ -69,6 +70,7 @@ import com.edde746.plezy.shared.FrameRateManager
import java.util.concurrent.Executors
import java.util.concurrent.atomic.AtomicLong
import org.chromium.net.CronetEngine
import org.chromium.net.CronetProvider
interface ExoPlayerDelegate : com.edde746.plezy.shared.PlayerDelegate {
@@ -111,12 +113,39 @@ class ExoPlayerCore(private val activity: Activity) : Player.Listener {
private var assGlCrashHandlerInstalled = false
private var cronetEngine: CronetEngine? = null
private fun getCronetEngine(context: Context): CronetEngine = cronetEngine ?: synchronized(this) {
cronetEngine ?: CronetEngine.Builder(context.applicationContext)
.enableHttp2(true)
.enableQuic(true)
.build()
.also { cronetEngine = it }
private var cronetUnavailable = false
private fun getCronetEngine(context: Context): CronetEngine? {
cronetEngine?.let { return it }
if (cronetUnavailable) return null
return synchronized(this) {
cronetEngine?.let { return@synchronized it }
if (cronetUnavailable) return@synchronized null
val providers = try {
CronetProvider.getAllProviders(context.applicationContext)
.filter { it.isEnabled && it.name != CronetProvider.PROVIDER_NAME_FALLBACK }
.sortedBy { if (it.name == CronetProvider.PROVIDER_NAME_APP_PACKAGED) 0 else 1 }
} catch (t: Throwable) {
Log.w(TAG, "Cronet provider discovery failed", t)
cronetUnavailable = true
return@synchronized null
}
for (provider in providers) {
try {
return@synchronized provider.createBuilder()
.enableHttp2(true)
.enableQuic(true)
.build()
.also { cronetEngine = it }
} catch (t: Throwable) {
Log.w(TAG, "Cronet provider ${provider.name} failed", t)
}
}
cronetUnavailable = true
null
}
}
private val cronetExecutor by lazy { Executors.newSingleThreadExecutor() }
}
@@ -487,11 +516,23 @@ class ExoPlayerCore(private val activity: Activity) : Player.Listener {
this.renderersFactory = renderersFactory
updateAudioDecoderPolicy("initialize")
// Cronet DataSource for HTTP/2 multiplexing — all range requests share one connection
httpDataSourceFactory = CronetDataSource.Factory(getCronetEngine(activity), cronetExecutor)
.setConnectionTimeoutMs(15_000)
.setReadTimeoutMs(10_000)
dataSourceFactory = DefaultDataSource.Factory(activity, httpDataSourceFactory!!)
// Prefer Cronet for HTTP/2 multiplexing; fall back when a device's provider crashes during init.
val cronetEngine = getCronetEngine(activity)
val dataSourceLabel: String
val httpFactory: HttpDataSource.Factory
if (cronetEngine != null) {
dataSourceLabel = "Cronet"
httpFactory = CronetDataSource.Factory(cronetEngine, cronetExecutor)
.setConnectionTimeoutMs(15_000)
.setReadTimeoutMs(10_000)
} else {
dataSourceLabel = "DefaultHttp"
httpFactory = DefaultHttpDataSource.Factory()
.setConnectTimeoutMs(15_000)
.setReadTimeoutMs(10_000)
}
httpDataSourceFactory = httpFactory
dataSourceFactory = DefaultDataSource.Factory(activity, httpFactory)
val extractorsFactory = DefaultExtractorsFactory()
// High-bitrate Plex DVR MPEG-TS recordings can have sparse PCR packets; the default
// 600-packet window may leave duration unknown and seeking disabled.
@@ -576,7 +617,7 @@ class ExoPlayerCore(private val activity: Activity) : Player.Listener {
setBufferDurationsMs(30_000, 60_000, 1_000, 5_000)
}
}.build()
emitLog("info", "init", "Buffer: ${targetBufferBytes / 1024 / 1024}MB limit, available=${availableMB}MB, tunneling=$tunnelingUserEnabled, dataSource=Cronet")
emitLog("info", "init", "Buffer: ${targetBufferBytes / 1024 / 1024}MB limit, available=${availableMB}MB, tunneling=$tunnelingUserEnabled, dataSource=$dataSourceLabel")
exoPlayer = ExoPlayer.Builder(activity)
.setTrackSelector(trackSelector!!)
lib/utils/platform_http_client_io.dart
+19 -8
View File
@@ -11,6 +11,7 @@ import 'managed_http_client.dart';
/// Shared Cronet engine so all clients reuse the same connection pool.
CronetEngine? _sharedEngine;
bool _cronetBroken = false;
const bool _tvosBuild = bool.fromEnvironment('TVOS_BUILD');
@@ -35,14 +36,24 @@ http.Client _createTunedIoClient(String debugLabel) {
http.Client createPlatformClient() {
if (Platform.isAndroid) {
_sharedEngine ??= CronetEngine.build(
cacheMode: CacheMode.memory,
cacheMaxSize: 2 * 1024 * 1024,
enableBrotli: true,
enableHttp2: true,
);
_logPlatformClient('android', 'CronetClient');
return ManagedHttpClient(CronetClient.fromCronetEngine(_sharedEngine!), debugLabel: 'CronetClient');
if (!_cronetBroken) {
try {
_sharedEngine ??= CronetEngine.build(
cacheMode: CacheMode.memory,
cacheMaxSize: 2 * 1024 * 1024,
enableBrotli: true,
enableHttp2: true,
);
_logPlatformClient('android', 'CronetClient');
return ManagedHttpClient(CronetClient.fromCronetEngine(_sharedEngine!), debugLabel: 'CronetClient');
} catch (e, st) {
_cronetBroken = true;
_sharedEngine = null;
appLogger.w('CronetClient init failed, falling back to IOClient', error: e, stackTrace: st);
}
}
_logPlatformClient('android', 'IOClient (Android fallback)');
return _createTunedIoClient('IOClient (Android fallback)');
}
if (Platform.isIOS && _tvosBuild) {
_logPlatformClient('tvos', 'IOClient (tvOS tuned)');